diff mbox

pnfs: delete an unintended goto

Message ID 20150210080322.GA8762@mwanda (mailing list archive)
State New, archived
Headers show

Commit Message

Dan Carpenter Feb. 10, 2015, 8:03 a.m. UTC
There was an extra goto here where it shouldn't be, because of a merge
error.

Fixes: e2c63e091e29 ('Merge branch 'flexfiles'')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Trond Myklebust Feb. 10, 2015, 1:42 p.m. UTC | #1
On Tue, 2015-02-10 at 11:03 +0300, Dan Carpenter wrote:
> There was an extra goto here where it shouldn't be, because of a merge
> error.
> 
> Fixes: e2c63e091e29 ('Merge branch 'flexfiles'')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
> index 107b321..4f802b02 100644
> --- a/fs/nfs/pnfs.c
> +++ b/fs/nfs/pnfs.c
> @@ -1078,7 +1078,6 @@ bool pnfs_roc(struct inode *ino)
>  			goto out_noroc;
>  	}
>  
> -		goto out_noroc;
>  	pnfs_clear_retry_layoutget(lo);
>  	list_for_each_entry_safe(lseg, tmp, &lo->plh_segs, pls_list)
>  		if (test_bit(NFS_LSEG_ROC, &lseg->pls_flags)) {

Thanks Dan! Applied to linux-next.

Cheers
  Trond
diff mbox

Patch

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 107b321..4f802b02 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1078,7 +1078,6 @@  bool pnfs_roc(struct inode *ino)
 			goto out_noroc;
 	}
 
-		goto out_noroc;
 	pnfs_clear_retry_layoutget(lo);
 	list_for_each_entry_safe(lseg, tmp, &lo->plh_segs, pls_list)
 		if (test_bit(NFS_LSEG_ROC, &lseg->pls_flags)) {