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

Commit 0f285c8a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Niv Sardi
Browse files

[XFS] Now that xfs_setattr is only used for attributes set from ->setattr 


it can be switched to take struct iattr directly and thus simplify the
implementation greatly. Also rename the ATTR_ flags to XFS_ATTR_ to not
conflict with the ATTR_ flags used by the VFS.

SGI-PV: 984565

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

Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent 25fe55e8

fs/xfs/linux-2.6/xfs_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -688,9 +688,9 @@ xfs_ioc_space( 
		return -XFS_ERROR(EFAULT);



	if (filp->f_flags & (O_NDELAY|O_NONBLOCK))

		attr_flags |= ATTR_NONBLOCK;

		attr_flags |= XFS_ATTR_NONBLOCK;

	if (ioflags & IO_INVIS)

		attr_flags |= ATTR_DMI;

		attr_flags |= XFS_ATTR_DMI;



	error = xfs_change_file_space(ip, cmd, &bf, filp->f_pos,

					      NULL, attr_flags);

fs/xfs/linux-2.6/xfs_iops.c

+11 −45
Original line number Diff line number Diff line
@@ -648,54 +648,20 @@ xfs_vn_getattr( 
STATIC int

xfs_vn_setattr(

	struct dentry	*dentry,

	struct iattr	*attr)

	struct iattr	*iattr)

{

	struct inode	*inode = dentry->d_inode;

	unsigned int	ia_valid = attr->ia_valid;

	bhv_vattr_t	vattr = { 0 };

	int		flags = 0;

	int		error;



	if (ia_valid & ATTR_UID) {

		vattr.va_mask |= XFS_AT_UID;

		vattr.va_uid = attr->ia_uid;

	}

	if (ia_valid & ATTR_GID) {

		vattr.va_mask |= XFS_AT_GID;

		vattr.va_gid = attr->ia_gid;

	}

	if (ia_valid & ATTR_SIZE) {

		vattr.va_mask |= XFS_AT_SIZE;

		vattr.va_size = attr->ia_size;

	}

	if (ia_valid & ATTR_ATIME) {

		vattr.va_mask |= XFS_AT_ATIME;

		vattr.va_atime = attr->ia_atime;

		inode->i_atime = attr->ia_atime;

	}

	if (ia_valid & ATTR_MTIME) {

		vattr.va_mask |= XFS_AT_MTIME;

		vattr.va_mtime = attr->ia_mtime;

	}

	if (ia_valid & ATTR_CTIME) {

		vattr.va_mask |= XFS_AT_CTIME;

		vattr.va_ctime = attr->ia_ctime;

	}

	if (ia_valid & ATTR_MODE) {

		vattr.va_mask |= XFS_AT_MODE;

		vattr.va_mode = attr->ia_mode;

	if (iattr->ia_valid & ATTR_ATIME)

		inode->i_atime = iattr->ia_atime;



	if (iattr->ia_valid & ATTR_MODE) {

		if (!in_group_p(inode->i_gid) && !capable(CAP_FSETID))

			inode->i_mode &= ~S_ISGID;

	}



	if (ia_valid & (ATTR_MTIME_SET | ATTR_ATIME_SET))

		flags |= ATTR_UTIME;

#ifdef ATTR_NO_BLOCK

	if ((ia_valid & ATTR_NO_BLOCK))

		flags |= ATTR_NONBLOCK;

#endif



	error = xfs_setattr(XFS_I(inode), &vattr, flags, NULL);

	error = xfs_setattr(XFS_I(inode), iattr, 0, NULL);

	if (likely(!error))

		vn_revalidate(vn_from_inode(inode));

	return -error;
@@ -739,18 +705,18 @@ xfs_vn_fallocate( 


	xfs_ilock(ip, XFS_IOLOCK_EXCL);

	error = xfs_change_file_space(ip, XFS_IOC_RESVSP, &bf,

						0, NULL, ATTR_NOLOCK);

				      0, NULL, XFS_ATTR_NOLOCK);

	if (!error && !(mode & FALLOC_FL_KEEP_SIZE) &&

	    offset + len > i_size_read(inode))

		new_size = offset + len;



	/* Change file size if needed */

	if (new_size) {

		bhv_vattr_t	va;

		struct iattr iattr;



		va.va_mask = XFS_AT_SIZE;

		va.va_size = new_size;

		error = xfs_setattr(ip, &va, ATTR_NOLOCK, NULL);

		iattr.ia_valid = ATTR_SIZE;

		iattr.ia_size = new_size;

		error = xfs_setattr(ip, &iattr, XFS_ATTR_NOLOCK, NULL);

	}



	xfs_iunlock(ip, XFS_IOLOCK_EXCL);

fs/xfs/linux-2.6/xfs_vnode.h

+0 −73
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#define __XFS_VNODE_H__



struct file;

struct bhv_vattr;

struct xfs_iomap;

struct attrlist_cursor_kern;
@@ -66,69 +65,6 @@ static inline struct inode *vn_to_inode(bhv_vnode_t *vnode) 
					   Prevent VM access to the pages until

					   the operation completes. */



/*

 * Vnode attributes.  va_mask indicates those attributes the caller

 * wants to set or extract.

 */

typedef struct bhv_vattr {

	int		va_mask;	/* bit-mask of attributes present */

	mode_t		va_mode;	/* file access mode and type */

	xfs_nlink_t	va_nlink;	/* number of references to file */

	uid_t		va_uid;		/* owner user id */

	gid_t		va_gid;		/* owner group id */

	xfs_ino_t	va_nodeid;	/* file id */

	xfs_off_t	va_size;	/* file size in bytes */

	u_long		va_blocksize;	/* blocksize preferred for i/o */

	struct timespec	va_atime;	/* time of last access */

	struct timespec	va_mtime;	/* time of last modification */

	struct timespec	va_ctime;	/* time file changed */

	u_int		va_gen;		/* generation number of file */

	xfs_dev_t	va_rdev;	/* device the special file represents */

	__int64_t	va_nblocks;	/* number of blocks allocated */

	u_long		va_xflags;	/* random extended file flags */

	u_long		va_extsize;	/* file extent size */

	u_long		va_nextents;	/* number of extents in file */

	u_long		va_anextents;	/* number of attr extents in file */

	prid_t		va_projid;	/* project id */

} bhv_vattr_t;



/*

 * setattr or getattr attributes

 */

#define XFS_AT_TYPE		0x00000001

#define XFS_AT_MODE		0x00000002

#define XFS_AT_UID		0x00000004

#define XFS_AT_GID		0x00000008

#define XFS_AT_FSID		0x00000010

#define XFS_AT_NODEID		0x00000020

#define XFS_AT_NLINK		0x00000040

#define XFS_AT_SIZE		0x00000080

#define XFS_AT_ATIME		0x00000100

#define XFS_AT_MTIME		0x00000200

#define XFS_AT_CTIME		0x00000400

#define XFS_AT_RDEV		0x00000800

#define XFS_AT_BLKSIZE		0x00001000

#define XFS_AT_NBLOCKS		0x00002000

#define XFS_AT_VCODE		0x00004000

#define XFS_AT_MAC		0x00008000

#define XFS_AT_UPDATIME		0x00010000

#define XFS_AT_UPDMTIME		0x00020000

#define XFS_AT_UPDCTIME		0x00040000

#define XFS_AT_ACL		0x00080000

#define XFS_AT_CAP		0x00100000

#define XFS_AT_INF		0x00200000

#define XFS_AT_NEXTENTS		0x01000000

#define XFS_AT_ANEXTENTS	0x02000000

#define XFS_AT_SIZE_NOPERM	0x08000000

#define XFS_AT_GENCOUNT		0x10000000



#define XFS_AT_TIMES	(XFS_AT_ATIME|XFS_AT_MTIME|XFS_AT_CTIME)



#define XFS_AT_UPDTIMES	(XFS_AT_UPDATIME|XFS_AT_UPDMTIME|XFS_AT_UPDCTIME)



#define XFS_AT_NOSET	(XFS_AT_NLINK|XFS_AT_RDEV|XFS_AT_FSID|XFS_AT_NODEID|\

		XFS_AT_TYPE|XFS_AT_BLKSIZE|XFS_AT_NBLOCKS|XFS_AT_VCODE|\

		XFS_AT_NEXTENTS|XFS_AT_ANEXTENTS|XFS_AT_GENCOUNT)



extern void	vn_init(void);

extern int	vn_revalidate(bhv_vnode_t *);
@@ -204,15 +140,6 @@ static inline void vn_atime_to_time_t(bhv_vnode_t *vp, time_t *tt) 
#define VN_DIRTY(vp)	mapping_tagged(vn_to_inode(vp)->i_mapping, \

					PAGECACHE_TAG_DIRTY)



/*

 * Flags to vop_setattr/getattr.

 */

#define	ATTR_UTIME	0x01	/* non-default utime(2) request */

#define	ATTR_DMI	0x08	/* invocation from a DMI function */

#define	ATTR_LAZY	0x80	/* set/get attributes lazily */

#define	ATTR_NONBLOCK	0x100	/* return EAGAIN if operation would block */

#define ATTR_NOLOCK	0x200	/* Don't grab any conflicting locks */

#define ATTR_NOSIZETOK	0x400	/* Don't get the SIZE token */



/*

 * Tracking vnode activity.

fs/xfs/xfs_acl.c

+9 −9
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ xfs_acl_setmode( 
	xfs_acl_t	*acl,

	int		*basicperms)

{

	bhv_vattr_t	va;

	struct iattr	iattr;

	xfs_acl_entry_t	*ap;

	xfs_acl_entry_t	*gap = NULL;

	int		i, nomask = 1;
@@ -733,25 +733,25 @@ xfs_acl_setmode( 
	 * Copy the u::, g::, o::, and m:: bits from the ACL into the

	 * mode.  The m:: bits take precedence over the g:: bits.

	 */

	va.va_mask = XFS_AT_MODE;

	va.va_mode = xfs_vtoi(vp)->i_d.di_mode;

	va.va_mode &= ~(S_IRWXU|S_IRWXG|S_IRWXO);

	iattr.ia_valid = ATTR_MODE;

	iattr.ia_mode = xfs_vtoi(vp)->i_d.di_mode;

	iattr.ia_mode &= ~(S_IRWXU|S_IRWXG|S_IRWXO);

	ap = acl->acl_entry;

	for (i = 0; i < acl->acl_cnt; ++i) {

		switch (ap->ae_tag) {

		case ACL_USER_OBJ:

			va.va_mode |= ap->ae_perm << 6;

			iattr.ia_mode |= ap->ae_perm << 6;

			break;

		case ACL_GROUP_OBJ:

			gap = ap;

			break;

		case ACL_MASK:	/* more than just standard modes */

			nomask = 0;

			va.va_mode |= ap->ae_perm << 3;

			iattr.ia_mode |= ap->ae_perm << 3;

			*basicperms = 0;

			break;

		case ACL_OTHER:

			va.va_mode |= ap->ae_perm;

			iattr.ia_mode |= ap->ae_perm;

			break;

		default:	/* more than just standard modes */

			*basicperms = 0;
@@ -762,9 +762,9 @@ xfs_acl_setmode( 


	/* Set the group bits from ACL_GROUP_OBJ if there's no ACL_MASK */

	if (gap && nomask)

		va.va_mode |= gap->ae_perm << 3;

		iattr.ia_mode |= gap->ae_perm << 3;



	return xfs_setattr(xfs_vtoi(vp), &va, 0, sys_cred);

	return xfs_setattr(xfs_vtoi(vp), &iattr, 0, sys_cred);

}



/*

fs/xfs/xfs_dmapi.h

+1 −1
Original line number Diff line number Diff line
@@ -166,6 +166,6 @@ typedef enum { 


#define FILP_DELAY_FLAG(filp) ((filp->f_flags&(O_NDELAY|O_NONBLOCK)) ? \

			DM_FLAGS_NDELAY : 0)

#define AT_DELAY_FLAG(f) ((f&ATTR_NONBLOCK) ? DM_FLAGS_NDELAY : 0)

#define AT_DELAY_FLAG(f) ((f & XFS_ATTR_NONBLOCK) ? DM_FLAGS_NDELAY : 0)



#endif  /* __XFS_DMAPI_H__ */