mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-07-25 16:50:52 -04:00
lockd: Drop locks_init_lock() from nlm4_lock_to_lockd_lock()
The NLMv4 GRANTED helper passes the wrapper's lock to nlmclnt_grant(), which compares only fl_start, fl_end, svid, and fh, and the shared nlmclnt_lock_event tracepoint now sources its byte-range fields from fl_start and fl_end as well. Both fl_start and fl_end are set unconditionally by lockd_set_file_lock_range4() on the line below, so the locks_init_lock() call left no observable effect: every other field of struct file_lock is unread on the GRANTED path. Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
@@ -119,7 +119,6 @@ nlm4_lock_to_nlm_lock(struct nlm_lock *lock, struct nlm4_lock *alock)
|
||||
lock->oh.len = alock->oh.len;
|
||||
lock->oh.data = alock->oh.data;
|
||||
lock->svid = alock->svid;
|
||||
locks_init_lock(&lock->fl);
|
||||
lockd_set_file_lock_range4(&lock->fl, alock->l_offset, alock->l_len);
|
||||
return nlm_granted;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user