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

btrfs: make btrfs_inode_block_unlocked_dio take btrfs_inode 



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

fs/btrfs/btrfs_inode.h

+2 −2
Original line number Diff line number Diff line
@@ -311,9 +311,9 @@ struct btrfs_dio_private { 
 * to grab i_mutex. It is used to avoid the endless truncate due to

 * nonlocked dio read.

 */

static inline void btrfs_inode_block_unlocked_dio(struct inode *inode)

static inline void btrfs_inode_block_unlocked_dio(struct btrfs_inode *inode)

{

	set_bit(BTRFS_INODE_READDIO_NEED_LOCK, &BTRFS_I(inode)->runtime_flags);

	set_bit(BTRFS_INODE_READDIO_NEED_LOCK, &inode->runtime_flags);

	smp_mb();

}

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -5002,7 +5002,7 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr) 
		truncate_setsize(inode, newsize);



		/* Disable nonlocked read DIO to avoid the end less truncate */

		btrfs_inode_block_unlocked_dio(inode);

		btrfs_inode_block_unlocked_dio(BTRFS_I(inode));

		inode_dio_wait(inode);

		btrfs_inode_resume_unlocked_dio(inode);