From: "J. Bruce Fields" <bfields@fieldses.org>
To: linux-nfs@vger.kernel.org
Cc: "J. Bruce Fields" <bfields@citi.umich.edu>
Subject: [PATCH 08/14] nfsd4: fail when delegreturn gets a non-delegation stateid
Date: Tue, 10 Mar 2009 20:26:56 -0400 [thread overview]
Message-ID: <1236731222-3294-9-git-send-email-bfields@fieldses.org> (raw)
In-Reply-To: <1236731222-3294-8-git-send-email-bfields@fieldses.org>
From: J. Bruce Fields <bfields@citi.umich.edu>
Previous cleanup reveals an obvious (though harmless) bug: when
delegreturn gets a stateid that isn't for a delegation, it should return
an error rather than doing nothing.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
---
fs/nfsd/nfs4state.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index de1d68a..4a92d1e 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2418,7 +2418,7 @@ nfsd4_delegreturn(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
status = nfserr_stale_stateid;
if (STALE_STATEID(stateid))
goto out;
- status = nfs_ok;
+ status = nfserr_bad_stateid;
if (is_delegation_stateid(stateid))
goto out;
status = nfserr_bad_stateid;
--
1.6.0.4
next prev parent reply other threads:[~2009-03-11 0:27 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-11 0:26 miscellaneous nfsd4 state changes J. Bruce Fields
2009-03-11 0:26 ` [PATCH 01/14] nfsd4: trivial preprocess_stateid_op cleanup J. Bruce Fields
2009-03-11 0:26 ` [PATCH 02/14] nfsd4: move check_stateid_generation check J. Bruce Fields
2009-03-11 0:26 ` [PATCH 03/14] nfsd4: remove redundant "if" in nfs4_preprocess_stateid_op J. Bruce Fields
2009-03-11 0:26 ` [PATCH 04/14] nfsd4: remove unneeded local variable J. Bruce Fields
2009-03-11 0:26 ` [PATCH 05/14] nfsd4: remove some dprintk's J. Bruce Fields
2009-03-11 0:26 ` [PATCH 06/14] nfsd4: add a helper function to decide if stateid is delegation J. Bruce Fields
2009-03-11 0:26 ` [PATCH 07/14] nfsd4: separate delegreturn case from preprocess_stateid_op J. Bruce Fields
2009-03-11 0:26 ` J. Bruce Fields [this message]
2009-03-11 0:26 ` [PATCH 09/14] nfsd4: remove unused CHECK_FH flag J. Bruce Fields
2009-03-11 0:26 ` [PATCH 10/14] nfsd4: rename io_during_grace_disallowed J. Bruce Fields
2009-03-11 0:26 ` [PATCH 11/14] nfsd4: put_nfs4_client does not require state lock J. Bruce Fields
2009-03-11 0:27 ` [PATCH 12/14] nfsd4: remove use of mutex for file_hashtable J. Bruce Fields
2009-03-11 0:27 ` [PATCH 13/14] nfsd4: fix do_probe_callback errors J. Bruce Fields
2009-03-11 0:27 ` [PATCH 14/14] nfsd4: move rpc_client setup to a separate function J. Bruce Fields
2009-03-12 10:59 ` Benny Halevy
2009-03-12 10:55 ` [PATCH 13/14] nfsd4: fix do_probe_callback errors Benny Halevy
2009-03-12 21:41 ` J. Bruce Fields
2009-03-11 18:52 ` [PATCH 12/14] nfsd4: remove use of mutex for file_hashtable Benny Halevy
2009-03-12 0:05 ` J. Bruce Fields
2009-03-12 10:49 ` Benny Halevy
2009-03-13 17:18 ` J. Bruce Fields
2009-03-18 20:28 ` J. Bruce Fields
2009-03-18 20:40 ` Benny Halevy
2009-03-18 21:03 ` J. Bruce Fields
2009-03-18 21:07 ` Benny Halevy
2009-03-11 1:52 ` [PATCH 08/14] nfsd4: fail when delegreturn gets a non-delegation stateid Yang Hongyang
2009-03-11 20:07 ` J. Bruce Fields
2009-03-11 18:29 ` Benny Halevy
2009-03-12 0:03 ` J. Bruce Fields
2009-03-11 1:47 ` [PATCH 07/14] nfsd4: separate delegreturn case from preprocess_stateid_op Yang Hongyang
2009-03-11 19:51 ` J. Bruce Fields
2009-03-11 1:12 ` [PATCH 03/14] nfsd4: remove redundant "if" in nfs4_preprocess_stateid_op Yang Hongyang
2009-03-11 1:23 ` J. Bruce Fields
2009-03-11 1:26 ` Yang Hongyang
2009-03-11 18:05 ` Benny Halevy
2009-03-11 19:49 ` J. Bruce Fields
2009-03-11 2:09 ` [PATCH 01/14] nfsd4: trivial preprocess_stateid_op cleanup Yang Hongyang
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=1236731222-3294-9-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