diff options
Diffstat (limited to 'fs/lockd/clnt4xdr.c')
| -rw-r--r-- | fs/lockd/clnt4xdr.c | 9 | 
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/lockd/clnt4xdr.c b/fs/lockd/clnt4xdr.c index 7df6324ccb8a..8161667c976f 100644 --- a/fs/lockd/clnt4xdr.c +++ b/fs/lockd/clnt4xdr.c @@ -261,7 +261,6 @@ static int decode_nlm4_holder(struct xdr_stream *xdr, struct nlm_res *result)  	u32 exclusive;  	int error;  	__be32 *p; -	s32 end;  	memset(lock, 0, sizeof(*lock));  	locks_init_lock(fl); @@ -285,13 +284,7 @@ static int decode_nlm4_holder(struct xdr_stream *xdr, struct nlm_res *result)  	fl->fl_type  = exclusive != 0 ? F_WRLCK : F_RDLCK;  	p = xdr_decode_hyper(p, &l_offset);  	xdr_decode_hyper(p, &l_len); -	end = l_offset + l_len - 1; - -	fl->fl_start = (loff_t)l_offset; -	if (l_len == 0 || end < 0) -		fl->fl_end = OFFSET_MAX; -	else -		fl->fl_end = (loff_t)end; +	nlm4svc_set_file_lock_range(fl, l_offset, l_len);  	error = 0;  out:  	return error;  |