[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>

diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c
index 9ef4cf2..3993178 100644 (file)
--- a/fs/gfs2/acl.c
+++ b/fs/gfs2/acl.c
@@ -179,9 +179,7 @@ int gfs2_check_acl(struct inode *inode, int mask)
        struct gfs2_holder i_gh;
        int error;
 
-       error = gfs2_glock_nq_init(ip->i_gl,
-                                  LM_ST_SHARED, LM_FLAG_ANY,
-                                  &i_gh);
+       error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, &i_gh);
        if (!error) {
                error = gfs2_check_acl_locked(inode, mask);
                gfs2_glock_dq_uninit(&i_gh);

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 4e9c421..c19feb9 100644 (file)
--- 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);
-}
-

diff --git a/fs/gfs2/inode.h b/fs/gfs2/inode.h
index 30cfcc1..8bb8b55 100644 (file)
--- a/fs/gfs2/inode.h
+++ b/fs/gfs2/inode.h
@@ -50,8 +50,6 @@ int gfs2_glock_nq_m_atime(unsigned int num_gh, struct gfs2_holder *ghs);
 
 int gfs2_setattr_simple(struct gfs2_inode *ip, struct iattr *attr);
 
-int gfs2_repermission(struct inode *inode, int mask, struct nameidata *nd);
-
 struct inode *gfs2_lookup_simple(struct inode *dip, const char *name);
 
 #endif /* __INODE_DOT_H__ */

diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index 222f3be..5e75419 100644 (file)
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -640,7 +640,7 @@ static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask)
            !capable(CAP_LINUX_IMMUTABLE))
                goto out;
        if (!IS_IMMUTABLE(inode)) {
-               error = gfs2_repermission(inode, MAY_WRITE, NULL);
+               error = permission(inode, MAY_WRITE, NULL);
                if (error)
                        goto out;
        }

diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
index 3a2769e..5d5ebbc 100644 (file)
--- a/fs/gfs2/ops_inode.c
+++ b/fs/gfs2/ops_inode.c
@@ -155,7 +155,7 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir,
        if (error)
                goto out;
 
-       error = gfs2_repermission(dir, MAY_WRITE | MAY_EXEC, NULL);
+       error = permission(dir, MAY_WRITE | MAY_EXEC, NULL);
        if (error)
                goto out_gunlock;
 
@@ -659,7 +659,7 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
                        }
                }
        } else {
-               error = gfs2_repermission(ndir, MAY_WRITE | MAY_EXEC, NULL);
+               error = permission(ndir, MAY_WRITE | MAY_EXEC, NULL);
                if (error)
                        goto out_gunlock;
 
@@ -694,7 +694,7 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
        /* Check out the dir to be renamed */
 
        if (dir_rename) {
-               error = gfs2_repermission(odentry->d_inode, MAY_WRITE, NULL);
+               error = permission(odentry->d_inode, MAY_WRITE, NULL);
                if (error)
                        goto out_gunlock;
        }
@@ -888,9 +888,7 @@ static int gfs2_permission(struct inode *inode, int mask, struct nameidata *nd)
        if (ip->i_vn == ip->i_gl->gl_vn)
                return generic_permission(inode, mask, gfs2_check_acl);
 
-       error = gfs2_glock_nq_init(ip->i_gl,
-                                  LM_ST_SHARED, LM_FLAG_ANY,
-                                  &i_gh);
+       error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, &i_gh);
        if (!error) {
                error = generic_permission(inode, mask, gfs2_check_acl_locked);
                gfs2_glock_dq_uninit(&i_gh);