btrfs: make btrfs_inode_resume_unlocked_dio take btrfs_inode

Signed-off-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>

btrfs: make btrfs_inode_resume_unlocked_dio take btrfs_inode
Signed-off-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
0b581701 · Nikolay Borisov · David Sterba · abcefb1e · 0b581701 · 0b581701
Commit 0b581701 authored Feb 20, 2017 by Nikolay Borisov Committed by David Sterba Feb 28, 2017
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

fs/btrfs/btrfs_inode.h fs/btrfs/btrfs_inode.h +2 -3

fs/btrfs/inode.c fs/btrfs/inode.c +1 -1

No files found.
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -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,
+	clear_bit(BTRFS_INODE_READDIO_NEED_LOCK, &inode->runtime_flags);
-		  &BTRFS_I(inode)->runtime_flags);
 }
 static inline void btrfs_print_data_csum_error(struct btrfs_inode *inode,

--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -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) {