Re: [PATCH] nfs: remove unnecessary check for NULL inode->i_flock from nfs_delegation_claim_locks

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, 2013-04-10 at 15:36 -0400, Jeff Layton wrote:
> The second check was added in commit 65b62a29 but it will never be true.
> 
> Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
> ---
>  fs/nfs/delegation.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
> index f30bd1e..57db324 100644
> --- a/fs/nfs/delegation.c
> +++ b/fs/nfs/delegation.c
> @@ -71,10 +71,8 @@ static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_
>  	int status = 0;
>  
>  	if (inode->i_flock == NULL)
> -		return 0;
> -
> -	if (inode->i_flock == NULL)
>  		goto out;
> +
>  	/* Protect inode->i_flock using the file locks lock */
>  	lock_flocks();
>  	for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) {

Thanks! Applied...
-- 
Trond Myklebust
Linux NFS client maintainer

NetApp
Trond.Myklebust@xxxxxxxxxx
www.netapp.com
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Filesystem Development]     [Linux USB Development]     [Linux Media Development]     [Video for Linux]     [Linux NILFS]     [Linux Audio Users]     [Yosemite Info]     [Linux SCSI]

  Powered by Linux