Commit 2bb56b4e authored by Neil Brown's avatar Neil Brown Committed by Linus Torvalds

[PATCH] knfsd: remove redundant initialization in nfsd4_lockt

No need to set fl_owner and fl_pid to 0, since that's already been done by
locks_init_lock.
Signed-off-by: default avatarAndy Adamson <andros@umich.edu>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d1ebba47
...@@ -2268,7 +2268,6 @@ int ...@@ -2268,7 +2268,6 @@ int
nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lockt *lockt) nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lockt *lockt)
{ {
struct inode *inode; struct inode *inode;
struct nfs4_stateowner *sop;
struct file file; struct file file;
struct file_lock file_lock; struct file_lock file_lock;
struct file_lock *conflicting_lock; struct file_lock *conflicting_lock;
...@@ -2320,14 +2319,9 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock ...@@ -2320,14 +2319,9 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
find_lockstateowner_str(strhashval, &lockt->lt_owner, find_lockstateowner_str(strhashval, &lockt->lt_owner,
&lockt->lt_clientid, &lockt->lt_clientid,
&lockt->lt_stateowner); &lockt->lt_stateowner);
sop = lockt->lt_stateowner; if (lockt->lt_stateowner)
if (sop) { file_lock.fl_owner = (fl_owner_t)lockt->lt_stateowner;
file_lock.fl_owner = (fl_owner_t) sop;
file_lock.fl_pid = current->tgid; file_lock.fl_pid = current->tgid;
} else {
file_lock.fl_owner = NULL;
file_lock.fl_pid = 0;
}
file_lock.fl_flags = FL_POSIX; file_lock.fl_flags = FL_POSIX;
file_lock.fl_start = lockt->lt_offset; file_lock.fl_start = lockt->lt_offset;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment