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/affs | |
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/affs')
-rw-r--r-- | fs/affs/file.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/affs/file.c b/fs/affs/file.c index 659c579c4588..0548c53f41d5 100644 --- a/fs/affs/file.c +++ b/fs/affs/file.c | |||
@@ -33,11 +33,11 @@ affs_file_release(struct inode *inode, struct file *filp) | |||
33 | inode->i_ino, atomic_read(&AFFS_I(inode)->i_opencnt)); | 33 | inode->i_ino, atomic_read(&AFFS_I(inode)->i_opencnt)); |
34 | 34 | ||
35 | if (atomic_dec_and_test(&AFFS_I(inode)->i_opencnt)) { | 35 | if (atomic_dec_and_test(&AFFS_I(inode)->i_opencnt)) { |
36 | mutex_lock(&inode->i_mutex); | 36 | inode_lock(inode); |
37 | if (inode->i_size != AFFS_I(inode)->mmu_private) | 37 | if (inode->i_size != AFFS_I(inode)->mmu_private) |
38 | affs_truncate(inode); | 38 | affs_truncate(inode); |
39 | affs_free_prealloc(inode); | 39 | affs_free_prealloc(inode); |
40 | mutex_unlock(&inode->i_mutex); | 40 | inode_unlock(inode); |
41 | } | 41 | } |
42 | 42 | ||
43 | return 0; | 43 | return 0; |
@@ -958,12 +958,12 @@ int affs_file_fsync(struct file *filp, loff_t start, loff_t end, int datasync) | |||
958 | if (err) | 958 | if (err) |
959 | return err; | 959 | return err; |
960 | 960 | ||
961 | mutex_lock(&inode->i_mutex); | 961 | inode_lock(inode); |
962 | ret = write_inode_now(inode, 0); | 962 | ret = write_inode_now(inode, 0); |
963 | err = sync_blockdev(inode->i_sb->s_bdev); | 963 | err = sync_blockdev(inode->i_sb->s_bdev); |
964 | if (!ret) | 964 | if (!ret) |
965 | ret = err; | 965 | ret = err; |
966 | mutex_unlock(&inode->i_mutex); | 966 | inode_unlock(inode); |
967 | return ret; | 967 | return ret; |
968 | } | 968 | } |
969 | const struct file_operations affs_file_operations = { | 969 | const struct file_operations affs_file_operations = { |