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/ext2/ioctl.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/ext2/ioctl.c')
-rw-r--r-- | fs/ext2/ioctl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ext2/ioctl.c b/fs/ext2/ioctl.c index 5d46c09863f0..b386af2e45f4 100644 --- a/fs/ext2/ioctl.c +++ b/fs/ext2/ioctl.c | |||
@@ -51,10 +51,10 @@ long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
51 | 51 | ||
52 | flags = ext2_mask_flags(inode->i_mode, flags); | 52 | flags = ext2_mask_flags(inode->i_mode, flags); |
53 | 53 | ||
54 | mutex_lock(&inode->i_mutex); | 54 | inode_lock(inode); |
55 | /* Is it quota file? Do not allow user to mess with it */ | 55 | /* Is it quota file? Do not allow user to mess with it */ |
56 | if (IS_NOQUOTA(inode)) { | 56 | if (IS_NOQUOTA(inode)) { |
57 | mutex_unlock(&inode->i_mutex); | 57 | inode_unlock(inode); |
58 | ret = -EPERM; | 58 | ret = -EPERM; |
59 | goto setflags_out; | 59 | goto setflags_out; |
60 | } | 60 | } |
@@ -68,7 +68,7 @@ long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
68 | */ | 68 | */ |
69 | if ((flags ^ oldflags) & (EXT2_APPEND_FL | EXT2_IMMUTABLE_FL)) { | 69 | if ((flags ^ oldflags) & (EXT2_APPEND_FL | EXT2_IMMUTABLE_FL)) { |
70 | if (!capable(CAP_LINUX_IMMUTABLE)) { | 70 | if (!capable(CAP_LINUX_IMMUTABLE)) { |
71 | mutex_unlock(&inode->i_mutex); | 71 | inode_unlock(inode); |
72 | ret = -EPERM; | 72 | ret = -EPERM; |
73 | goto setflags_out; | 73 | goto setflags_out; |
74 | } | 74 | } |
@@ -80,7 +80,7 @@ long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
80 | 80 | ||
81 | ext2_set_inode_flags(inode); | 81 | ext2_set_inode_flags(inode); |
82 | inode->i_ctime = CURRENT_TIME_SEC; | 82 | inode->i_ctime = CURRENT_TIME_SEC; |
83 | mutex_unlock(&inode->i_mutex); | 83 | inode_unlock(inode); |
84 | 84 | ||
85 | mark_inode_dirty(inode); | 85 | mark_inode_dirty(inode); |
86 | setflags_out: | 86 | setflags_out: |
@@ -102,10 +102,10 @@ setflags_out: | |||
102 | goto setversion_out; | 102 | goto setversion_out; |
103 | } | 103 | } |
104 | 104 | ||
105 | mutex_lock(&inode->i_mutex); | 105 | inode_lock(inode); |
106 | inode->i_ctime = CURRENT_TIME_SEC; | 106 | inode->i_ctime = CURRENT_TIME_SEC; |
107 | inode->i_generation = generation; | 107 | inode->i_generation = generation; |
108 | mutex_unlock(&inode->i_mutex); | 108 | inode_unlock(inode); |
109 | 109 | ||
110 | mark_inode_dirty(inode); | 110 | mark_inode_dirty(inode); |
111 | setversion_out: | 111 | setversion_out: |