From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 10 Feb 2015 08:03:22 +0000 (+0300)
Subject: pnfs: delete an unintended goto
X-Git-Tag: firefly_0821_release~176^2~2246^2~12
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4c21462acc530bb81c6ae30e5bbd0b06f8c50626;p=firefly-linux-kernel-4.4.55.git

pnfs: delete an unintended goto

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>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 107b321be7d4..4f802b02fbb9 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)) {