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@xxxxxxxxxx>
>
> 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@xxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
