This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / xfs / linux-2.6 / xfs_iops.c

diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
index 962cf8d..e7d4eba 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -67,7 +67,6 @@
 #include "xfs_utils.h"
 
 #include <linux/xattr.h>
-#include <linux/namei.h>
 
 
 /*
@@ -498,28 +497,6 @@ linvfs_getattr(
        return 0;
 }
 
-STATIC int
-linvfs_setattr_flags(
-       vattr_t *vap,
-       unsigned int flags)
-{
-       unsigned int oldflags, newflags;
-
-       oldflags = vap->va_xflags;
-       newflags = oldflags & ~(XFS_XFLAG_IMMUTABLE |
-               XFS_XFLAG_IUNLINK | XFS_XFLAG_BARRIER);
-       if (flags & ATTR_FLAG_IMMUTABLE)
-               newflags |= XFS_XFLAG_IMMUTABLE;
-       if (flags & ATTR_FLAG_IUNLINK)
-               newflags |= XFS_XFLAG_IUNLINK;
-       if (flags & ATTR_FLAG_BARRIER)
-               newflags |= XFS_XFLAG_BARRIER;
-
-       if (oldflags ^ newflags)
-               vap->va_xflags = newflags;
-       return 0;
-}
-
 STATIC int
 linvfs_setattr(
        struct dentry   *dentry,
@@ -571,11 +548,6 @@ linvfs_setattr(
                flags |= ATTR_NONBLOCK;
 #endif
 
-       if (ia_valid & ATTR_ATTR_FLAG) {
-               vattr.va_mask |= XFS_AT_XFLAGS;
-               linvfs_setattr_flags(&vattr, attr->ia_attr_flags);
-       }
-
        VOP_SETATTR(vp, &vattr, flags, NULL, error);
        if (error)
                return -error;