lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GFS2: Use gfs2_set_mode() instead of munge_mode()

Browse Source 
These two functions do the same thing, so lets only use
one of them.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
Steven Whitehouse
2009-09-29 12:40:19 +01:00
parent c65f7fb534
commit 69dca42464
1 changed files with 11 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
fs/gfs2/acl.c
View File

@@ -104,29 +104,20 @@ int gfs2_check_acl(struct inode *inode, int mask)
return -EAGAIN; return -EAGAIN;
} }
static int munge_mode(struct gfs2_inode *ip, mode_t mode) static int gfs2_set_mode(struct inode *inode, mode_t mode)
{ {
struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode); int error = 0;
struct buffer_head *dibh;
int error;
error = gfs2_trans_begin(sdp, RES_DINODE, 0); if (mode != inode->i_mode) {
if (error) struct iattr iattr;
return error;
error = gfs2_meta_inode_buffer(ip, &dibh); iattr.ia_valid = ATTR_MODE;
if (!error) { iattr.ia_mode = mode;
gfs2_assert_withdraw(sdp,
(ip->i_inode.i_mode & S_IFMT) == (mode & S_IFMT)); error = gfs2_setattr_simple(GFS2_I(inode), &iattr);
ip->i_inode.i_mode = mode;
gfs2_trans_add_bh(ip->i_gl, dibh, 1);
gfs2_dinode_out(ip, dibh->b_data);
brelse(dibh);
} }
gfs2_trans_end(sdp); return error;
return 0;
} }
int gfs2_acl_create(struct gfs2_inode *dip, struct gfs2_inode *ip) int gfs2_acl_create(struct gfs2_inode *dip, struct gfs2_inode *ip)
@@ -151,7 +142,7 @@ int gfs2_acl_create(struct gfs2_inode *dip, struct gfs2_inode *ip)
if (!acl) { if (!acl) {
mode &= ~current_umask(); mode &= ~current_umask();
if (mode != ip->i_inode.i_mode) if (mode != ip->i_inode.i_mode)
error = munge_mode(ip, mode); error = gfs2_set_mode(&ip->i_inode, mode);
return error; return error;
} }
@@ -181,7 +172,7 @@ int gfs2_acl_create(struct gfs2_inode *dip, struct gfs2_inode *ip)
if (error) if (error)
goto out; goto out;
munge: munge:
error = munge_mode(ip, mode); error = gfs2_set_mode(&ip->i_inode, mode);
out: out:
posix_acl_release(acl); posix_acl_release(acl);
kfree(data); kfree(data);
@@ -244,21 +235,6 @@ static int gfs2_xattr_system_get(struct inode *inode, const char *name,
return gfs2_xattr_get(inode, GFS2_EATYPE_SYS, name, buffer, size); return gfs2_xattr_get(inode, GFS2_EATYPE_SYS, name, buffer, size);
} }
static int gfs2_set_mode(struct inode *inode, mode_t mode)
{
int error = 0;
if (mode != inode->i_mode) {
struct iattr iattr;
iattr.ia_valid = ATTR_MODE;
iattr.ia_mode = mode;
error = gfs2_setattr_simple(GFS2_I(inode), &iattr);
}
return error;
}
static int gfs2_xattr_system_set(struct inode *inode, const char *name, static int gfs2_xattr_system_set(struct inode *inode, const char *name,
const void *value, size_t size, int flags) const void *value, size_t size, int flags)