* [patch] pnfs: delete an unintended goto
@ 2015-02-10 8:03 Dan Carpenter
2015-02-10 13:42 ` Trond Myklebust
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2015-02-10 8:03 UTC (permalink / raw)
To: Trond Myklebust; +Cc: Anna Schumaker, linux-nfs, kernel-janitors
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)) {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch] pnfs: delete an unintended goto
2015-02-10 8:03 [patch] pnfs: delete an unintended goto Dan Carpenter
@ 2015-02-10 13:42 ` Trond Myklebust
0 siblings, 0 replies; 2+ messages in thread
From: Trond Myklebust @ 2015-02-10 13:42 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Anna Schumaker, linux-nfs, kernel-janitors
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
--
Trond Myklebust
Linux NFS client maintainer, PrimaryData
trond.myklebust@primarydata.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-02-10 13:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-10 8:03 [patch] pnfs: delete an unintended goto Dan Carpenter
2015-02-10 13:42 ` Trond Myklebust
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).