aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/inode.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-06-22 10:59:10 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-06-22 10:59:10 -0400
commitfaf450ef4a8567e4c75a905aadae01cf401d893a (patch)
treeb06d7b68191edd438f9a40e609caeb9380a2a90e /fs/gfs2/inode.c
parentd9d1ca30505c6fed867e1724b16fdad0c281d7d1 (diff)
[GFS2] Remove gfs2_repermission
gfs2_repermission is just a wrapper for permission, so remove it and call permission directly where required. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/inode.c')
-rw-r--r--fs/gfs2/inode.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 4e9c42119aed..c19feb9697b0 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -420,7 +420,7 @@ struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name,
420 return ERR_PTR(error); 420 return ERR_PTR(error);
421 421
422 if (!is_root) { 422 if (!is_root) {
423 error = gfs2_repermission(dir, MAY_EXEC, NULL); 423 error = permission(dir, MAY_EXEC, NULL);
424 if (error) 424 if (error)
425 goto out; 425 goto out;
426 } 426 }
@@ -571,7 +571,7 @@ static int create_ok(struct gfs2_inode *dip, const struct qstr *name,
571{ 571{
572 int error; 572 int error;
573 573
574 error = gfs2_repermission(&dip->i_inode, MAY_WRITE | MAY_EXEC, NULL); 574 error = permission(&dip->i_inode, MAY_WRITE | MAY_EXEC, NULL);
575 if (error) 575 if (error)
576 return error; 576 return error;
577 577
@@ -1003,7 +1003,7 @@ int gfs2_unlink_ok(struct gfs2_inode *dip, const struct qstr *name,
1003 if (IS_APPEND(&dip->i_inode)) 1003 if (IS_APPEND(&dip->i_inode))
1004 return -EPERM; 1004 return -EPERM;
1005 1005
1006 error = gfs2_repermission(&dip->i_inode, MAY_WRITE | MAY_EXEC, NULL); 1006 error = permission(&dip->i_inode, MAY_WRITE | MAY_EXEC, NULL);
1007 if (error) 1007 if (error)
1008 return error; 1008 return error;
1009 1009
@@ -1356,8 +1356,3 @@ int gfs2_setattr_simple(struct gfs2_inode *ip, struct iattr *attr)
1356 return error; 1356 return error;
1357} 1357}
1358 1358
1359int gfs2_repermission(struct inode *inode, int mask, struct nameidata *nd)
1360{
1361 return permission(inode, mask, nd);
1362}
1363