summaryrefslogtreecommitdiffstats
path: root/fs/nfs/read.c
diff options
context:
space:
mode:
authorFred Isaman <iisaman@netapp.com>2011-03-03 15:13:49 +0000
committerTrond Myklebust <Trond.Myklebust@netapp.com>2011-03-11 15:38:45 -0500
commit36fe432d33e078caee5c954e15e929819c2cacae (patch)
tree84bccc3434a423f8eabae42d543fad5914124ae2 /fs/nfs/read.c
parentc76069bda0f17cd3e153e54d9ac01242909c6b15 (diff)
downloadlinux-stable-36fe432d33e078caee5c954e15e929819c2cacae.tar.gz
linux-stable-36fe432d33e078caee5c954e15e929819c2cacae.tar.bz2
linux-stable-36fe432d33e078caee5c954e15e929819c2cacae.zip
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>
Diffstat (limited to 'fs/nfs/read.c')
-rw-r--r--fs/nfs/read.c2
1 files changed, 2 insertions, 0 deletions
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;
}