From: Jeff Layton <jlayton@poochiereds.net>
To: bfields@fieldses.org
Cc: trond.myklebust@primarydata.com, hch@infradead.org,
linux-nfs@vger.kernel.org
Subject: [PATCH 3/3] nfsd: remove unused status arg to nfsd4_cleanup_open_state
Date: Mon, 23 Mar 2015 10:53:44 -0400 [thread overview]
Message-ID: <1427122424-8078-4-git-send-email-jeff.layton@primarydata.com> (raw)
In-Reply-To: <1427122424-8078-1-git-send-email-jeff.layton@primarydata.com>
Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
---
fs/nfsd/nfs4proc.c | 2 +-
fs/nfsd/nfs4state.c | 2 +-
fs/nfsd/xdr4.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index d30bea8d0277..e54f18ae5b2e 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -470,7 +470,7 @@ out:
fh_put(resfh);
kfree(resfh);
}
- nfsd4_cleanup_open_state(cstate, open, status);
+ nfsd4_cleanup_open_state(cstate, open);
nfsd4_bump_seqid(cstate, status);
return status;
}
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index a66e297dc01c..3d9b0b9b1e2c 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4117,7 +4117,7 @@ out:
}
void nfsd4_cleanup_open_state(struct nfsd4_compound_state *cstate,
- struct nfsd4_open *open, __be32 status)
+ struct nfsd4_open *open)
{
if (open->op_openowner) {
struct nfs4_stateowner *so = &open->op_openowner->oo_owner;
diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
index 0bda93e58e1b..83e80d6d94a6 100644
--- a/fs/nfsd/xdr4.h
+++ b/fs/nfsd/xdr4.h
@@ -683,7 +683,7 @@ extern __be32 nfsd4_process_open2(struct svc_rqst *rqstp,
struct svc_fh *current_fh, struct nfsd4_open *open);
extern void nfsd4_cstate_clear_replay(struct nfsd4_compound_state *cstate);
extern void nfsd4_cleanup_open_state(struct nfsd4_compound_state *cstate,
- struct nfsd4_open *open, __be32 status);
+ struct nfsd4_open *open);
extern __be32 nfsd4_open_confirm(struct svc_rqst *rqstp,
struct nfsd4_compound_state *, struct nfsd4_open_confirm *oc);
extern __be32 nfsd4_close(struct svc_rqst *rqstp,
--
2.1.0
next prev parent reply other threads:[~2015-03-23 14:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-23 14:53 [PATCH 0/3] nfsd: fix use-after-free oops in v4.0 (and some other minor cleanups) Jeff Layton
2015-03-23 14:53 ` [PATCH 1/3] nfsd: return correct openowner when there is a race to put one in the hash Jeff Layton
2015-03-23 15:36 ` J. Bruce Fields
2015-03-23 15:45 ` Jeff Layton
2015-03-25 8:45 ` Christoph Hellwig
2015-03-25 10:28 ` Jeff Layton
2015-03-25 13:51 ` Christoph Hellwig
2015-03-23 14:53 ` [PATCH 2/3] nfsd: remove bogus setting of status in nfsd4_process_open2 Jeff Layton
2015-03-25 8:45 ` Christoph Hellwig
2015-03-23 14:53 ` Jeff Layton [this message]
2015-03-25 8:47 ` [PATCH 3/3] nfsd: remove unused status arg to nfsd4_cleanup_open_state Christoph Hellwig
2015-03-23 15:12 ` [PATCH 0/3] nfsd: fix use-after-free oops in v4.0 (and some other minor cleanups) J. Bruce Fields
2015-03-23 15:30 ` Jeff Layton
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=1427122424-8078-4-git-send-email-jeff.layton@primarydata.com \
--to=jlayton@poochiereds.net \
--cc=bfields@fieldses.org \
--cc=hch@infradead.org \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.