From: "J. Bruce Fields" <bfields@redhat.com>
To: linux-nfs@vger.kernel.org
Cc: "J. Bruce Fields" <bfields@redhat.com>
Subject: [PATCH 4/6] nfsd4: split lease setting into separate function
Date: Tue, 8 Feb 2011 23:55:49 -0500 [thread overview]
Message-ID: <1297227351-15365-5-git-send-email-bfields@redhat.com> (raw)
In-Reply-To: <1297227351-15365-1-git-send-email-bfields@redhat.com>
Splitting some code into a separate function which we'll be adding some
more to.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---
fs/nfsd/nfs4state.c | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index b59b066..77e94f0 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2660,6 +2660,23 @@ static struct file_lock *nfs4_alloc_init_lease(struct nfs4_delegation *dp, int f
return fl;
}
+static int nfs4_setlease(struct nfs4_delegation *dp, int flag)
+{
+ struct file_lock *fl;
+ int status;
+
+ fl = nfs4_alloc_init_lease(dp, flag);
+ if (!fl)
+ return -ENOMEM;
+ status = vfs_setlease(dp->dl_vfs_file, fl->fl_type, &fl);
+ if (status) {
+ dp->dl_flock = NULL;
+ locks_free_lock(fl);
+ return -ENOMEM;
+ }
+ return 0;
+}
+
/*
* Attempt to hand out a delegation.
*/
@@ -2669,7 +2686,6 @@ nfs4_open_delegation(struct svc_fh *fh, struct nfsd4_open *open, struct nfs4_sta
struct nfs4_delegation *dp;
struct nfs4_stateowner *sop = stp->st_stateowner;
int cb_up;
- struct file_lock *fl;
int status, flag = 0;
cb_up = nfsd4_cb_channel_good(sop->so_client);
@@ -2702,19 +2718,9 @@ nfs4_open_delegation(struct svc_fh *fh, struct nfsd4_open *open, struct nfs4_sta
dp = alloc_init_deleg(sop->so_client, stp, fh, flag);
if (dp == NULL)
goto out_no_deleg;
- status = -ENOMEM;
- fl = nfs4_alloc_init_lease(dp, flag);
- if (!fl)
- goto out_free;
- /* vfs_setlease checks to see if delegation should be handed out.
- * the lock_manager callback fl_change is used
- */
- if ((status = vfs_setlease(fl->fl_file, fl->fl_type, &fl))) {
- dprintk("NFSD: setlease failed [%d], no delegation\n", status);
- dp->dl_flock = NULL;
- locks_free_lock(fl);
+ status = nfs4_setlease(dp, flag);
+ if (status)
goto out_free;
- }
memcpy(&open->op_delegate_stateid, &dp->dl_stateid, sizeof(dp->dl_stateid));
--
1.7.1
next prev parent reply other threads:[~2011-02-09 4:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-09 4:55 Fix a 2.6.38 delegation regression J. Bruce Fields
2011-02-09 4:55 ` [PATCH 1/6] nfsd4: split up nfsd_break_deleg_cb J. Bruce Fields
2011-02-09 5:01 ` Christoph Hellwig
2011-02-09 15:14 ` J. Bruce Fields
2011-02-09 16:28 ` Jim Rees
2011-02-15 11:14 ` Christoph Hellwig
2011-02-15 12:09 ` Jim Rees
2011-02-09 4:55 ` [PATCH 2/6] nfsd4: add helper function for lease setup J. Bruce Fields
2011-02-09 4:55 ` [PATCH 3/6] nfsd4: fix leak on allocation error J. Bruce Fields
2011-02-09 4:55 ` J. Bruce Fields [this message]
2011-02-09 4:55 ` [PATCH 5/6] nfsd4: remove unused deleg dprintk's J. Bruce Fields
2011-02-09 4:55 ` [PATCH 6/6] nfsd4: modify fi_delegations under recall_lock 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=1297227351-15365-5-git-send-email-bfields@redhat.com \
--to=bfields@redhat.com \
--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).