aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolay Borisov <nborisov@suse.com>2017-02-20 06:51:10 -0500
committerDavid Sterba <dsterba@suse.com>2017-02-28 05:30:12 -0500
commitabcefb1eeeff04734a59b4dd3724abbf0688252c (patch)
tree0ef200a349aab963ba5e5ee9ec6ab12ed172cd7b
parentcef415af208984650de925e28d40aa4a6e8513f4 (diff)
btrfs: make btrfs_inode_block_unlocked_dio take btrfs_inode
Signed-off-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--fs/btrfs/btrfs_inode.h4
-rw-r--r--fs/btrfs/inode.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index c10d21b2f0df..d84cf2b0c7b6 100644
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -311,9 +311,9 @@ struct btrfs_dio_private {
311 * to grab i_mutex. It is used to avoid the endless truncate due to 311 * to grab i_mutex. It is used to avoid the endless truncate due to
312 * nonlocked dio read. 312 * nonlocked dio read.
313 */ 313 */
314static inline void btrfs_inode_block_unlocked_dio(struct inode *inode) 314static inline void btrfs_inode_block_unlocked_dio(struct btrfs_inode *inode)
315{ 315{
316 set_bit(BTRFS_INODE_READDIO_NEED_LOCK, &BTRFS_I(inode)->runtime_flags); 316 set_bit(BTRFS_INODE_READDIO_NEED_LOCK, &inode->runtime_flags);
317 smp_mb(); 317 smp_mb();
318} 318}
319 319
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index dafd3fdd6f2b..59b93a2369aa 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -5002,7 +5002,7 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr)
5002 truncate_setsize(inode, newsize); 5002 truncate_setsize(inode, newsize);
5003 5003
5004 /* Disable nonlocked read DIO to avoid the end less truncate */ 5004 /* Disable nonlocked read DIO to avoid the end less truncate */
5005 btrfs_inode_block_unlocked_dio(inode); 5005 btrfs_inode_block_unlocked_dio(BTRFS_I(inode));
5006 inode_dio_wait(inode); 5006 inode_dio_wait(inode);
5007 btrfs_inode_resume_unlocked_dio(inode); 5007 btrfs_inode_resume_unlocked_dio(inode);
5008 5008