[PATCH] Remove redundant NFS_STALE() call in __nfs_revalidate_inode()

[PATCH] Remove redundant NFS_STALE() call in __nfs_revalidate_inode()

[Ricardo Labiaga]

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

Signed-off-by: Ricardo Labiaga <Ricardo.Labiaga@netapp.com>
---
 fs/nfs/inode.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 0c38168..af77c2d 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -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;
-- 
1.5.4.3

Re: [PATCH] Remove redundant NFS_STALE() call in __nfs_revalidate_inode()

[Suresh Jayaraman]

Ricardo Labiaga wrote:
> 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


> Signed-off-by: Ricardo Labiaga <Ricardo.Labiaga@netapp.com>
> ---
>  fs/nfs/inode.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
> index 0c38168..af77c2d 100644
> --- a/fs/nfs/inode.c
> +++ b/fs/nfs/inode.c
> @@ -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;


-- 
Suresh Jayaraman