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

Commit ea5a3dc8 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Lachlan McIlroy
Browse files

[XFS] kill sys_cred 



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: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
Signed-off-by: default avatarDavid Chinner <david@fromorbit.com>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent 7ee49acf

fs/xfs/linux-2.6/xfs_cred.h

+0 −8
Original line number Diff line number Diff line
@@ -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__ */

fs/xfs/linux-2.6/xfs_globals.c

+0 −7
Original line number Diff line number Diff line
@@ -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;

fs/xfs/linux-2.6/xfs_globals.h

+0 −1
Original line number Diff line number Diff line
@@ -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__ */

fs/xfs/linux-2.6/xfs_ioctl.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

}

fs/xfs/linux-2.6/xfs_iops.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

}



/*
@@ -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;
@@ -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);