Skip to contentSkip to conversation

Patch "nfs: if we have no valid attrs, then don't declare the attribute cache valid" has been added to the 3.10-stable tree

PATCH [email protected] 1 participant 1 message Dec 11, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

nfs: if we have no valid attrs, then don't declare the attribute cache valid

to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
nfs-if-we-have-no-valid-attrs-then-don-t-declare-the-attribute-cache-valid.patch
and it can be found in the queue-3.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From c812012f9ca7cf89c9e1a1cd512e6c3b5be04b85 Mon Sep 17 00:00:00 2001

From: Jeff Layton <[email protected]>
Date: Wed, 25 Nov 2015 13:50:11 -0500
Subject: nfs: if we have no valid attrs, then don't declare the attribute cache valid

From: Jeff Layton <[email protected]>

commit c812012f9ca7cf89c9e1a1cd512e6c3b5be04b85 upstream.

If we pass in an empty nfs_fattr struct to nfs_update_inode, it will (correctly) not update any of the attributes, but it then clears the NFS_INO_INVALID_ATTR flag, which indicates that the attributes are up to date. Don't clear the flag if the fattr struct has no valid attrs to apply.

---
 fs/nfs/inode.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
fs/nfs/inode.c +5 -1
@@ -1503,7 +1503,11 @@ static int nfs_update_inode(struct inode
 			nfsi->attrtimeo_timestamp = now;
 		}
 	}
-	invalid &= ~NFS_INO_INVALID_ATTR;
+
+	/* Don't declare attrcache up to date if there were no attrs! */
+	if (fattr->valid != 0)
+		invalid &= ~NFS_INO_INVALID_ATTR;
+
 	/* Don't invalidate the data if we were to blame */
 	if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)
 				|| S_ISLNK(inode->i_mode)))

Patches currently in stable-queue which might be from [email protected] are

queue-3.10/nfs-if-we-have-no-valid-attrs-then-don-t-declare-the-attribute-cache-valid.patch