Attachment 156385 Details for Bug 225515 – Proposed Upstream patch.

[patch] Proposed Upstream patch.

linux-2.6.22-rc4-009-fix_nfs_reval_fsid.dif (text/plain), 1.97 KB, created by Steve Dickson on 2007-06-06 19:38:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Dickson

Created: 2007-06-06 19:38:05 UTC

Size: 1.97 KB

patch

obsolete

>From: Trond Myklebust <Trond.Myklebust@netapp.com>
>Date: Tue, 5 Jun 2007 13:26:15 -0400
>NFS: Fix nfs_reval_fsid()
>
>We don't need to revalidate the fsid on the root directory. It suffices to
>revalidate it on the current directory.
>
>Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
>---
>
> fs/nfs/dir.c   |    9 ++++-----
> fs/nfs/inode.c |    4 ++--
> 2 files changed, 6 insertions(+), 7 deletions(-)
>
>diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
>index 4948ec1..c02a796 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;
>diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
>index 23ecf03..7bcb3df 100644
>--- a/fs/nfs/inode.c
>+++ b/fs/nfs/inode.c
>@@ -961,8 +961,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;
>

Actions: View | Diff

Attachments on bug 225515: 146986 | 156385