Skip to contentSkip to conversation

Remove redundant NFS_STALE() call in __nfs_revalidate_inode()

PATCH In review Ricardo Labiaga 2 participants 2 messages Mar 6, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Remove redundant NFS_STALE() call in __nfs_revalidate_inode()

The extra NFS_STALE() invocation is likely the result of a mismerge.

---
 fs/nfs/inode.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
fs/nfs/inode.c +0 -2
index 0c38168..af77c2d 100644
@@ -667,8 +667,6 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
 
 	if (is_bad_inode(inode))
 		goto out;
-	if (NFS_STALE(inode))
-		goto out;
 
 	if (NFS_STALE(inode))
 		goto out;
Signature · 1 line
1.5.4.3
#1 lore raw
Quoted 1 line · Ricardo Labiaga

The extra NFS_STALE() invocation is likely the result of a mismerge.

Ah, I just posted this cleanup patch a little while ago..
http://marc.info/?l=linux-nfs&m=123486480925457&w=2

Quoted 18 lines
---
 fs/nfs/inode.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
fs/nfs/inode.c +0 -2
index 0c38168..af77c2d 100644
@@ -667,8 +667,6 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
 
 	if (is_bad_inode(inode))
 		goto out;
-	if (NFS_STALE(inode))
-		goto out;
 
 	if (NFS_STALE(inode))
 		goto out;
Signature · 1 line
Suresh Jayaraman