Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 6776d7a7839e..572e5b3b06f1 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -367,13 +367,13 @@ readpage_async_filler(void *data, struct page *page)
                 nfs_list_remove_request(new);
                 nfs_readpage_release(new);
                 error = desc->pgio->pg_error;
-                goto out_unlock;
+                goto out;
         }
         return 0;
 out_error:
         error = PTR_ERR(new);
-out_unlock:
         unlock_page(page);
+out:
         return error;
 }