Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cd90662 authored by Kinglong Mee's avatar Kinglong Mee Committed by J. Bruce Fields
Browse files

NFSD: Remove duplicate initialization of file_lock 



locks_alloc_lock() has initialized struct file_lock, no need to
re-initialize it here.

Signed-off-by: default avatarKinglong Mee <kinglongmee@gmail.com>
Reviewed-by: default avatarJeff Layton <jlayton@primarydata.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent ae89254d

fs/nfsd/nfs4state.c

+2 −4
Original line number Diff line number Diff line
@@ -3766,7 +3766,6 @@ static struct file_lock *nfs4_alloc_init_lease(struct nfs4_file *fp, int flag) 
	fl = locks_alloc_lock();

	if (!fl)

		return NULL;

	locks_init_lock(fl);

	fl->fl_lmops = &nfsd_lease_mng_ops;

	fl->fl_flags = FL_DELEG;

	fl->fl_type = flag == NFS4_OPEN_DELEGATE_READ? F_RDLCK: F_WRLCK;
@@ -5217,7 +5216,6 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	}



	fp = lock_stp->st_stid.sc_file;

	locks_init_lock(file_lock);

	switch (lock->lk_type) {

		case NFS4_READ_LT:

		case NFS4_READW_LT:
@@ -5361,7 +5359,7 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
		status = nfserr_jukebox;

		goto out;

	}

	locks_init_lock(file_lock);



	switch (lockt->lt_type) {

		case NFS4_READ_LT:

		case NFS4_READW_LT:
@@ -5439,7 +5437,7 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
		status = nfserr_jukebox;

		goto fput;

	}

	locks_init_lock(file_lock);



	file_lock->fl_type = F_UNLCK;

	file_lock->fl_owner = (fl_owner_t)lockowner(stp->st_stateowner);

	file_lock->fl_pid = current->tgid;