From: Jeff Layton <jlayton@primarydata.com>
To: bfields@fieldses.org
Cc: linux-nfs@vger.kernel.org, hch@infradead.org
Subject: [PATCH v5 11/10] nfsd: set fl->fl_file properly in nfs4_setlease
Date: Mon, 21 Jul 2014 15:46:13 -0400 [thread overview]
Message-ID: <1405971973-10029-1-git-send-email-jlayton@primarydata.com> (raw)
In-Reply-To: <1405949706-27757-1-git-send-email-jlayton@primarydata.com>
We must set the fl->fl_file properly for the lease, or there will be
trouble when the lease gets removed.
Longer term, it would probably make sense to set fl_file during the
setlease call, since we pass it in, but this should work around the
immediate oops that I've been seeing.
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
---
fs/nfsd/nfs4state.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 3946a5a9459c..b21319816b89 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -3514,6 +3514,7 @@ static int nfs4_setlease(struct nfs4_delegation *dp)
WARN_ON_ONCE(1);
return -EBADF;
}
+ fl->fl_file = filp;
status = vfs_setlease(filp, fl->fl_type, &fl);
if (status) {
locks_free_lock(fl);
--
1.9.3
next prev parent reply other threads:[~2014-07-21 19:46 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-21 13:34 [PATCH v5 00/10] nfsd: more delegation fixes to prepare for client_mutex removal Jeff Layton
2014-07-21 13:34 ` [PATCH v5 01/10] nfsd: Protect the nfs4_file delegation fields using the fi_lock Jeff Layton
2014-07-21 15:51 ` Christoph Hellwig
2014-07-21 13:34 ` [PATCH v5 02/10] nfsd: Move the delegation reference counter into the struct nfs4_stid Jeff Layton
2014-07-21 13:34 ` [PATCH v5 03/10] nfsd: simplify stateid allocation and file handling Jeff Layton
2014-07-21 21:30 ` J. Bruce Fields
2014-07-21 22:42 ` Jeff Layton
2014-07-21 22:52 ` Trond Myklebust
2014-07-21 13:35 ` [PATCH v5 04/10] nfsd: Fix delegation revocation Jeff Layton
2014-07-21 13:35 ` [PATCH v5 05/10] nfsd: ensure that clp->cl_revoked list is protected by clp->cl_lock Jeff Layton
2014-07-21 15:52 ` Christoph Hellwig
2014-07-21 13:35 ` [PATCH v5 06/10] nfsd: Convert delegation counter to an atomic_long_t type Jeff Layton
2014-07-21 13:35 ` [PATCH v5 07/10] nfsd: drop unused stp arg to alloc_init_deleg Jeff Layton
2014-07-21 13:35 ` [PATCH v5 08/10] nfsd: clean up arguments to nfs4_open_delegation Jeff Layton
2014-07-21 13:35 ` [PATCH v5 09/10] nfsd: clean up nfs4_set_delegation Jeff Layton
2014-07-21 13:35 ` [PATCH v5 10/10] nfsd: give block_delegation and delegation_blocked its own spinlock Jeff Layton
2014-07-21 16:01 ` [PATCH v5 00/10] nfsd: more delegation fixes to prepare for client_mutex removal J. Bruce Fields
2014-07-21 17:54 ` J. Bruce Fields
2014-07-21 19:46 ` Jeff Layton [this message]
2014-07-21 19:54 ` [PATCH v5 11/10] nfsd: set fl->fl_file properly in nfs4_setlease Jeff Layton
2014-07-21 20:00 ` 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=1405971973-10029-1-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).