diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-22 15:40:57 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-22 18:04:28 -0500 |
commit | 5955102c9984fa081b2d570cfac75c97eecf8f3b (patch) | |
tree | a4744386eac4b916e847eb4eedfada158f6527b4 /fs/ntfs/file.c | |
parent | 57b8f112cfe6622ddddb8c2641206bb5fa8a112d (diff) |
wrappers for ->i_mutex access
parallel to mutex_{lock,unlock,trylock,is_locked,lock_nested},
inode_foo(inode) being mutex_foo(&inode->i_mutex).
Please, use those for access to ->i_mutex; over the coming cycle
->i_mutex will become rwsem, with ->lookup() done with it held
only shared.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ntfs/file.c')
-rw-r--r-- | fs/ntfs/file.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c index 9d383e5eff0e..bed4d427dfae 100644 --- a/fs/ntfs/file.c +++ b/fs/ntfs/file.c | |||
@@ -1944,14 +1944,14 @@ static ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) | |||
1944 | ssize_t written = 0; | 1944 | ssize_t written = 0; |
1945 | ssize_t err; | 1945 | ssize_t err; |
1946 | 1946 | ||
1947 | mutex_lock(&vi->i_mutex); | 1947 | inode_lock(vi); |
1948 | /* We can write back this queue in page reclaim. */ | 1948 | /* We can write back this queue in page reclaim. */ |
1949 | current->backing_dev_info = inode_to_bdi(vi); | 1949 | current->backing_dev_info = inode_to_bdi(vi); |
1950 | err = ntfs_prepare_file_for_write(iocb, from); | 1950 | err = ntfs_prepare_file_for_write(iocb, from); |
1951 | if (iov_iter_count(from) && !err) | 1951 | if (iov_iter_count(from) && !err) |
1952 | written = ntfs_perform_write(file, from, iocb->ki_pos); | 1952 | written = ntfs_perform_write(file, from, iocb->ki_pos); |
1953 | current->backing_dev_info = NULL; | 1953 | current->backing_dev_info = NULL; |
1954 | mutex_unlock(&vi->i_mutex); | 1954 | inode_unlock(vi); |
1955 | if (likely(written > 0)) { | 1955 | if (likely(written > 0)) { |
1956 | err = generic_write_sync(file, iocb->ki_pos, written); | 1956 | err = generic_write_sync(file, iocb->ki_pos, written); |
1957 | if (err < 0) | 1957 | if (err < 0) |
@@ -1996,7 +1996,7 @@ static int ntfs_file_fsync(struct file *filp, loff_t start, loff_t end, | |||
1996 | err = filemap_write_and_wait_range(vi->i_mapping, start, end); | 1996 | err = filemap_write_and_wait_range(vi->i_mapping, start, end); |
1997 | if (err) | 1997 | if (err) |
1998 | return err; | 1998 | return err; |
1999 | mutex_lock(&vi->i_mutex); | 1999 | inode_lock(vi); |
2000 | 2000 | ||
2001 | BUG_ON(S_ISDIR(vi->i_mode)); | 2001 | BUG_ON(S_ISDIR(vi->i_mode)); |
2002 | if (!datasync || !NInoNonResident(NTFS_I(vi))) | 2002 | if (!datasync || !NInoNonResident(NTFS_I(vi))) |
@@ -2015,7 +2015,7 @@ static int ntfs_file_fsync(struct file *filp, loff_t start, loff_t end, | |||
2015 | else | 2015 | else |
2016 | ntfs_warning(vi->i_sb, "Failed to f%ssync inode 0x%lx. Error " | 2016 | ntfs_warning(vi->i_sb, "Failed to f%ssync inode 0x%lx. Error " |
2017 | "%u.", datasync ? "data" : "", vi->i_ino, -ret); | 2017 | "%u.", datasync ? "data" : "", vi->i_ino, -ret); |
2018 | mutex_unlock(&vi->i_mutex); | 2018 | inode_unlock(vi); |
2019 | return ret; | 2019 | return ret; |
2020 | } | 2020 | } |
2021 | 2021 | ||