From: "J. Bruce Fields" <bfields@fieldses.org>
To: linux-nfs@vger.kernel.org
Cc: "J. Bruce Fields" <bfields@citi.umich.edu>
Subject: [PATCH] nfsd4: remove unused dl_trunc
Date: Sun, 3 May 2009 14:16:37 -0400 [thread overview]
Message-ID: <1241374599-20348-12-git-send-email-bfields@fieldses.org> (raw)
In-Reply-To: <1241374599-20348-11-git-send-email-bfields@fieldses.org>
From: J. Bruce Fields <bfields@citi.umich.edu>
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>
---
fs/nfsd/nfs4callback.c | 4 +---
fs/nfsd/nfs4state.c | 1 -
include/linux/nfsd/state.h | 1 -
3 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 2509305..0420b5e 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)
WRITE32(OP_CB_RECALL);
WRITE32(dp->dl_stateid.si_generation);
WRITEMEM(&dp->dl_stateid.si_opaque, sizeof(stateid_opaque_t));
- WRITE32(dp->dl_trunc);
+ WRITE32(0); /* truncate optimization not implemented */
WRITE32(len);
WRITEMEM(&dp->dl_fh.fh_base, len);
return 0;
@@ -510,8 +510,6 @@ nfsd4_cb_recall(struct nfs4_delegation *dp)
int retries = 1;
int status = 0;
- dp->dl_trunc = 0; /* XXX need to implement truncate optimization */
-
status = rpc_call_sync(clnt, &msg, RPC_TASK_SOFT);
while (retries--) {
switch (status) {
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 3e5345e..cbb16e1 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
dp->dl_vfs_file = stp->st_vfs_file;
dp->dl_type = type;
dp->dl_ident = cb->cb_ident;
- dp->dl_trunc = 0;
dp->dl_stateid.si_boot = get_seconds();
dp->dl_stateid.si_stateownerid = current_delegid++;
dp->dl_stateid.si_fileid = 0;
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index 233b60d..346b603 100644
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -74,7 +74,6 @@ struct nfs4_delegation {
time_t dl_time;
/* For recall: */
u32 dl_ident;
- int dl_trunc;
stateid_t dl_stateid;
struct knfsd_fh dl_fh;
};
--
1.6.0.4
next prev parent reply other threads:[~2009-05-03 18:16 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-03 18:16 misc (mostly callback) patches for 2.6.31 J. Bruce Fields
2009-05-03 18:16 ` [PATCH] nfsd4: rename callback struct to cb_conn J. Bruce Fields
2009-05-03 18:16 ` [PATCH] nfsd: quiet compile warning J. Bruce Fields
2009-05-03 18:16 ` [PATCH] nfsd4: setclientid_confirm callback-change fixes J. Bruce Fields
2009-05-03 18:16 ` [PATCH] nfsd4: set shorter timeout J. Bruce Fields
2009-05-03 18:16 ` [PATCH] nfsd4: set cb_client inside setup_callback_client J. Bruce Fields
2009-05-03 18:16 ` [PATCH] nfsd4: create rpc callback client from server thread J. Bruce Fields
2009-05-03 18:16 ` [PATCH] nfsd4: lookup up callback cred only once J. Bruce Fields
2009-05-03 18:16 ` [PATCH] nfsd4: replace callback thread by asynchronous rpc J. Bruce Fields
2009-05-03 18:16 ` [PATCH] nfsd4: rename callback struct to cb_conn J. Bruce Fields
2009-05-03 18:16 ` [PATCH] nfsd4: eliminate struct nfs4_cb_recall J. Bruce Fields
2009-05-03 18:16 ` J. Bruce Fields [this message]
2009-05-03 18:16 ` [PATCH] nfsd4: track recall retries in nfs4_delegation J. Bruce Fields
2009-05-03 18:16 ` [PATCH] nfsd4: make recall callback an asynchronous rpc J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1241374599-20348-12-git-send-email-bfields@fieldses.org \
--to=bfields@fieldses.org \
--cc=bfields@citi.umich.edu \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox