Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77386e1f authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[GFS2] Remove gfs2_check_acl() 



As pointed out by Adrian Bunk, the gfs2_check_acl() function is no
longer used. This patch removes it and renamed gfs2_check_acl_locked()
to gfs2_check_acl() since we only need one variant of that function now.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
Cc: Adrian Bunk <bunk@stusta.de>
parent 57adf7ee

fs/gfs2/acl.c

+2 −17
Original line number Original line Diff line number Diff line
@@ -145,14 +145,14 @@ static int acl_get(struct gfs2_inode *ip, int access, struct posix_acl **acl, 
}

}





/**

/**

 * gfs2_check_acl_locked - Check an ACL to see if we're allowed to do something

 * gfs2_check_acl - Check an ACL to see if we're allowed to do something

 * @inode: the file we want to do something to

 * @inode: the file we want to do something to

 * @mask: what we want to do

 * @mask: what we want to do

 *

 *

 * Returns: errno

 * Returns: errno

 */

 */





int gfs2_check_acl_locked(struct inode *inode, int mask)

int gfs2_check_acl(struct inode *inode, int mask)

{

{

	struct posix_acl *acl = NULL;

	struct posix_acl *acl = NULL;

	int error;

	int error;
@@ -170,21 +170,6 @@ int gfs2_check_acl_locked(struct inode *inode, int mask) 
	return -EAGAIN;

	return -EAGAIN;

}

}





int gfs2_check_acl(struct inode *inode, int mask)

{

	struct gfs2_inode *ip = GFS2_I(inode);

	struct gfs2_holder i_gh;

	int error;



	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);

	}



	return error;

}



static int munge_mode(struct gfs2_inode *ip, mode_t mode)

static int munge_mode(struct gfs2_inode *ip, mode_t mode)

{

{

	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);

	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);

fs/gfs2/acl.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,6 @@ int gfs2_acl_validate_set(struct gfs2_inode *ip, int access, 
			  struct gfs2_ea_request *er,

			  struct gfs2_ea_request *er,

			  int *remove, mode_t *mode);

			  int *remove, mode_t *mode);

int gfs2_acl_validate_remove(struct gfs2_inode *ip, int access);

int gfs2_acl_validate_remove(struct gfs2_inode *ip, int access);

int gfs2_check_acl_locked(struct inode *inode, int mask);

int gfs2_check_acl(struct inode *inode, int mask);

int gfs2_check_acl(struct inode *inode, int mask);

int gfs2_acl_create(struct gfs2_inode *dip, struct gfs2_inode *ip);

int gfs2_acl_create(struct gfs2_inode *dip, struct gfs2_inode *ip);

int gfs2_acl_chmod(struct gfs2_inode *ip, struct iattr *attr);

int gfs2_acl_chmod(struct gfs2_inode *ip, struct iattr *attr);

fs/gfs2/ops_inode.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -856,7 +856,7 @@ static int gfs2_permission(struct inode *inode, int mask, struct nameidata *nd) 
		unlock = 1;

		unlock = 1;

	}

	}





	error = generic_permission(inode, mask, gfs2_check_acl_locked);

	error = generic_permission(inode, mask, gfs2_check_acl);

	if (unlock)

	if (unlock)

		gfs2_glock_dq_uninit(&i_gh);

		gfs2_glock_dq_uninit(&i_gh);