Skip to content

Commit

Permalink
btrfs: make btrfs_inode_resume_unlocked_dio take btrfs_inode
Browse files Browse the repository at this point in the history 
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
Nikolay Borisov authored and David Sterba committed Feb 28, 2017
1 parent abcefb1 commit 0b58170
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions fs/btrfs/btrfs_inode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 0b58170

Please sign in to comment.