aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2009-05-01 19:57:46 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-05-01 19:57:46 -0400
commit6707bd3d420f53ae8f090dac871843f6f43c9980 (patch)
treed72d14847fddef8bec160cd15e58d9edb9a9ddd9 /fs
parentb53d40c5070bffde1b2bcaf848412a50d8894794 (diff)
nfsd4: remove unused dl_trunc
There's no point in keeping this field around--it's always zero. (Background: the protocol allows you to tell the client that the file is about to be truncated, as an optimization to save the client from writing back dirty pages that will just be discarded. We don't implement this hint. If we do some day, adding this field back in will be the least of the work involved.) Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/nfs4callback.c4
-rw-r--r--fs/nfsd/nfs4state.c1
2 files changed, 1 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 2509305f6f53..0420b5e6e20d 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -224,7 +224,7 @@ encode_cb_recall(struct xdr_stream *xdr, struct nfs4_delegation *dp)
224 WRITE32(OP_CB_RECALL); 224 WRITE32(OP_CB_RECALL);
225 WRITE32(dp->dl_stateid.si_generation); 225 WRITE32(dp->dl_stateid.si_generation);
226 WRITEMEM(&dp->dl_stateid.si_opaque, sizeof(stateid_opaque_t)); 226 WRITEMEM(&dp->dl_stateid.si_opaque, sizeof(stateid_opaque_t));
227 WRITE32(dp->dl_trunc); 227 WRITE32(0); /* truncate optimization not implemented */
228 WRITE32(len); 228 WRITE32(len);
229 WRITEMEM(&dp->dl_fh.fh_base, len); 229 WRITEMEM(&dp->dl_fh.fh_base, len);
230 return 0; 230 return 0;
@@ -510,8 +510,6 @@ nfsd4_cb_recall(struct nfs4_delegation *dp)
510 int retries = 1; 510 int retries = 1;
511 int status = 0; 511 int status = 0;
512 512
513 dp->dl_trunc = 0; /* XXX need to implement truncate optimization */
514
515 status = rpc_call_sync(clnt, &msg, RPC_TASK_SOFT); 513 status = rpc_call_sync(clnt, &msg, RPC_TASK_SOFT);
516 while (retries--) { 514 while (retries--) {
517 switch (status) { 515 switch (status) {
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 3e5345e01b13..cbb16e191d5b 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -204,7 +204,6 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_stateid *stp, struct svc_f
204 dp->dl_vfs_file = stp->st_vfs_file; 204 dp->dl_vfs_file = stp->st_vfs_file;
205 dp->dl_type = type; 205 dp->dl_type = type;
206 dp->dl_ident = cb->cb_ident; 206 dp->dl_ident = cb->cb_ident;
207 dp->dl_trunc = 0;
208 dp->dl_stateid.si_boot = get_seconds(); 207 dp->dl_stateid.si_boot = get_seconds();
209 dp->dl_stateid.si_stateownerid = current_delegid++; 208 dp->dl_stateid.si_stateownerid = current_delegid++;
210 dp->dl_stateid.si_fileid = 0; 209 dp->dl_stateid.si_fileid = 0;