diff options
author | Fred Isaman <iisaman@netapp.com> | 2011-03-03 10:13:49 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-03-11 15:38:45 -0500 |
commit | 36fe432d33e078caee5c954e15e929819c2cacae (patch) | |
tree | 84bccc3434a423f8eabae42d543fad5914124ae2 /fs/nfs/read.c | |
parent | c76069bda0f17cd3e153e54d9ac01242909c6b15 (diff) |
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.c | 2 |
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) | |||
311 | nbytes -= rsize; | 311 | nbytes -= rsize; |
312 | } while (nbytes != 0); | 312 | } while (nbytes != 0); |
313 | put_lseg(lseg); | 313 | put_lseg(lseg); |
314 | desc->pg_lseg = NULL; | ||
314 | 315 | ||
315 | return ret; | 316 | return ret; |
316 | 317 | ||
@@ -357,6 +358,7 @@ static int nfs_pagein_one(struct nfs_pageio_descriptor *desc) | |||
357 | 0, lseg); | 358 | 0, lseg); |
358 | out: | 359 | out: |
359 | put_lseg(lseg); | 360 | put_lseg(lseg); |
361 | desc->pg_lseg = NULL; | ||
360 | return ret; | 362 | return ret; |
361 | } | 363 | } |
362 | 364 | ||