NFSv4.1: Clear lseg pointer in ->doio function

Now that we have access to the pointer, clear it immediately after
the put, instead of in caller.

Signed-off-by: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

3 files changed, 4 insertions, 1 deletions

diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index 9f628746f5c8..23e794410669 100644
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -312,7 +312,6 @@ static void nfs_pageio_doio(struct nfs_pageio_descriptor *desc)
 {
         if (!list_empty(&desc->pg_list)) {
                 int error = desc->pg_doio(desc);
-                desc->pg_lseg = NULL;
                 if (error < 0)
                         desc->pg_error = error;
                 else
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index ab9c7768b7c6..4b764c6048db 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -311,6 +311,7 @@ static int nfs_pagein_multi(struct nfs_pageio_descriptor *desc)
                 nbytes -= rsize;
         } while (nbytes != 0);
         put_lseg(lseg);
+        desc->pg_lseg = NULL;
 
         return ret;
 
@@ -357,6 +358,7 @@ static int nfs_pagein_one(struct nfs_pageio_descriptor *desc)
                                 0, lseg);
 out:
         put_lseg(lseg);
+        desc->pg_lseg = NULL;
         return ret;
 }
 
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index b74200a2f753..47a3ad63e0d5 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -949,6 +949,7 @@ static int nfs_flush_multi(struct nfs_pageio_descriptor *desc)
         } while (nbytes != 0);
 
         put_lseg(lseg);
+        desc->pg_lseg = NULL;
         return ret;
 
 out_bad:
@@ -1005,6 +1006,7 @@ static int nfs_flush_one(struct nfs_pageio_descriptor *desc)
         ret = nfs_write_rpcsetup(req, data, &nfs_write_full_ops, desc->pg_count, 0, lseg, desc->pg_ioflags);
 out:
         put_lseg(lseg); /* Cleans any gotten in ->pg_test */
+        desc->pg_lseg = NULL;
         return ret;
 }