pnfs: delete an unintended goto
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 10 Feb 2015 08:03:22 +0000 (11:03 +0300)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Tue, 10 Feb 2015 13:41:23 +0000 (08:41 -0500)
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>
fs/nfs/pnfs.c

index 107b321be7d4e2aa8e06d42bb3986b3471156bf0..4f802b02fbb9b0c6fc61912be044f6cef94acd32 100644 (file)
@@ -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)) {