Commit a01c9fe3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfsd-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux 

Pull nfsd updates from Chuck Lever:
 "The bulk of the patches for this release are optimizations, code
  clean-ups, and minor bug fixes.

  One new feature to mention is that NFSD administrators now have the
  ability to revoke NFSv4 open and lock state. NFSD's NFSv3 support has
  had this capability for some time.

  As always I am grateful to NFSD contributors, reviewers, and testers"

* tag 'nfsd-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux: (75 commits)
  NFSD: Clean up nfsd4_encode_replay()
  NFSD: send OP_CB_RECALL_ANY to clients when number of delegations reaches its limit
  NFSD: Document nfsd_setattr() fill-attributes behavior
  nfsd: Fix NFSv3 atomicity bugs in nfsd_setattr()
  nfsd: Fix a regression in nfsd_setattr()
  NFSD: OP_CB_RECALL_ANY should recall both read and write delegations
  NFSD: handle GETATTR conflict with write delegation
  NFSD: add support for CB_GETATTR callback
  NFSD: Document the phases of CREATE_SESSION
  NFSD: Fix the NFSv4.1 CREATE_SESSION operation
  nfsd: clean up comments over nfs4_client definition
  svcrdma: Add Write chunk WRs to the RPC's Send WR chain
  svcrdma: Post WRs for Write chunks in svc_rdma_sendto()
  svcrdma: Post the Reply chunk and Send WR together
  svcrdma: Move write_info for Reply chunks into struct svc_rdma_send_ctxt
  svcrdma: Post Send WR chain
  svcrdma: Fix retry loop in svc_rdma_send()
  svcrdma: Prevent a UAF in svc_rdma_send()
  svcrdma: Fix SQ wake-ups
  svcrdma: Increase the per-transport rw_ctx count
  ...
parents f153fbe1 9b350d3e

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -8172,6 +8172,7 @@ F: include/uapi/scsi/fc/ 
FILE LOCKING (flock() and fcntl()/lockf())

M:	Jeff Layton <jlayton@kernel.org>

M:	Chuck Lever <chuck.lever@oracle.com>

R:	Alexander Aring <alex.aring@gmail.com>

L:	linux-fsdevel@vger.kernel.org

S:	Maintained

F:	fs/fcntl.c

fs/lockd/svc.c

+0 −3
Original line number Diff line number Diff line
@@ -710,8 +710,6 @@ static const struct svc_version *nlmsvc_version[] = { 
#endif

};



static struct svc_stat		nlmsvc_stats;



#define NLM_NRVERS	ARRAY_SIZE(nlmsvc_version)

static struct svc_program	nlmsvc_program = {

	.pg_prog		= NLM_PROGRAM,		/* program number */
@@ -719,7 +717,6 @@ static struct svc_program nlmsvc_program = { 
	.pg_vers		= nlmsvc_version,	/* version table */

	.pg_name		= "lockd",		/* service name */

	.pg_class		= "nfsd",		/* share authentication with nfsd */

	.pg_stats		= &nlmsvc_stats,	/* stats table */

	.pg_authenticate	= &lockd_authenticate,	/* export authentication */

	.pg_init_request	= svc_generic_init_request,

	.pg_rpcbind_set		= svc_generic_rpcbind_set,

fs/nfs/callback.c

+0 −3
Original line number Diff line number Diff line
@@ -356,15 +356,12 @@ static const struct svc_version *nfs4_callback_version[] = { 
	[4] = &nfs4_callback_version4,

};



static struct svc_stat nfs4_callback_stats;



static struct svc_program nfs4_callback_program = {

	.pg_prog = NFS4_CALLBACK,			/* RPC service number */

	.pg_nvers = ARRAY_SIZE(nfs4_callback_version),	/* Number of entries */

	.pg_vers = nfs4_callback_version,		/* version table */

	.pg_name = "NFSv4 callback",			/* service name */

	.pg_class = "nfs",				/* authentication class */

	.pg_stats = &nfs4_callback_stats,

	.pg_authenticate = nfs_callback_authenticate,

	.pg_init_request = svc_generic_init_request,

	.pg_rpcbind_set	= svc_generic_rpcbind_set,

fs/nfsd/blocklayout.c

+2 −2
Original line number Diff line number Diff line
@@ -328,10 +328,10 @@ nfsd4_scsi_proc_layoutcommit(struct inode *inode, 
}



static void

nfsd4_scsi_fence_client(struct nfs4_layout_stateid *ls)

nfsd4_scsi_fence_client(struct nfs4_layout_stateid *ls, struct nfsd_file *file)

{

	struct nfs4_client *clp = ls->ls_stid.sc_client;

	struct block_device *bdev = ls->ls_file->nf_file->f_path.mnt->mnt_sb->s_bdev;

	struct block_device *bdev = file->nf_file->f_path.mnt->mnt_sb->s_bdev;



	bdev->bd_disk->fops->pr_ops->pr_preempt(bdev, NFSD_MDS_PR_KEY,

			nfsd4_scsi_pr_key(clp), 0, true);

fs/nfsd/cache.h

+0 −2
Original line number Diff line number Diff line
@@ -80,8 +80,6 @@ enum { 


int	nfsd_drc_slab_create(void);

void	nfsd_drc_slab_free(void);

int	nfsd_net_reply_cache_init(struct nfsd_net *nn);

void	nfsd_net_reply_cache_destroy(struct nfsd_net *nn);

int	nfsd_reply_cache_init(struct nfsd_net *);

void	nfsd_reply_cache_shutdown(struct nfsd_net *);

int	nfsd_cache_lookup(struct svc_rqst *rqstp, unsigned int start,