diff options
| author | Goldwyn Rodrigues <rgoldwyn@suse.com> | 2019-12-04 05:58:53 -0600 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2020-05-28 14:01:52 +0200 |
| commit | 5f008163a559d566a0ee1190a0a24f3eec6f1ea7 (patch) | |
| tree | 3abd629b4cffb4de245510594da552116656f172 /fs/btrfs/inode.c | |
| parent | b75b7ca7c27dfd61dba368f390b7d4dc20b3a8cb (diff) | |
| download | linux-5f008163a559d566a0ee1190a0a24f3eec6f1ea7.tar.bz2 | |
btrfs: remove BTRFS_INODE_READDIO_NEED_LOCK
Since we now perform direct reads using i_rwsem, we can remove this
inode flag used to co-ordinate unlocked reads.
The truncate call takes i_rwsem. This means it is correctly synchronized
with concurrent direct reads.
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Johannes Thumshirn <jth@kernel.org>
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 501842f8c648..0c47f79da2e1 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4750,10 +4750,7 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr) truncate_setsize(inode, newsize); - /* Disable nonlocked read DIO to avoid the endless truncate */ - btrfs_inode_block_unlocked_dio(BTRFS_I(inode)); inode_dio_wait(inode); - btrfs_inode_resume_unlocked_dio(BTRFS_I(inode)); ret = btrfs_truncate(inode, newsize == oldsize); if (ret && inode->i_nlink) { |