]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
btrfs: make btrfs_inode_resume_unlocked_dio take btrfs_inode
authorNikolay Borisov <nborisov@suse.com>
Mon, 20 Feb 2017 11:51:11 +0000 (13:51 +0200)
committerDavid Sterba <dsterba@suse.com>
Tue, 28 Feb 2017 10:30:12 +0000 (11:30 +0100)
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/btrfs_inode.h
fs/btrfs/inode.c

index d84cf2b0c7b6bc9aeac0b3cf1ea2125226742506..0c6baaba0651ce10ba5e394ad82a03a917ced4e6 100644 (file)
@@ -317,11 +317,10 @@ static inline void btrfs_inode_block_unlocked_dio(struct btrfs_inode *inode)
        smp_mb();
 }
 
-static inline void btrfs_inode_resume_unlocked_dio(struct inode *inode)
+static inline void btrfs_inode_resume_unlocked_dio(struct btrfs_inode *inode)
 {
        smp_mb__before_atomic();
-       clear_bit(BTRFS_INODE_READDIO_NEED_LOCK,
-                 &BTRFS_I(inode)->runtime_flags);
+       clear_bit(BTRFS_INODE_READDIO_NEED_LOCK, &inode->runtime_flags);
 }
 
 static inline void btrfs_print_data_csum_error(struct btrfs_inode *inode,
index 59b93a2369aa697d00cc0534b7e32b150d8fa12c..596e5cb4bfa29ae43fcf6a743fbcd1fa558d1d9f 100644 (file)
@@ -5004,7 +5004,7 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr)
                /* Disable nonlocked read DIO to avoid the end less truncate */
                btrfs_inode_block_unlocked_dio(BTRFS_I(inode));
                inode_dio_wait(inode);
-               btrfs_inode_resume_unlocked_dio(inode);
+               btrfs_inode_resume_unlocked_dio(BTRFS_I(inode));
 
                ret = btrfs_truncate(inode);
                if (ret && inode->i_nlink) {