summaryrefslogtreecommitdiffstats
path: root/fs/gfs2
diff options
context:
space:
mode:
authorBob Peterson <rpeterso@redhat.com>2014-03-19 11:51:28 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2014-03-19 15:53:52 +0000
commit733dbc1b21dcfac83b292865a707d6a0d0fc16eb (patch)
tree2ed5b83f7c753500d85f893217eff7da39e7b4f0 /fs/gfs2
parentf45dc26deda00d77ae96b11612c353fff7d93e09 (diff)
downloadblackbird-op-linux-733dbc1b21dcfac83b292865a707d6a0d0fc16eb.tar.gz
blackbird-op-linux-733dbc1b21dcfac83b292865a707d6a0d0fc16eb.zip
GFS2: inline function gfs2_set_mode
Here is a revised patch based on Steve's feedback: This patch eliminates function gfs2_set_mode which was only called in one place, and always returned 0. Signed-off-by: Bob Peterson <rpeterso@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2')
-rw-r--r--fs/gfs2/acl.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c
index 394dc5561842..3088e2a38e30 100644
--- a/fs/gfs2/acl.c
+++ b/fs/gfs2/acl.c
@@ -64,18 +64,6 @@ struct posix_acl *gfs2_get_acl(struct inode *inode, int type)
return acl;
}
-static int gfs2_set_mode(struct inode *inode, umode_t mode)
-{
- int error = 0;
-
- if (mode != inode->i_mode) {
- inode->i_mode = mode;
- mark_inode_dirty(inode);
- }
-
- return error;
-}
-
int gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
{
int error;
@@ -98,9 +86,10 @@ int gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
if (error == 0)
acl = NULL;
- error = gfs2_set_mode(inode, mode);
- if (error)
- return error;
+ if (mode != inode->i_mode) {
+ inode->i_mode = mode;
+ mark_inode_dirty(inode);
+ }
}
if (acl) {
OpenPOWER on IntegriCloud