This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / nfs / inode.c

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 7f25c31..36f5abc 100644 (file)
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -35,7 +35,6 @@
 #include <linux/mount.h>
 #include <linux/nfs_idmap.h>
 #include <linux/vfs.h>
-#include <linux/vserver/xid.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -333,9 +332,6 @@ nfs_sb_init(struct super_block *sb, rpc_authflavor_t authflavor)
        }
        server->backing_dev_info.ra_pages = server->rpages * NFS_MAX_READAHEAD;
 
-       if (server->flags & NFS_MOUNT_TAGXID)
-               sb->s_flags |= MS_TAGXID;
-
        sb->s_maxbytes = fsinfo.maxfilesize;
        if (sb->s_maxbytes > MAX_LFS_FILESIZE) 
                sb->s_maxbytes = MAX_LFS_FILESIZE; 
@@ -390,7 +386,6 @@ nfs_create_client(struct nfs_server *server, const struct nfs_mount_data *data)
        clnt->cl_intr     = (server->flags & NFS_MOUNT_INTR) ? 1 : 0;
        clnt->cl_softrtry = (server->flags & NFS_MOUNT_SOFT) ? 1 : 0;
        clnt->cl_droppriv = (server->flags & NFS_MOUNT_BROKEN_SUID) ? 1 : 0;
-       clnt->cl_tagxid   = (server->flags & NFS_MOUNT_TAGXID) ? 1 : 0;
        clnt->cl_chatty   = 1;
 
        return clnt;
@@ -568,7 +563,6 @@ static int nfs_show_options(struct seq_file *m, struct vfsmount *mnt)
                { NFS_MOUNT_NOAC, ",noac", "" },
                { NFS_MOUNT_NONLM, ",nolock", ",lock" },
                { NFS_MOUNT_BROKEN_SUID, ",broken_suid", "" },
-               { NFS_MOUNT_TAGXID, ",tagxid", "" },
                { 0, NULL, NULL }
        };
        struct proc_nfs_info *nfs_infop;
@@ -734,10 +728,8 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
                        nfsi->change_attr = fattr->change_attr;
                inode->i_size = nfs_size_to_loff_t(fattr->size);
                inode->i_nlink = fattr->nlink;
-               inode->i_uid = INOXID_UID(XID_TAG(inode), fattr->uid, fattr->gid);
-               inode->i_gid = INOXID_GID(XID_TAG(inode), fattr->uid, fattr->gid);
-               inode->i_xid = INOXID_XID(XID_TAG(inode), fattr->uid, fattr->gid, 0);
-                                        /* maybe fattr->xid someday */
+               inode->i_uid = fattr->uid;
+               inode->i_gid = fattr->gid;
                if (fattr->valid & (NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4)) {
                        /*
                         * report the blocks in 512byte units
@@ -763,19 +755,13 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
 
 out:
        return inode;
-/*
-fail_dlim:
-        make_bad_inode(inode);
-        iput(inode);
-       inode = NULL;
-*/
+
 out_no_inode:
        printk("nfs_fhget: iget failed\n");
        goto out;
 }
 
-#define NFS_VALID_ATTRS (ATTR_MODE|ATTR_UID|ATTR_GID|ATTR_XID|ATTR_SIZE|\
-                        ATTR_ATIME|ATTR_ATIME_SET|ATTR_MTIME|ATTR_MTIME_SET)
+#define NFS_VALID_ATTRS (ATTR_MODE|ATTR_UID|ATTR_GID|ATTR_SIZE|ATTR_ATIME|ATTR_ATIME_SET|ATTR_MTIME|ATTR_MTIME_SET)
 
 int
 nfs_setattr(struct dentry *dentry, struct iattr *attr)
@@ -815,8 +801,6 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr)
                        inode->i_uid = attr->ia_uid;
                if ((attr->ia_valid & ATTR_GID) != 0)
                        inode->i_gid = attr->ia_gid;
-               if ((attr->ia_valid & ATTR_XID) != 0)
-                       inode->i_xid = attr->ia_xid;
                if ((attr->ia_valid & ATTR_SIZE) != 0) {
                        inode->i_size = attr->ia_size;
                        vmtruncate(inode, attr->ia_size);
@@ -1083,9 +1067,6 @@ int nfs_refresh_inode(struct inode *inode, struct nfs_fattr *fattr)
        struct nfs_inode *nfsi = NFS_I(inode);
        loff_t cur_size, new_isize;
        int data_unstable;
-       uid_t uid;
-       gid_t gid;
-       xid_t xid = 0;
 
        /* Are we in the process of updating data on the server? */
        data_unstable = nfs_caches_unstable(inode);
@@ -1125,15 +1106,10 @@ int nfs_refresh_inode(struct inode *inode, struct nfs_fattr *fattr)
        } else if (S_ISREG(inode->i_mode) && new_isize > cur_size)
                        nfsi->flags |= NFS_INO_INVALID_ATTR;
 
-       uid = INOXID_UID(XID_TAG(inode), fattr->uid, fattr->gid);
-       gid = INOXID_GID(XID_TAG(inode), fattr->uid, fattr->gid);
-       xid = INOXID_XID(XID_TAG(inode), fattr->uid, fattr->gid, 0);
-
        /* Have any file permissions changed? */
        if ((inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO)
-                       || inode->i_uid != uid
-                       || inode->i_gid != gid
-                       || inode->i_xid != xid)
+                       || inode->i_uid != fattr->uid
+                       || inode->i_gid != fattr->gid)
                nfsi->flags |= NFS_INO_INVALID_ATTR;
 
        /* Has the link count changed? */
@@ -1167,9 +1143,6 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr, unsign
        unsigned int    invalid = 0;
        loff_t          cur_isize;
        int data_unstable;
-       uid_t           uid;
-       gid_t           gid;
-       xid_t           xid = 0;
 
        dfprintk(VFS, "NFS: %s(%s/%ld ct=%d info=0x%x)\n",
                        __FUNCTION__, inode->i_sb->s_id, inode->i_ino,
@@ -1252,14 +1225,9 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr, unsign
        memcpy(&inode->i_ctime, &fattr->ctime, sizeof(inode->i_ctime));
        memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
 
-       uid = INOXID_UID(XID_TAG(inode), fattr->uid, fattr->gid);
-       gid = INOXID_GID(XID_TAG(inode), fattr->uid, fattr->gid);
-       xid = INOXID_XID(XID_TAG(inode), fattr->uid, fattr->gid, 0);
-
        if ((inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO) ||
-           inode->i_uid != uid ||
-           inode->i_gid != gid ||
-           inode->i_xid != xid) {
+           inode->i_uid != fattr->uid ||
+           inode->i_gid != fattr->gid) {
                struct rpc_cred **cred = &NFS_I(inode)->cache_access.cred;
                if (*cred) {
                        put_rpccred(*cred);
@@ -1270,9 +1238,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr, unsign
 
        inode->i_mode = fattr->mode;
        inode->i_nlink = fattr->nlink;
-       inode->i_uid = uid;
-       inode->i_gid = gid;
-       inode->i_xid = xid;
+       inode->i_uid = fattr->uid;
+       inode->i_gid = fattr->gid;
 
        if (fattr->valid & (NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4)) {
                /*