Attachment 296374 Details for Bug 435443 – patch2 -- NFS: Clean up inode metadata updates

[patch] patch2 -- NFS: Clean up inode metadata updates

0013-BZ-435443-NFS-Clean-up-inode-metadata-updates.patch (text/plain), 2.41 KB, created by Jeff Layton on 2008-02-29 16:12:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2008-02-29 16:12:22 UTC

Size: 2.41 KB

patch

obsolete

>From 0641ce3f5696001e58eace429b3b6ca678c73618 Mon Sep 17 00:00:00 2001
>From: Trond Myklebust <Trond.Myklebust@netapp.com>
>Date: Thu, 25 May 2006 01:40:47 -0400
>Subject: [PATCH] BZ#435443: NFS: Clean up inode metadata updates
>
>Upstream commit 73a3d07c1082145a3b78407bb5252df290470c4c
>
>Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
>Backported-by: Jeff Layton <jlayton@redhat.com>
>---
> fs/nfs/inode.c          |   12 ------------
> include/linux/nfs_xdr.h |    3 +--
> 2 files changed, 1 insertions(+), 14 deletions(-)
>
>diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
>index ba302b7..d7f8257 100644
>--- a/fs/nfs/inode.c
>+++ b/fs/nfs/inode.c
>@@ -1328,12 +1328,6 @@ static void nfs_wcc_update_inode(struct inode *inode, struct nfs_fattr *fattr)
> {
> 	struct nfs_inode *nfsi = NFS_I(inode);
> 
>-	if ((fattr->valid & NFS_ATTR_PRE_CHANGE) != 0
>-			&& nfsi->change_attr == fattr->pre_change_attr) {
>-		nfsi->change_attr = fattr->change_attr;
>-		nfsi->cache_change_attribute = jiffies;
>-	}
>-
> 	/* If we have atomic WCC data, we may update some attributes */
> 	if ((fattr->valid & NFS_ATTR_WCC) != 0) {
> 		if (timespec_equal(&inode->i_ctime, &fattr->pre_ctime)) {
>@@ -1366,9 +1360,6 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat
> 	loff_t cur_size, new_isize;
> 	int data_unstable;
> 
>-	if ((fattr->valid & NFS_ATTR_FATTR) == 0)
>-		return 0;
>-
> 	/* Has the inode gone and changed behind our back? */
> 	if (nfsi->fileid != fattr->fileid
> 			|| (inode->i_mode & S_IFMT) != (fattr->mode & S_IFMT)) {
>@@ -1495,9 +1486,6 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
> 			__FUNCTION__, inode->i_sb->s_id, inode->i_ino,
> 			atomic_read(&inode->i_count), fattr->valid);
> 
>-	if ((fattr->valid & NFS_ATTR_FATTR) == 0)
>-		return 0;
>-
> 	if (nfsi->fileid != fattr->fileid) {
> 		printk(KERN_ERR "%s: inode number mismatch\n"
> 		       "expected (%s/0x%Lx), got (%s/0x%Lx)\n",
>diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
>index 19334da..9833594 100644
>--- a/include/linux/nfs_xdr.h
>+++ b/include/linux/nfs_xdr.h
>@@ -47,8 +47,7 @@ struct nfs_fattr {
> #define NFS_ATTR_WCC		0x0001		/* pre-op WCC data    */
> #define NFS_ATTR_FATTR		0x0002		/* post-op attributes */
> #define NFS_ATTR_FATTR_V3	0x0004		/* NFSv3 attributes */
>-#define NFS_ATTR_FATTR_V4	0x0008
>-#define NFS_ATTR_PRE_CHANGE	0x0010
>+#define NFS_ATTR_FATTR_V4	0x0008		/* NFSv4 change attribute */
> 
> /*
>  * Info on the file system
>-- 
>1.5.3.6
>

Actions: View | Diff

Attachments on bug 435443: 296373 | 296374 | 296376 | 296811