Skip to content

Commit

Permalink
[XFS] kill sys_cred
Browse files Browse the repository at this point in the history 
capable_cred has been unused for a while so we can kill it and sys_cred.
That also means the cred argument to xfs_setattr and xfs_change_file_space
can be removed now.

SGI-PV: 988918

SGI-Modid: xfs-linux-melb:xfs-kern:32412a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Tim Shimmin <tes@sgi.com>
Signed-off-by: David Chinner <david@fromorbit.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
  • Loading branch information
Christoph Hellwig authored and Lachlan McIlroy committed Oct 30, 2008
1 parent 7ee49ac commit ea5a3dc
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 30 deletions.
8 changes: 0 additions & 8 deletions fs/xfs/linux-2.6/xfs_cred.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,4 @@ typedef struct cred {
/* EMPTY */
} cred_t;

extern struct cred *sys_cred;

/* this is a hack.. (assumes sys_cred is the only cred_t in the system) */
static inline int capable_cred(cred_t *cr, int cid)
{
return (cr == sys_cred) ? 1 : capable(cid);
}

#endif /* __XFS_CRED_H__ */
7 changes: 0 additions & 7 deletions fs/xfs/linux-2.6/xfs_globals.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,3 @@ xfs_param_t xfs_params = {
.inherit_nodfrg = { 0, 1, 1 },
.fstrm_timer = { 1, 30*100, 3600*100},
};

/*
* Global system credential structure.
*/
static cred_t sys_cred_val;
cred_t *sys_cred = &sys_cred_val;

1 change: 0 additions & 1 deletion fs/xfs/linux-2.6/xfs_globals.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@
#define __XFS_GLOBALS_H__

extern uint64_t xfs_panic_mask; /* set to cause more panics */
extern struct cred *sys_cred;

#endif /* __XFS_GLOBALS_H__ */
3 changes: 1 addition & 2 deletions fs/xfs/linux-2.6/xfs_ioctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -691,8 +691,7 @@ xfs_ioc_space(
if (ioflags & IO_INVIS)
attr_flags |= XFS_ATTR_DMI;

error = xfs_change_file_space(ip, cmd, &bf, filp->f_pos,
NULL, attr_flags);
error = xfs_change_file_space(ip, cmd, &bf, filp->f_pos, attr_flags);
return -error;
}

Expand Down
6 changes: 3 additions & 3 deletions fs/xfs/linux-2.6/xfs_iops.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ xfs_vn_setattr(
struct dentry *dentry,
struct iattr *iattr)
{
return -xfs_setattr(XFS_I(dentry->d_inode), iattr, 0, NULL);
return -xfs_setattr(XFS_I(dentry->d_inode), iattr, 0);
}

/*
Expand Down Expand Up @@ -642,7 +642,7 @@ xfs_vn_fallocate(

xfs_ilock(ip, XFS_IOLOCK_EXCL);
error = xfs_change_file_space(ip, XFS_IOC_RESVSP, &bf,
0, NULL, XFS_ATTR_NOLOCK);
0, XFS_ATTR_NOLOCK);
if (!error && !(mode & FALLOC_FL_KEEP_SIZE) &&
offset + len > i_size_read(inode))
new_size = offset + len;
Expand All @@ -653,7 +653,7 @@ xfs_vn_fallocate(

iattr.ia_valid = ATTR_SIZE;
iattr.ia_size = new_size;
error = xfs_setattr(ip, &iattr, XFS_ATTR_NOLOCK, NULL);
error = xfs_setattr(ip, &iattr, XFS_ATTR_NOLOCK);
}

xfs_iunlock(ip, XFS_IOLOCK_EXCL);
Expand Down
2 changes: 1 addition & 1 deletion fs/xfs/xfs_acl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ xfs_acl_setmode(
if (gap && nomask)
iattr.ia_mode |= gap->ae_perm << 3;

return xfs_setattr(XFS_I(vp), &iattr, 0, sys_cred);
return xfs_setattr(XFS_I(vp), &iattr, 0);
}

/*
Expand Down
6 changes: 2 additions & 4 deletions fs/xfs/xfs_vnodeops.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ int
xfs_setattr(
struct xfs_inode *ip,
struct iattr *iattr,
int flags,
cred_t *credp)
int flags)
{
xfs_mount_t *mp = ip->i_mount;
struct inode *inode = VFS_I(ip);
Expand Down Expand Up @@ -3362,7 +3361,6 @@ xfs_change_file_space(
int cmd,
xfs_flock64_t *bf,
xfs_off_t offset,
cred_t *credp,
int attr_flags)
{
xfs_mount_t *mp = ip->i_mount;
Expand Down Expand Up @@ -3450,7 +3448,7 @@ xfs_change_file_space(
iattr.ia_valid = ATTR_SIZE;
iattr.ia_size = startoffset;

error = xfs_setattr(ip, &iattr, attr_flags, credp);
error = xfs_setattr(ip, &iattr, attr_flags);

if (error)
return error;
Expand Down
6 changes: 2 additions & 4 deletions fs/xfs/xfs_vnodeops.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ struct xfs_iomap;


int xfs_open(struct xfs_inode *ip);
int xfs_setattr(struct xfs_inode *ip, struct iattr *vap, int flags,
struct cred *credp);
int xfs_setattr(struct xfs_inode *ip, struct iattr *vap, int flags);
#define XFS_ATTR_DMI 0x01 /* invocation from a DMI function */
#define XFS_ATTR_NONBLOCK 0x02 /* return EAGAIN if operation would block */
#define XFS_ATTR_NOLOCK 0x04 /* Don't grab any conflicting locks */
Expand Down Expand Up @@ -44,8 +43,7 @@ int xfs_inode_flush(struct xfs_inode *ip, int flags);
int xfs_set_dmattrs(struct xfs_inode *ip, u_int evmask, u_int16_t state);
int xfs_reclaim(struct xfs_inode *ip);
int xfs_change_file_space(struct xfs_inode *ip, int cmd,
xfs_flock64_t *bf, xfs_off_t offset,
struct cred *credp, int attr_flags);
xfs_flock64_t *bf, xfs_off_t offset, int attr_flags);
int xfs_rename(struct xfs_inode *src_dp, struct xfs_name *src_name,
struct xfs_inode *src_ip, struct xfs_inode *target_dp,
struct xfs_name *target_name, struct xfs_inode *target_ip);
Expand Down

0 comments on commit ea5a3dc

Please sign in to comment.