summaryrefslogtreecommitdiffstats
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)
downloadtalos-obmc-linux-faf450ef4a8567e4c75a905aadae01cf401d893a.tar.gz
talos-obmc-linux-faf450ef4a8567e4c75a905aadae01cf401d893a.zip
[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,
return ERR_PTR(error);
if (!is_root) {
- error = gfs2_repermission(dir, MAY_EXEC, NULL);
+ error = permission(dir, MAY_EXEC, NULL);
if (error)
goto out;
}
@@ -571,7 +571,7 @@ static int create_ok(struct gfs2_inode *dip, const struct qstr *name,
{
int error;
- error = gfs2_repermission(&dip->i_inode, MAY_WRITE | MAY_EXEC, NULL);
+ error = permission(&dip->i_inode, MAY_WRITE | MAY_EXEC, NULL);
if (error)
return error;
@@ -1003,7 +1003,7 @@ int gfs2_unlink_ok(struct gfs2_inode *dip, const struct qstr *name,
if (IS_APPEND(&dip->i_inode))
return -EPERM;
- error = gfs2_repermission(&dip->i_inode, MAY_WRITE | MAY_EXEC, NULL);
+ error = permission(&dip->i_inode, MAY_WRITE | MAY_EXEC, NULL);
if (error)
return error;
@@ -1356,8 +1356,3 @@ int gfs2_setattr_simple(struct gfs2_inode *ip, struct iattr *attr)
return error;
}
-int gfs2_repermission(struct inode *inode, int mask, struct nameidata *nd)
-{
- return permission(inode, mask, nd);
-}
-
OpenPOWER on IntegriCloud