aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/write.c
diff options
context:
space:
mode:
authorFred Isaman <iisaman@netapp.com>2011-03-03 10:13:49 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2011-03-11 15:38:45 -0500
commit36fe432d33e078caee5c954e15e929819c2cacae (patch)
tree84bccc3434a423f8eabae42d543fad5914124ae2 /fs/nfs/write.c
parentc76069bda0f17cd3e153e54d9ac01242909c6b15 (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/write.c')
-rw-r--r--fs/nfs/write.c2
1 files changed, 2 insertions, 0 deletions
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)
949 } while (nbytes != 0); 949 } while (nbytes != 0);
950 950
951 put_lseg(lseg); 951 put_lseg(lseg);
952 desc->pg_lseg = NULL;
952 return ret; 953 return ret;
953 954
954out_bad: 955out_bad:
@@ -1005,6 +1006,7 @@ static int nfs_flush_one(struct nfs_pageio_descriptor *desc)
1005 ret = nfs_write_rpcsetup(req, data, &nfs_write_full_ops, desc->pg_count, 0, lseg, desc->pg_ioflags); 1006 ret = nfs_write_rpcsetup(req, data, &nfs_write_full_ops, desc->pg_count, 0, lseg, desc->pg_ioflags);
1006out: 1007out:
1007 put_lseg(lseg); /* Cleans any gotten in ->pg_test */ 1008 put_lseg(lseg); /* Cleans any gotten in ->pg_test */
1009 desc->pg_lseg = NULL;
1008 return ret; 1010 return ret;
1009} 1011}
1010 1012