summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2011-01-31 17:58:10 -0500
committerJ. Bruce Fields <bfields@redhat.com>2011-02-14 10:35:18 -0500
commitedab9782b5a16abb8d139d261e81e13ef0be35a9 (patch)
tree44d843dbac80823b0d9f66d43151956ada711f1f /fs
parentdd239cc05f0ad9f582dd83d88a4fb5edcc57a026 (diff)
downloadlinux-3.10-edab9782b5a16abb8d139d261e81e13ef0be35a9.tar.gz
linux-3.10-edab9782b5a16abb8d139d261e81e13ef0be35a9.tar.bz2
linux-3.10-edab9782b5a16abb8d139d261e81e13ef0be35a9.zip
nfsd4: split lease setting into separate function
Splitting some code into a separate function which we'll be adding some more to. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/nfs4state.c32
1 files changed, 19 insertions, 13 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 099d6fa64f7..dbb2141cf88 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2659,6 +2659,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.
*/
@@ -2668,7 +2685,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);
@@ -2701,19 +2717,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));