From: Jeff Layton <jlayton@primarydata.com>
To: bfields@fieldses.org
Cc: linux-nfs@vger.kernel.org, hch@infradead.org
Subject: [PATCH v6 5/9] nfsd: drop unused stp arg to alloc_init_deleg
Date: Fri, 25 Jul 2014 07:34:23 -0400 [thread overview]
Message-ID: <1406288067-20663-6-git-send-email-jlayton@primarydata.com> (raw)
In-Reply-To: <1406288067-20663-1-git-send-email-jlayton@primarydata.com>
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
fs/nfsd/nfs4state.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index b421b51c3a9e..049ef2ce72bf 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -579,7 +579,7 @@ static void block_delegations(struct knfsd_fh *fh)
}
static struct nfs4_delegation *
-alloc_init_deleg(struct nfs4_client *clp, struct nfs4_ol_stateid *stp, struct svc_fh *current_fh)
+alloc_init_deleg(struct nfs4_client *clp, struct svc_fh *current_fh)
{
struct nfs4_delegation *dp;
long n;
@@ -3649,7 +3649,7 @@ nfs4_open_delegation(struct net *net, struct svc_fh *fh,
default:
goto out_no_deleg;
}
- dp = alloc_init_deleg(oo->oo_owner.so_client, stp, fh);
+ dp = alloc_init_deleg(oo->oo_owner.so_client, fh);
if (dp == NULL)
goto out_no_deleg;
status = nfs4_set_delegation(dp, stp->st_file);
--
1.9.3
next prev parent reply other threads:[~2014-07-25 11:34 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-25 11:34 [PATCH v6 0/9] nfsd: more delegation fixes to prepare for client_mutex removal Jeff Layton
2014-07-25 11:34 ` [PATCH v6 1/9] nfsd: simplify stateid allocation and file handling Jeff Layton
2014-07-25 11:34 ` [PATCH v6 2/9] nfsd: fully unhash delegations when revoking them Jeff Layton
2014-07-29 14:53 ` J. Bruce Fields
2014-07-29 16:41 ` Jeff Layton
2014-07-29 17:53 ` J. Bruce Fields
2014-07-25 11:34 ` [PATCH v6 3/9] nfsd: ensure that clp->cl_revoked list is protected by clp->cl_lock Jeff Layton
2014-07-25 11:34 ` [PATCH v6 4/9] nfsd: Convert delegation counter to an atomic_long_t type Jeff Layton
2014-07-25 11:34 ` Jeff Layton [this message]
2014-07-25 11:34 ` [PATCH v6 6/9] nfsd: clean up arguments to nfs4_open_delegation Jeff Layton
2014-07-25 11:34 ` [PATCH v6 7/9] nfsd: clean up nfs4_set_delegation Jeff Layton
2014-07-25 11:34 ` [PATCH v6 8/9] nfsd: give block_delegation and delegation_blocked its own spinlock Jeff Layton
2014-07-25 11:34 ` [PATCH v6 9/9] nfsd: remove dl_fh field from struct nfs4_delegation Jeff Layton
2014-07-29 18:59 ` [PATCH v6 0/9] nfsd: more delegation fixes to prepare for client_mutex removal 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=1406288067-20663-6-git-send-email-jlayton@primarydata.com \
--to=jlayton@primarydata.com \
--cc=bfields@fieldses.org \
--cc=hch@infradead.org \
--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;
as well as URLs for NNTP newsgroup(s).