* [PATCH RESEND 2.5]FIX XFS redefines
@ 2002-11-28 12:24 Lucio Maciel
0 siblings, 0 replies; 3+ messages in thread
From: Lucio Maciel @ 2002-11-28 12:24 UTC (permalink / raw)
To: owner-xfs; +Cc: LKML, lord, linux-xfs, Linus Torvalds
Hello....
This patch fixes this redefines in linux-2.5.49 and 2.5.50 ...
In file included from fs/xfs/linux/xfs_linux.h:56,
from fs/xfs/xfs.h:54,
from fs/xfs/xfs_acl.c:33:
fs/xfs/linux/xfs_vnode.h:546: warning: `AT_UID' redefined
include/linux/elf.h:172: warning: this is the location of the previous definition
fs/xfs/linux/xfs_vnode.h:547: warning: `AT_GID' redefined
include/linux/elf.h:174: warning: this is the location of the previous definition
....
This happens, because linux/module.h is including linux/elf.h that define AT_UID and AT_GID (since 2.5.49) ...
i just renamed the XFS Attributes defines from AT_XXX to XFS_AT_XXX
best regards.
--
::: Lucio F. Maciel
::: abslucio@terra.com.br
::: icq 93065464
::: Absoluta.net
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH RESEND 2.5]FIX XFS redefines
@ 2002-11-28 12:25 Lucio Maciel
0 siblings, 0 replies; 3+ messages in thread
From: Lucio Maciel @ 2002-11-28 12:25 UTC (permalink / raw)
To: owner-xfs; +Cc: LKML, lord, linux-xfs, Linus Torvalds
[-- Attachment #1: Type: text/plain, Size: 834 bytes --]
I Hate when this happens... now with the pacth attached...
Hello....
This patch fixes this redefines in linux-2.5.49 and 2.5.50 ...
In file included from fs/xfs/linux/xfs_linux.h:56,
from fs/xfs/xfs.h:54,
from fs/xfs/xfs_acl.c:33:
fs/xfs/linux/xfs_vnode.h:546: warning: `AT_UID' redefined
include/linux/elf.h:172: warning: this is the location of the previous definition
fs/xfs/linux/xfs_vnode.h:547: warning: `AT_GID' redefined
include/linux/elf.h:174: warning: this is the location of the previous definition
....
This happens, because linux/module.h is including linux/elf.h that define AT_UID and AT_GID (since 2.5.49) ...
i just renamed the XFS Attributes defines from AT_XXX to XFS_AT_XXX
best regards.
--
::: Lucio F. Maciel
::: abslucio@terra.com.br
::: icq 93065464
::: Absoluta.net
[-- Attachment #2: xfs.patch --]
[-- Type: application/octet-stream, Size: 24149 bytes --]
diff -ur --exclude=autoconf.h --exclude='*diff' --exclude=compile_log --exclude=xfs_error --exclude=xfs_log --exclude=error --exclude=.config --exclude='*.cmd' linus-2.5.49/fs/xfs/linux/xfs_file.c linux-2.5.49/fs/xfs/linux/xfs_file.c
--- linus-2.5.49/fs/xfs/linux/xfs_file.c 2002-11-04 20:30:30.000000000 -0200
+++ linux-2.5.49/fs/xfs/linux/xfs_file.c 2002-11-23 00:30:54.000000000 -0200
@@ -280,7 +280,7 @@
{
struct inode *ip = filp->f_dentry->d_inode;
vnode_t *vp = LINVFS_GET_VP(ip);
- vattr_t va = { .va_mask = AT_UPDATIME };
+ vattr_t va = { .va_mask = XFS_AT_UPDATIME };
int error;
if ((vp->v_type == VREG) && (vp->v_vfsp->vfs_flag & VFS_DMI)) {
@@ -291,7 +291,7 @@
vma->vm_ops = &linvfs_file_vm_ops;
- VOP_SETATTR(vp, &va, AT_UPDATIME, NULL, error);
+ VOP_SETATTR(vp, &va, XFS_AT_UPDATIME, NULL, error);
UPDATE_ATIME(ip);
return 0;
}
diff -ur --exclude=autoconf.h --exclude='*diff' --exclude=compile_log --exclude=xfs_error --exclude=xfs_log --exclude=error --exclude=.config --exclude='*.cmd' linus-2.5.49/fs/xfs/linux/xfs_ioctl.c linux-2.5.49/fs/xfs/linux/xfs_ioctl.c
--- linus-2.5.49/fs/xfs/linux/xfs_ioctl.c 2002-11-22 22:29:53.000000000 -0200
+++ linux-2.5.49/fs/xfs/linux/xfs_ioctl.c 2002-11-23 00:30:54.000000000 -0200
@@ -945,7 +945,7 @@
switch (cmd) {
case XFS_IOC_FSGETXATTR: {
- va.va_mask = AT_XFLAGS|AT_EXTSIZE|AT_NEXTENTS;
+ va.va_mask = XFS_AT_XFLAGS|XFS_AT_EXTSIZE|XFS_AT_NEXTENTS;
VOP_GETATTR(vp, &va, 0, NULL, error);
if (error)
return -error;
@@ -965,7 +965,7 @@
if (copy_from_user(&fa, (struct fsxattr *)arg, sizeof(fa)))
return -XFS_ERROR(EFAULT);
- va.va_mask = AT_XFLAGS | AT_EXTSIZE;
+ va.va_mask = XFS_AT_XFLAGS | XFS_AT_EXTSIZE;
va.va_xflags = fa.fsx_xflags;
va.va_extsize = fa.fsx_extsize;
@@ -978,7 +978,7 @@
case XFS_IOC_FSGETXATTRA: {
- va.va_mask = AT_XFLAGS|AT_EXTSIZE|AT_ANEXTENTS;
+ va.va_mask = XFS_AT_XFLAGS|XFS_AT_EXTSIZE|XFS_AT_ANEXTENTS;
VOP_GETATTR(vp, &va, 0, NULL, error);
if (error)
return -error;
diff -ur --exclude=autoconf.h --exclude='*diff' --exclude=compile_log --exclude=xfs_error --exclude=xfs_log --exclude=error --exclude=.config --exclude='*.cmd' linus-2.5.49/fs/xfs/linux/xfs_iops.c linux-2.5.49/fs/xfs/linux/xfs_iops.c
--- linus-2.5.49/fs/xfs/linux/xfs_iops.c 2002-11-22 22:31:43.000000000 -0200
+++ linux-2.5.49/fs/xfs/linux/xfs_iops.c 2002-11-23 00:30:54.000000000 -0200
@@ -45,7 +45,7 @@
vattr_t va;
int error;
- va.va_mask = AT_NLINK|AT_SIZE;
+ va.va_mask = XFS_AT_NLINK|XFS_AT_SIZE;
VOP_GETATTR(vp, &va, ATTR_LAZY, NULL, error);
ip->i_nlink = va.va_nlink;
ip->i_size = va.va_size;
@@ -85,14 +85,14 @@
mode &= ~current->fs->umask;
memset(&va, 0, sizeof(va));
- va.va_mask = AT_TYPE|AT_MODE;
+ va.va_mask = XFS_AT_TYPE|XFS_AT_MODE;
va.va_type = IFTOVT(mode);
va.va_mode = mode;
switch (mode & S_IFMT) {
case S_IFCHR: case S_IFBLK: case S_IFIFO: case S_IFSOCK:
va.va_rdev = XFS_MKDEV(MAJOR(rdev), MINOR(rdev));
- va.va_mask |= AT_RDEV;
+ va.va_mask |= XFS_AT_RDEV;
/*FALLTHROUGH*/
case S_IFREG:
VOP_CREATE(dvp, dentry, &va, &vp, NULL, error);
@@ -255,7 +255,7 @@
memset(&va, 0, sizeof(va));
va.va_type = VLNK;
va.va_mode = irix_symlink_mode ? 0777 & ~current->fs->umask : S_IRWXUGO;
- va.va_mask = AT_TYPE|AT_MODE;
+ va.va_mask = XFS_AT_TYPE|XFS_AT_MODE;
error = 0;
VOP_SYMLINK(dvp, dentry, &va, (char *)symname, &cvp, NULL, error);
@@ -462,31 +462,31 @@
memset(&vattr, 0, sizeof(vattr_t));
if (ia_valid & ATTR_UID) {
- vattr.va_mask |= AT_UID;
+ vattr.va_mask |= XFS_AT_UID;
vattr.va_uid = attr->ia_uid;
}
if (ia_valid & ATTR_GID) {
- vattr.va_mask |= AT_GID;
+ vattr.va_mask |= XFS_AT_GID;
vattr.va_gid = attr->ia_gid;
}
if (ia_valid & ATTR_SIZE) {
- vattr.va_mask |= AT_SIZE;
+ vattr.va_mask |= XFS_AT_SIZE;
vattr.va_size = attr->ia_size;
}
if (ia_valid & ATTR_ATIME) {
- vattr.va_mask |= AT_ATIME;
+ vattr.va_mask |= XFS_AT_ATIME;
vattr.va_atime = attr->ia_atime;
}
if (ia_valid & ATTR_MTIME) {
- vattr.va_mask |= AT_MTIME;
+ vattr.va_mask |= XFS_AT_MTIME;
vattr.va_mtime = attr->ia_mtime;
}
if (ia_valid & ATTR_CTIME) {
- vattr.va_mask |= AT_CTIME;
+ vattr.va_mask |= XFS_AT_CTIME;
vattr.va_ctime = attr->ia_ctime;
}
if (ia_valid & ATTR_MODE) {
- vattr.va_mask |= AT_MODE;
+ vattr.va_mask |= XFS_AT_MODE;
vattr.va_mode = attr->ia_mode;
if (!in_group_p(inode->i_gid) && !capable(CAP_FSETID))
inode->i_mode &= ~S_ISGID;
diff -ur --exclude=autoconf.h --exclude='*diff' --exclude=compile_log --exclude=xfs_error --exclude=xfs_log --exclude=error --exclude=.config --exclude='*.cmd' linus-2.5.49/fs/xfs/linux/xfs_vnode.c linux-2.5.49/fs/xfs/linux/xfs_vnode.c
--- linus-2.5.49/fs/xfs/linux/xfs_vnode.c 2002-11-22 22:29:53.000000000 -0200
+++ linux-2.5.49/fs/xfs/linux/xfs_vnode.c 2002-11-23 00:30:54.000000000 -0200
@@ -200,7 +200,7 @@
vn_trace_entry(vp, "vn_revalidate", (inst_t *)__return_address);
- va.va_mask = AT_STAT|AT_GENCOUNT;
+ va.va_mask = XFS_AT_STAT|XFS_AT_GENCOUNT;
ASSERT(vp->v_bh.bh_first != NULL);
diff -ur --exclude=autoconf.h --exclude='*diff' --exclude=compile_log --exclude=xfs_error --exclude=xfs_log --exclude=error --exclude=.config --exclude='*.cmd' linus-2.5.49/fs/xfs/linux/xfs_vnode.h linux-2.5.49/fs/xfs/linux/xfs_vnode.h
--- linus-2.5.49/fs/xfs/linux/xfs_vnode.h 2002-11-11 23:57:07.000000000 -0200
+++ linux-2.5.49/fs/xfs/linux/xfs_vnode.h 2002-11-23 00:37:24.000000000 -0200
@@ -541,53 +541,53 @@
/*
* setattr or getattr attributes
*/
-#define AT_TYPE 0x00000001
-#define AT_MODE 0x00000002
-#define AT_UID 0x00000004
-#define AT_GID 0x00000008
-#define AT_FSID 0x00000010
-#define AT_NODEID 0x00000020
-#define AT_NLINK 0x00000040
-#define AT_SIZE 0x00000080
-#define AT_ATIME 0x00000100
-#define AT_MTIME 0x00000200
-#define AT_CTIME 0x00000400
-#define AT_RDEV 0x00000800
-#define AT_BLKSIZE 0x00001000
-#define AT_NBLOCKS 0x00002000
-#define AT_VCODE 0x00004000
-#define AT_MAC 0x00008000
-#define AT_UPDATIME 0x00010000
-#define AT_UPDMTIME 0x00020000
-#define AT_UPDCTIME 0x00040000
-#define AT_ACL 0x00080000
-#define AT_CAP 0x00100000
-#define AT_INF 0x00200000
-#define AT_XFLAGS 0x00400000
-#define AT_EXTSIZE 0x00800000
-#define AT_NEXTENTS 0x01000000
-#define AT_ANEXTENTS 0x02000000
-#define AT_PROJID 0x04000000
-#define AT_SIZE_NOPERM 0x08000000
-#define AT_GENCOUNT 0x10000000
-
-#define AT_ALL (AT_TYPE|AT_MODE|AT_UID|AT_GID|AT_FSID|AT_NODEID|\
- AT_NLINK|AT_SIZE|AT_ATIME|AT_MTIME|AT_CTIME|AT_RDEV|\
- AT_BLKSIZE|AT_NBLOCKS|AT_VCODE|AT_MAC|AT_ACL|AT_CAP|\
- AT_INF|AT_XFLAGS|AT_EXTSIZE|AT_NEXTENTS|AT_ANEXTENTS|\
- AT_PROJID|AT_GENCOUNT)
-
-#define AT_STAT (AT_TYPE|AT_MODE|AT_UID|AT_GID|AT_FSID|AT_NODEID|AT_NLINK|\
- AT_SIZE|AT_ATIME|AT_MTIME|AT_CTIME|AT_RDEV|AT_BLKSIZE|\
- AT_NBLOCKS|AT_PROJID)
-
-#define AT_TIMES (AT_ATIME|AT_MTIME|AT_CTIME)
-
-#define AT_UPDTIMES (AT_UPDATIME|AT_UPDMTIME|AT_UPDCTIME)
-
-#define AT_NOSET (AT_NLINK|AT_RDEV|AT_FSID|AT_NODEID|AT_TYPE|\
- AT_BLKSIZE|AT_NBLOCKS|AT_VCODE|AT_NEXTENTS|AT_ANEXTENTS|\
- AT_GENCOUNT)
+#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_XFLAGS 0x00400000
+#define XFS_AT_EXTSIZE 0x00800000
+#define XFS_AT_NEXTENTS 0x01000000
+#define XFS_AT_ANEXTENTS 0x02000000
+#define XFS_AT_PROJID 0x04000000
+#define XFS_AT_SIZE_NOPERM 0x08000000
+#define XFS_AT_GENCOUNT 0x10000000
+
+#define XFS_AT_ALL (XFS_AT_TYPE|XFS_AT_MODE|XFS_AT_UID|XFS_AT_GID|XFS_AT_FSID|\
+ XFS_AT_NODEID|XFS_AT_NLINK|XFS_AT_SIZE|XFS_AT_ATIME|XFS_AT_MTIME|\
+ XFS_AT_CTIME|XFS_AT_RDEV|XFS_AT_BLKSIZE|XFS_AT_NBLOCKS|XFS_AT_VCODE|\
+ XFS_AT_MAC|XFS_AT_ACL|XFS_AT_CAP|XFS_AT_INF|XFS_AT_XFLAGS|XFS_AT_EXTSIZE|\
+ XFS_AT_NEXTENTS|XFS_AT_ANEXTENTS|XFS_AT_PROJID|XFS_AT_GENCOUNT)
+
+#define XFS_AT_STAT (XFS_AT_TYPE|XFS_AT_MODE|XFS_AT_UID|XFS_AT_GID|XFS_AT_FSID|\
+ XFS_AT_NODEID|XFS_AT_NLINK|XFS_AT_SIZE|XFS_AT_ATIME|XFS_AT_MTIME|\
+ XFS_AT_CTIME|XFS_AT_RDEV|XFS_AT_BLKSIZE|XFS_AT_NBLOCKS|XFS_AT_PROJID)
+
+#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)
#define VREAD 00400
#define VWRITE 00200
diff -ur --exclude=autoconf.h --exclude='*diff' --exclude=compile_log --exclude=xfs_error --exclude=xfs_log --exclude=error --exclude=.config --exclude='*.cmd' linus-2.5.49/fs/xfs/xfs_acl.c linux-2.5.49/fs/xfs/xfs_acl.c
--- linus-2.5.49/fs/xfs/xfs_acl.c 2002-11-11 23:57:07.000000000 -0200
+++ linux-2.5.49/fs/xfs/xfs_acl.c 2002-11-23 00:30:54.000000000 -0200
@@ -235,7 +235,7 @@
if (kind == _ACL_TYPE_ACCESS) {
vattr_t va;
- va.va_mask = AT_MODE;
+ va.va_mask = XFS_AT_MODE;
VOP_GETATTR(vp, &va, 0, sys_cred, error);
if (error)
goto out;
@@ -372,7 +372,7 @@
return EROFS;
if ((error = _MAC_VACCESS(vp, NULL, VWRITE)))
return error;
- va.va_mask = AT_UID;
+ va.va_mask = XFS_AT_UID;
VOP_GETATTR(vp, &va, 0, NULL, error);
if (error)
return error;
@@ -702,7 +702,7 @@
xfs_acl_get_attr(vp, access_acl, _ACL_TYPE_ACCESS, 0, &error);
if (!error) {
/* Got the ACL, need the mode... */
- va.va_mask = AT_MODE;
+ va.va_mask = XFS_AT_MODE;
VOP_GETATTR(vp, &va, 0, sys_cred, error);
}
@@ -800,12 +800,12 @@
* 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 = AT_MODE;
+ va.va_mask = XFS_AT_MODE;
VOP_GETATTR(vp, &va, 0, sys_cred, error);
if (error)
return error;
- va.va_mask = AT_MODE;
+ va.va_mask = XFS_AT_MODE;
va.va_mode &= ~(S_IRWXU|S_IRWXG|S_IRWXO);
ap = acl->acl_entry;
for (i = 0; i < acl->acl_cnt; ++i) {
diff -ur --exclude=autoconf.h --exclude='*diff' --exclude=compile_log --exclude=xfs_error --exclude=xfs_log --exclude=error --exclude=.config --exclude='*.cmd' linus-2.5.49/fs/xfs/xfs_cap.c linux-2.5.49/fs/xfs/xfs_cap.c
--- linus-2.5.49/fs/xfs/xfs_cap.c 2002-11-04 20:30:25.000000000 -0200
+++ linux-2.5.49/fs/xfs/xfs_cap.c 2002-11-23 00:30:54.000000000 -0200
@@ -192,7 +192,7 @@
return EROFS;
if ((error = _MAC_VACCESS(vp, NULL, VWRITE)))
return error;
- va.va_mask = AT_UID;
+ va.va_mask = XFS_AT_UID;
VOP_GETATTR(vp, &va, 0, NULL, error);
if (error)
return error;
diff -ur --exclude=autoconf.h --exclude='*diff' --exclude=compile_log --exclude=xfs_error --exclude=xfs_log --exclude=error --exclude=.config --exclude='*.cmd' linus-2.5.49/fs/xfs/xfs_qm.c linux-2.5.49/fs/xfs/xfs_qm.c
--- linus-2.5.49/fs/xfs/xfs_qm.c 2002-11-11 23:57:08.000000000 -0200
+++ linux-2.5.49/fs/xfs/xfs_qm.c 2002-11-23 00:30:54.000000000 -0200
@@ -2639,7 +2639,7 @@
}
/*
- * Quota reservations for setattr(AT_UID|AT_GID).
+ * Quota reservations for setattr(XFS_AT_UID|XFS_AT_GID).
*/
int
xfs_qm_vop_chown_reserve(
diff -ur --exclude=autoconf.h --exclude='*diff' --exclude=compile_log --exclude=xfs_error --exclude=xfs_log --exclude=error --exclude=.config --exclude='*.cmd' linus-2.5.49/fs/xfs/xfs_vnodeops.c linux-2.5.49/fs/xfs/xfs_vnodeops.c
--- linus-2.5.49/fs/xfs/xfs_vnodeops.c 2002-11-11 23:57:08.000000000 -0200
+++ linux-2.5.49/fs/xfs/xfs_vnodeops.c 2002-11-23 12:51:04.000000000 -0200
@@ -119,7 +119,7 @@
xfs_ilock(ip, XFS_ILOCK_SHARED);
vap->va_size = ip->i_d.di_size;
- if (vap->va_mask == AT_SIZE) {
+ if (vap->va_mask == XFS_AT_SIZE) {
if (!(flags & ATTR_LAZY))
xfs_iunlock(ip, XFS_ILOCK_SHARED);
return 0;
@@ -137,7 +137,8 @@
/*
* Quick exit for non-stat callers
*/
- if ((vap->va_mask & ~(AT_SIZE|AT_FSID|AT_NODEID|AT_NLINK)) == 0) {
+ if ((vap->va_mask &
+ ~(XFS_AT_SIZE|XFS_AT_FSID|XFS_AT_NODEID|XFS_AT_NLINK)) == 0) {
if (!(flags & ATTR_LAZY))
xfs_iunlock(ip, XFS_ILOCK_SHARED);
return 0;
@@ -224,8 +225,8 @@
* to be filled in are needed.
*/
if ((vap->va_mask &
- (AT_XFLAGS|AT_EXTSIZE|AT_NEXTENTS|AT_ANEXTENTS|
- AT_GENCOUNT|AT_VCODE)) == 0) {
+ (XFS_AT_XFLAGS|XFS_AT_EXTSIZE|XFS_AT_NEXTENTS|XFS_AT_ANEXTENTS|
+ XFS_AT_GENCOUNT|XFS_AT_VCODE)) == 0) {
if (!(flags & ATTR_LAZY))
xfs_iunlock(ip, XFS_ILOCK_SHARED);
return 0;
@@ -294,7 +295,7 @@
* Cannot set certain attributes.
*/
mask = vap->va_mask;
- if (mask & AT_NOSET) {
+ if (mask & XFS_AT_NOSET) {
return XFS_ERROR(EINVAL);
}
@@ -308,11 +309,11 @@
* Timestamps do not need to be logged and hence do not
* need to be done within a transaction.
*/
- if (mask & AT_UPDTIMES) {
+ if (mask & XFS_AT_UPDTIMES) {
ASSERT((mask & ~AT_UPDTIMES) == 0);
- timeflags = ((mask & AT_UPDATIME) ? XFS_ICHGTIME_ACC : 0) |
- ((mask & AT_UPDCTIME) ? XFS_ICHGTIME_CHG : 0) |
- ((mask & AT_UPDMTIME) ? XFS_ICHGTIME_MOD : 0);
+ timeflags = ((mask & XFS_AT_UPDATIME) ? XFS_ICHGTIME_ACC : 0) |
+ ((mask & XFS_AT_UPDCTIME) ? XFS_ICHGTIME_CHG : 0) |
+ ((mask & XFS_AT_UPDMTIME) ? XFS_ICHGTIME_MOD : 0);
xfs_ichgtime(ip, timeflags);
return 0;
}
@@ -328,15 +329,15 @@
* If the IDs do change before we take the ilock, we're covered
* because the i_*dquot fields will get updated anyway.
*/
- if (XFS_IS_QUOTA_ON(mp) && (mask & (AT_UID|AT_GID))) {
+ if (XFS_IS_QUOTA_ON(mp) && (mask & (XFS_AT_UID|XFS_AT_GID))) {
qflags = 0;
- if (mask & AT_UID) {
+ if (mask & XFS_AT_UID) {
uid = vap->va_uid;
qflags |= XFS_QMOPT_UQUOTA;
} else {
uid = ip->i_d.di_uid;
}
- if (mask & AT_GID) {
+ if (mask & XFS_AT_GID) {
gid = vap->va_gid;
qflags |= XFS_QMOPT_GQUOTA;
} else {
@@ -360,8 +361,8 @@
*/
tp = NULL;
lock_flags = XFS_ILOCK_EXCL;
- if (!(mask & AT_SIZE)) {
- if ((mask != (AT_CTIME|AT_ATIME|AT_MTIME)) ||
+ if (!(mask & XFS_AT_SIZE)) {
+ if ((mask != (XFS_AT_CTIME|XFS_AT_ATIME|XFS_AT_MTIME)) ||
(mp->m_flags & XFS_MOUNT_WSYNC)) {
tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_NOT_SIZE);
commit_flags = 0;
@@ -400,7 +401,8 @@
* Only the owner or users with CAP_FOWNER
* capability may do these things.
*/
- if (mask & (AT_MODE|AT_XFLAGS|AT_EXTSIZE|AT_UID|AT_GID|AT_PROJID)) {
+ if (mask & (XFS_AT_MODE|XFS_AT_XFLAGS|XFS_AT_EXTSIZE|XFS_AT_UID|
+ XFS_AT_GID|XFS_AT_PROJID)) {
/*
* CAP_FOWNER overrides the following restrictions:
*
@@ -424,7 +426,7 @@
* IDs of the calling process shall match the group owner of
* the file when setting the set-group-ID bit on that file
*/
- if (mask & AT_MODE) {
+ if (mask & XFS_AT_MODE) {
mode_t m = 0;
if ((vap->va_mode & ISUID) && !file_owner)
@@ -449,7 +451,7 @@
* and can change the group id only to a group of which he
* or she is a member.
*/
- if (mask & (AT_UID|AT_GID|AT_PROJID)) {
+ if (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_PROJID)) {
/*
* These IDs could have changed since we last looked at them.
* But, we're assured that if the ownership did change
@@ -459,9 +461,9 @@
iuid = ip->i_d.di_uid;
iprojid = ip->i_d.di_projid;
igid = ip->i_d.di_gid;
- gid = (mask & AT_GID) ? vap->va_gid : igid;
- uid = (mask & AT_UID) ? vap->va_uid : iuid;
- projid = (mask & AT_PROJID) ? (xfs_prid_t)vap->va_projid :
+ gid = (mask & XFS_AT_GID) ? vap->va_gid : igid;
+ uid = (mask & XFS_AT_UID) ? vap->va_uid : iuid;
+ projid = (mask & XFS_AT_PROJID) ? (xfs_prid_t)vap->va_projid :
iprojid;
/*
@@ -506,13 +508,13 @@
/*
* Truncate file. Must have write permission and not be a directory.
*/
- if (mask & AT_SIZE) {
+ if (mask & XFS_AT_SIZE) {
/* Short circuit the truncate case for zero length files */
if ((vap->va_size == 0) &&
(ip->i_d.di_size == 0) && (ip->i_d.di_nextents == 0)) {
xfs_iunlock(ip, XFS_ILOCK_EXCL);
lock_flags &= ~XFS_ILOCK_EXCL;
- if (mask & AT_CTIME)
+ if (mask & XFS_AT_CTIME)
xfs_ichgtime(ip, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG);
code = 0;
goto error_return;
@@ -537,7 +539,7 @@
/*
* Change file access or modified times.
*/
- if (mask & (AT_ATIME|AT_MTIME)) {
+ if (mask & (XFS_AT_ATIME|XFS_AT_MTIME)) {
if (!file_owner) {
if ((flags & ATTR_UTIME) &&
!capable(CAP_FOWNER)) {
@@ -550,11 +552,11 @@
/*
* Change extent size or realtime flag.
*/
- if (mask & (AT_EXTSIZE|AT_XFLAGS)) {
+ if (mask & (XFS_AT_EXTSIZE|XFS_AT_XFLAGS)) {
/*
* Can't change extent size if any extents are allocated.
*/
- if (ip->i_d.di_nextents && (mask & AT_EXTSIZE) &&
+ if (ip->i_d.di_nextents && (mask & XFS_AT_EXTSIZE) &&
((ip->i_d.di_extsize << mp->m_sb.sb_blocklog) !=
vap->va_extsize) ) {
code = XFS_ERROR(EINVAL); /* EFBIG? */
@@ -569,11 +571,11 @@
* with buffered data writes is implemented.
*
*/
- if ((mask & AT_EXTSIZE) &&
+ if ((mask & XFS_AT_EXTSIZE) &&
((ip->i_d.di_extsize << mp->m_sb.sb_blocklog) !=
vap->va_extsize) &&
(!((ip->i_d.di_flags & XFS_DIFLAG_REALTIME) ||
- ((mask & AT_XFLAGS) &&
+ ((mask & XFS_AT_XFLAGS) &&
(vap->va_xflags & XFS_XFLAG_REALTIME))))) {
code = XFS_ERROR(EINVAL);
goto error_return;
@@ -582,7 +584,7 @@
/*
* Can't change realtime flag if any extents are allocated.
*/
- if (ip->i_d.di_nextents && (mask & AT_XFLAGS) &&
+ if (ip->i_d.di_nextents && (mask & XFS_AT_XFLAGS) &&
(ip->i_d.di_flags & XFS_DIFLAG_REALTIME) !=
(vap->va_xflags & XFS_XFLAG_REALTIME)) {
code = XFS_ERROR(EINVAL); /* EFBIG? */
@@ -592,11 +594,11 @@
* Extent size must be a multiple of the appropriate block
* size, if set at all.
*/
- if ((mask & AT_EXTSIZE) && vap->va_extsize != 0) {
+ if ((mask & XFS_AT_EXTSIZE) && vap->va_extsize != 0) {
xfs_extlen_t size;
if ((ip->i_d.di_flags & XFS_DIFLAG_REALTIME) ||
- ((mask & AT_XFLAGS) &&
+ ((mask & XFS_AT_XFLAGS) &&
(vap->va_xflags & XFS_XFLAG_REALTIME))) {
size = mp->m_sb.sb_rextsize <<
mp->m_sb.sb_blocklog;
@@ -611,7 +613,7 @@
/*
* If realtime flag is set then must have realtime data.
*/
- if ((mask & AT_XFLAGS) &&
+ if ((mask & XFS_AT_XFLAGS) &&
(vap->va_xflags & XFS_XFLAG_REALTIME)) {
if ((mp->m_sb.sb_rblocks == 0) ||
(mp->m_sb.sb_rextsize == 0) ||
@@ -624,13 +626,13 @@
/*
* Now we can make the changes. Before we join the inode
- * to the transaction, if AT_SIZE is set then take care of
+ * to the transaction, if XFS_AT_SIZE is set then take care of
* the part of the truncation that must be done without the
* inode lock. This needs to be done before joining the inode
* to the transaction, because the inode cannot be unlocked
* once it is a part of the transaction.
*/
- if (mask & AT_SIZE) {
+ if (mask & XFS_AT_SIZE) {
if (vap->va_size > ip->i_d.di_size) {
code = xfs_igrow_start(ip, vap->va_size, credp);
xfs_iunlock(ip, XFS_ILOCK_EXCL);
@@ -673,7 +675,7 @@
/*
* Truncate file. Must have write permission and not be a directory.
*/
- if (mask & AT_SIZE) {
+ if (mask & XFS_AT_SIZE) {
if (vap->va_size > ip->i_d.di_size) {
xfs_igrow_finish(tp, ip, vap->va_size,
!(flags & ATTR_DMI));
@@ -703,7 +705,7 @@
/*
* Change file access modes.
*/
- if (mask & AT_MODE) {
+ if (mask & XFS_AT_MODE) {
ip->i_d.di_mode &= IFMT;
ip->i_d.di_mode |= vap->va_mode & ~IFMT;
@@ -718,7 +720,7 @@
* and can change the group id only to a group of which he
* or she is a member.
*/
- if (mask & (AT_UID|AT_GID|AT_PROJID)) {
+ if (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_PROJID)) {
/*
* CAP_FSETID overrides the following restrictions:
*
@@ -736,7 +738,7 @@
*/
if (iuid != uid) {
if (XFS_IS_UQUOTA_ON(mp)) {
- ASSERT(mask & AT_UID);
+ ASSERT(mask & XFS_AT_UID);
ASSERT(udqp);
ASSERT(xfs_qm_dqid(udqp) == (xfs_dqid_t)uid);
olddquot1 = xfs_qm_vop_chown(tp, ip,
@@ -750,7 +752,7 @@
}
if (igid != gid) {
if (XFS_IS_GQUOTA_ON(mp)) {
- ASSERT(mask & AT_GID);
+ ASSERT(mask & XFS_AT_GID);
ASSERT(gdqp);
ASSERT(xfs_qm_dqid(gdqp) == gid);
olddquot2 = xfs_qm_vop_chown(tp, ip,
@@ -778,14 +780,14 @@
/*
* Change file access or modified times.
*/
- if (mask & (AT_ATIME|AT_MTIME)) {
- if (mask & AT_ATIME) {
+ if (mask & (XFS_AT_ATIME|XFS_AT_MTIME)) {
+ if (mask & XFS_AT_ATIME) {
ip->i_d.di_atime.t_sec = vap->va_atime.tv_sec;
ip->i_d.di_atime.t_nsec = vap->va_atime.tv_nsec;
ip->i_update_core = 1;
timeflags &= ~XFS_ICHGTIME_ACC;
}
- if (mask & AT_MTIME) {
+ if (mask & XFS_AT_MTIME) {
ip->i_d.di_mtime.t_sec = vap->va_mtime.tv_sec;
ip->i_d.di_mtime.t_nsec = vap->va_mtime.tv_nsec;
timeflags &= ~XFS_ICHGTIME_MOD;
@@ -798,15 +800,15 @@
/*
* Change XFS-added attributes.
*/
- if (mask & (AT_EXTSIZE|AT_XFLAGS)) {
- if (mask & AT_EXTSIZE) {
+ if (mask & (XFS_AT_EXTSIZE|XFS_AT_XFLAGS)) {
+ if (mask & XFS_AT_EXTSIZE) {
/*
* Converting bytes to fs blocks.
*/
ip->i_d.di_extsize = vap->va_extsize >>
mp->m_sb.sb_blocklog;
}
- if (mask & AT_XFLAGS) {
+ if (mask & XFS_AT_XFLAGS) {
ip->i_d.di_flags = 0;
if (vap->va_xflags & XFS_XFLAG_REALTIME) {
ip->i_d.di_flags |= XFS_DIFLAG_REALTIME;
@@ -822,11 +824,11 @@
}
/*
- * Change file inode change time only if AT_CTIME set
+ * Change file inode change time only if XFS_AT_CTIME set
* AND we have been called by a DMI function.
*/
- if ( (flags & ATTR_DMI) && (mask & AT_CTIME) ) {
+ if ( (flags & ATTR_DMI) && (mask & XFS_AT_CTIME) ) {
ip->i_d.di_ctime.t_sec = vap->va_ctime.tv_sec;
ip->i_d.di_ctime.t_nsec = vap->va_ctime.tv_nsec;
ip->i_update_core = 1;
@@ -2015,7 +2017,7 @@
return XFS_ERROR(EIO);
udqp = gdqp = NULL;
- if (vap->va_mask & AT_PROJID)
+ if (vap->va_mask & XFS_AT_PROJID)
prid = (xfs_prid_t)vap->va_projid;
else
prid = (xfs_prid_t)dfltprid;
@@ -2076,7 +2078,7 @@
if (resblks == 0 &&
(error = XFS_DIR_CANENTER(mp, tp, dp, name, namelen)))
goto error_return;
- rdev = (vap->va_mask & AT_RDEV) ? vap->va_rdev : 0;
+ rdev = (vap->va_mask & XFS_AT_RDEV) ? vap->va_rdev : 0;
error = xfs_dir_ialloc(&tp, dp,
MAKEIMODE(vap->va_type,vap->va_mode), 1,
rdev, credp, prid, resblks > 0,
@@ -2989,7 +2991,7 @@
mp = dp->i_mount;
udqp = gdqp = NULL;
- if (vap->va_mask & AT_PROJID)
+ if (vap->va_mask & XFS_AT_PROJID)
prid = (xfs_prid_t)vap->va_projid;
else
prid = (xfs_prid_t)dfltprid;
@@ -3049,7 +3051,7 @@
/*
* create the directory inode.
*/
- rdev = (vap->va_mask & AT_RDEV) ? vap->va_rdev : 0;
+ rdev = (vap->va_mask & XFS_AT_RDEV) ? vap->va_rdev : 0;
error = xfs_dir_ialloc(&tp, dp,
MAKEIMODE(vap->va_type,vap->va_mode), 2,
rdev, credp, prid, resblks > 0,
@@ -3594,7 +3596,7 @@
/* Return through std_return after this point. */
udqp = gdqp = NULL;
- if (vap->va_mask & AT_PROJID)
+ if (vap->va_mask & XFS_AT_PROJID)
prid = (xfs_prid_t)vap->va_projid;
else
prid = (xfs_prid_t)dfltprid;
@@ -3662,7 +3664,7 @@
/*
* Allocate an inode for the symlink.
*/
- rdev = (vap->va_mask & AT_RDEV) ? vap->va_rdev : 0;
+ rdev = (vap->va_mask & XFS_AT_RDEV) ? vap->va_rdev : 0;
error = xfs_dir_ialloc(&tp, dp, IFLNK | (vap->va_mode&~IFMT),
1, rdev, credp, prid, resblks > 0, &ip, NULL);
@@ -4824,7 +4826,7 @@
break;
}
- va.va_mask = AT_SIZE;
+ va.va_mask = XFS_AT_SIZE;
va.va_size = startoffset;
error = xfs_setattr(bdp, &va, attr_flags, credp);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH RESEND 2.5]FIX XFS redefines
[not found] <20021128102558.1b33f62a.abslucio@terra.com. br>
@ 2002-11-28 13:06 ` Christoph Hellwig
0 siblings, 0 replies; 3+ messages in thread
From: Christoph Hellwig @ 2002-11-28 13:06 UTC (permalink / raw)
To: Lucio Maciel; +Cc: owner-xfs, LKML, lord, linux-xfs, Linus Torvalds
On Thu, Nov 28, 2002 at 10:25:58AM -0200, Lucio Maciel wrote:
>
> I Hate when this happens... now with the pacth attached...
>
> Hello....
>
> This patch fixes this redefines in linux-2.5.49 and 2.5.50 ...
>
That patch is already in the XFS CVS repository and in the update I sent
to Linus a few days ago.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2002-11-28 12:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2002-11-28 12:24 [PATCH RESEND 2.5]FIX XFS redefines Lucio Maciel
-- strict thread matches above, loose matches on Subject: below --
2002-11-28 12:25 Lucio Maciel
[not found] <20021128102558.1b33f62a.abslucio@terra.com. br>
2002-11-28 13:06 ` Christoph Hellwig
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.