diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-02-10 09:03:22 +0100 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-02-10 14:41:23 +0100 |
| commit | 4c21462acc530bb81c6ae30e5bbd0b06f8c50626 (patch) | |
| tree | ec290cf46a7e60f50100068d59fae2563f551f2a /fs/nfs | |
| parent | pnfs/flexfiles: Do not dprintk after the free (diff) | |
| download | linux-4c21462acc530bb81c6ae30e5bbd0b06f8c50626.tar.xz linux-4c21462acc530bb81c6ae30e5bbd0b06f8c50626.zip | |
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>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/pnfs.c | 1 |
1 files changed, 0 insertions, 1 deletions
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)) { |