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

Commit 9157141c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull nfsd updates from Bruce Fields:
 "Chuck Lever fixed a problem with NFSv4.0 callbacks over GSS from
  multi-homed servers.

  The only new feature is a minor bit of protocol (change_attr_type)
  which the client doesn't even use yet.

  Other than that, various bugfixes and cleanup"

* tag 'nfsd-4.19-1' of git://linux-nfs.org/~bfields/linux: (27 commits)
  sunrpc: Add comment defining gssd upcall API keywords
  nfsd: Remove callback_cred
  nfsd: Use correct credential for NFSv4.0 callback with GSS
  sunrpc: Extract target name into svc_cred
  sunrpc: Enable the kernel to specify the hostname part of service principals
  sunrpc: Don't use stack buffer with scatterlist
  rpc: remove unneeded variable 'ret' in rdma_listen_handler
  nfsd: use true and false for boolean values
  nfsd: constify write_op[]
  fs/nfsd: Delete invalid assignment statements in nfsd4_decode_exchange_id
  NFSD: Handle full-length symlinks
  NFSD: Refactor the generic write vector fill helper
  svcrdma: Clean up Read chunk path
  svcrdma: Avoid releasing a page in svc_xprt_release()
  nfsd: Mark expected switch fall-through
  sunrpc: remove redundant variables 'checksumlen','blocksize' and 'data'
  nfsd: fix leaked file lock with nfs exported overlayfs
  nfsd: don't advertise a SCSI layout for an unsupported request_queue
  nfsd: fix corrupted reply to badly ordered compound
  nfsd: clarify check_op_ordering
  ...
parents 6f7948f5 108b833c

fs/lockd/clntlock.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ __be32 nlmclnt_grant(const struct sockaddr *addr, const struct nlm_lock *lock) 
			continue;

		if (!rpc_cmp_addr(nlm_addr(block->b_host), addr))

			continue;

		if (nfs_compare_fh(NFS_FH(file_inode(fl_blocked->fl_file)) ,fh) != 0)

		if (nfs_compare_fh(NFS_FH(locks_inode(fl_blocked->fl_file)), fh) != 0)

			continue;

		/* Alright, we found a lock. Set the return status

		 * and wake up the caller

fs/lockd/clntproc.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static void nlmclnt_setlockargs(struct nlm_rqst *req, struct file_lock *fl) 
	char *nodename = req->a_host->h_rpcclnt->cl_nodename;



	nlmclnt_next_cookie(&argp->cookie);

	memcpy(&lock->fh, NFS_FH(file_inode(fl->fl_file)), sizeof(struct nfs_fh));

	memcpy(&lock->fh, NFS_FH(locks_inode(fl->fl_file)), sizeof(struct nfs_fh));

	lock->caller  = nodename;

	lock->oh.data = req->a_owner;

	lock->oh.len  = snprintf(req->a_owner, sizeof(req->a_owner), "%u@%s",

fs/lockd/svclock.c

+8 −8
Original line number Diff line number Diff line
@@ -405,8 +405,8 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, 
	__be32			ret;



	dprintk("lockd: nlmsvc_lock(%s/%ld, ty=%d, pi=%d, %Ld-%Ld, bl=%d)\n",

				file_inode(file->f_file)->i_sb->s_id,

				file_inode(file->f_file)->i_ino,

				locks_inode(file->f_file)->i_sb->s_id,

				locks_inode(file->f_file)->i_ino,

				lock->fl.fl_type, lock->fl.fl_pid,

				(long long)lock->fl.fl_start,

				(long long)lock->fl.fl_end,
@@ -511,8 +511,8 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file, 
	__be32			ret;



	dprintk("lockd: nlmsvc_testlock(%s/%ld, ty=%d, %Ld-%Ld)\n",

				file_inode(file->f_file)->i_sb->s_id,

				file_inode(file->f_file)->i_ino,

				locks_inode(file->f_file)->i_sb->s_id,

				locks_inode(file->f_file)->i_ino,

				lock->fl.fl_type,

				(long long)lock->fl.fl_start,

				(long long)lock->fl.fl_end);
@@ -566,8 +566,8 @@ nlmsvc_unlock(struct net *net, struct nlm_file *file, struct nlm_lock *lock) 
	int	error;



	dprintk("lockd: nlmsvc_unlock(%s/%ld, pi=%d, %Ld-%Ld)\n",

				file_inode(file->f_file)->i_sb->s_id,

				file_inode(file->f_file)->i_ino,

				locks_inode(file->f_file)->i_sb->s_id,

				locks_inode(file->f_file)->i_ino,

				lock->fl.fl_pid,

				(long long)lock->fl.fl_start,

				(long long)lock->fl.fl_end);
@@ -595,8 +595,8 @@ nlmsvc_cancel_blocked(struct net *net, struct nlm_file *file, struct nlm_lock *l 
	int status = 0;



	dprintk("lockd: nlmsvc_cancel(%s/%ld, pi=%d, %Ld-%Ld)\n",

				file_inode(file->f_file)->i_sb->s_id,

				file_inode(file->f_file)->i_ino,

				locks_inode(file->f_file)->i_sb->s_id,

				locks_inode(file->f_file)->i_ino,

				lock->fl.fl_pid,

				(long long)lock->fl.fl_start,

				(long long)lock->fl.fl_end);

fs/lockd/svcsubs.c

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static inline void nlm_debug_print_fh(char *msg, struct nfs_fh *f) 


static inline void nlm_debug_print_file(char *msg, struct nlm_file *file)

{

	struct inode *inode = file_inode(file->f_file);

	struct inode *inode = locks_inode(file->f_file);



	dprintk("lockd: %s %s/%ld\n",

		msg, inode->i_sb->s_id, inode->i_ino);
@@ -414,7 +414,7 @@ nlmsvc_match_sb(void *datap, struct nlm_file *file) 
{

	struct super_block *sb = datap;



	return sb == file_inode(file->f_file)->i_sb;

	return sb == locks_inode(file->f_file)->i_sb;

}



/**

fs/nfsd/netns.h

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ struct nfsd_net { 


	time_t nfsd4_lease;

	time_t nfsd4_grace;

	bool somebody_reclaimed;



	bool nfsd_net_up;

	bool lockd_up;