Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b581701 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: make btrfs_inode_resume_unlocked_dio take btrfs_inode 



Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent abcefb1e

fs/btrfs/btrfs_inode.h

+2 −3
Original line number Diff line number Diff line
@@ -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,

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {