Author: arekm Date: Tue Feb 26 08:49:20 2008 GMT
Module: SOURCES Tag: LINUX_2_6_22
---- Log message:
- updated for 2.6.22.19
---- Files affected:
SOURCES:
linux-2.6.22-NFS_ALL.dif (1.1 -> 1.1.2.1)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6.22-NFS_ALL.dif
diff -u SOURCES/linux-2.6.22-NFS_ALL.dif:1.1
SOURCES/linux-2.6.22-NFS_ALL.dif:1.1.2.1
--- SOURCES/linux-2.6.22-NFS_ALL.dif:1.1 Mon Aug 13 19:18:29 2007
+++ SOURCES/linux-2.6.22-NFS_ALL.dif Tue Feb 26 09:49:15 2008
@@ -717,33 +717,6 @@
index c27258b..322141f 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
-@@ -897,14 +897,13 @@ int nfs_is_exclusive_create(struct inode *dir, struct
nameidata *nd)
- return (nd->intent.open.flags & O_EXCL) != 0;
- }
-
--static inline int nfs_reval_fsid(struct vfsmount *mnt, struct inode *dir,
-- struct nfs_fh *fh, struct nfs_fattr *fattr)
-+static inline int nfs_reval_fsid(struct inode *dir, const struct nfs_fattr
*fattr)
- {
- struct nfs_server *server = NFS_SERVER(dir);
-
- if (!nfs_fsid_equal(&server->fsid, &fattr->fsid))
-- /* Revalidate fsid on root dir */
-- return __nfs_revalidate_inode(server, mnt->mnt_root->d_inode);
-+ /* Revalidate fsid using the parent directory */
-+ return __nfs_revalidate_inode(server, dir);
- return 0;
- }
-
-@@ -946,7 +945,7 @@ static struct dentry *nfs_lookup(struct inode *dir, struct
dentry * dentry, stru
- res = ERR_PTR(error);
- goto out_unlock;
- }
-- error = nfs_reval_fsid(nd->mnt, dir, &fhandle, &fattr);
-+ error = nfs_reval_fsid(dir, &fattr);
- if (error < 0) {
- res = ERR_PTR(error);
- goto out_unlock;
@@ -1244,7 +1243,7 @@ static int nfs_create(struct inode *dir, struct dentry
*dentry, int mode,
attr.ia_mode = mode;
attr.ia_valid = ATTR_MODE;
@@ -940,17 +913,6 @@
}
/*
-@@ -961,8 +967,8 @@ static int nfs_update_inode(struct inode *inode, struct
nfs_fattr *fattr)
- goto out_changed;
-
- server = NFS_SERVER(inode);
-- /* Update the fsid if and only if this is the root directory */
-- if (inode == inode->i_sb->s_root->d_inode
-+ /* Update the fsid? */
-+ if (S_ISDIR(inode->i_mode)
- && !nfs_fsid_equal(&server->fsid, &fattr->fsid))
- server->fsid = fattr->fsid;
-
@@ -1066,8 +1072,10 @@ static int nfs_update_inode(struct inode *inode, struct
nfs_fattr *fattr)
invalid &= ~NFS_INO_INVALID_DATA;
if (data_stable)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6.22-NFS_ALL.dif?r1=1.1&r2=1.1.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
