evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nfsd: nfs4_alloc_init_lease should take a nfs4_file arg

Browse source 
No need to pass the delegation pointer in here as it's only used to get
the nfs4_file pointer.

Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Jeff Layton 2014-07-16 10:31:58 -04:00 • committed by J. Bruce Fields
parent 02e1215f9f
commit d564fbec7a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/nfsd/nfs4state.c
View file

@ -3474,7 +3474,7 @@ static bool nfsd4_cb_channel_good(struct nfs4_client *clp)
return clp->cl_minorversion && clp->cl_cb_state == NFSD4_CB_UNKNOWN; return clp->cl_minorversion && clp->cl_cb_state == NFSD4_CB_UNKNOWN;
} }
static struct file_lock *nfs4_alloc_init_lease(struct nfs4_delegation *dp, int flag) static struct file_lock *nfs4_alloc_init_lease(struct nfs4_file *fp, int flag)
{ {
struct file_lock *fl; struct file_lock *fl;
@ -3486,7 +3486,7 @@ static struct file_lock *nfs4_alloc_init_lease(struct nfs4_delegation *dp, int f
fl->fl_flags = FL_DELEG; fl->fl_flags = FL_DELEG;
fl->fl_type = flag == NFS4_OPEN_DELEGATE_READ? F_RDLCK: F_WRLCK; fl->fl_type = flag == NFS4_OPEN_DELEGATE_READ? F_RDLCK: F_WRLCK;
fl->fl_end = OFFSET_MAX; fl->fl_end = OFFSET_MAX;
fl->fl_owner = (fl_owner_t)(dp->dl_file); fl->fl_owner = (fl_owner_t)fp;
fl->fl_pid = current->tgid; fl->fl_pid = current->tgid;
return fl; return fl;
} }
@ -3497,7 +3497,7 @@ static int nfs4_setlease(struct nfs4_delegation *dp)
struct file_lock *fl; struct file_lock *fl;
int status; int status;
fl = nfs4_alloc_init_lease(dp, NFS4_OPEN_DELEGATE_READ); fl = nfs4_alloc_init_lease(fp, NFS4_OPEN_DELEGATE_READ);
if (!fl) if (!fl)
return -ENOMEM; return -ENOMEM;
fl->fl_file = find_readable_file(fp); fl->fl_file = find_readable_file(fp);