Commit 3ab4436f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux 

Pull nfsd fix from Bruce Fields:
 "This reverts a minor fix which could cause us to treat conflicting NLM
  locks as nonconflicting.

  We have proper fix queued up for 5.3. In the meantime, a quick revert
  seems best for 5.2 and stable"

* tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux:
  Revert "lockd: Show pid of lockd for remote locks"
parents 41e7231f 141731d1

fs/lockd/xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ nlm_decode_lock(__be32 *p, struct nlm_lock *lock) 


	locks_init_lock(fl);

	fl->fl_owner = current->files;

	fl->fl_pid   = current->tgid;

	fl->fl_pid   = (pid_t)lock->svid;

	fl->fl_flags = FL_POSIX;

	fl->fl_type  = F_RDLCK;		/* as good as anything else */

	start = ntohl(*p++);
@@ -269,7 +269,7 @@ nlmsvc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p) 
	memset(lock, 0, sizeof(*lock));

	locks_init_lock(&lock->fl);

	lock->svid = ~(u32) 0;

	lock->fl.fl_pid = current->tgid;

	lock->fl.fl_pid = (pid_t)lock->svid;



	if (!(p = nlm_decode_cookie(p, &argp->cookie))

	 || !(p = xdr_decode_string_inplace(p, &lock->caller,

fs/lockd/xdr4.c

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ nlm4_decode_lock(__be32 *p, struct nlm_lock *lock) 


	locks_init_lock(fl);

	fl->fl_owner = current->files;

	fl->fl_pid   = current->tgid;

	fl->fl_pid   = (pid_t)lock->svid;

	fl->fl_flags = FL_POSIX;

	fl->fl_type  = F_RDLCK;		/* as good as anything else */

	p = xdr_decode_hyper(p, &start);
@@ -266,7 +266,7 @@ nlm4svc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p) 
	memset(lock, 0, sizeof(*lock));

	locks_init_lock(&lock->fl);

	lock->svid = ~(u32) 0;

	lock->fl.fl_pid = current->tgid;

	lock->fl.fl_pid = (pid_t)lock->svid;



	if (!(p = nlm4_decode_cookie(p, &argp->cookie))

	 || !(p = xdr_decode_string_inplace(p, &lock->caller,

CRA Git | Maintained and supported by SUSTech CRA and CCSE