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

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

Merge tag 'nfs-for-4.9-3' of git://git.linux-nfs.org/projects/anna/linux-nfs 

Pull NFS client bugfixes from Anna Schumaker:
 "Most of these fix regressions in 4.9, and none are going to stable
  this time around.

  Bugfixes:
   - Trim extra slashes in v4 nfs_paths to fix tools that use this
   - Fix a -Wmaybe-uninitialized warnings
   - Fix suspicious RCU usages
   - Fix Oops when mounting multiple servers at once
   - Suppress a false-positive pNFS error
   - Fix a DMAR failure in NFS over RDMA"

* tag 'nfs-for-4.9-3' of git://git.linux-nfs.org/projects/anna/linux-nfs:
  xprtrdma: Fix DMAR failure in frwr_op_map() after reconnect
  fs/nfs: Fix used uninitialized warn in nfs4_slot_seqid_in_use()
  NFS: Don't print a pNFS error if we aren't using pNFS
  NFS: Ignore connections that have cl_rpcclient uninitialized
  SUNRPC: Fix suspicious RCU usage
  NFSv4.1: work around -Wmaybe-uninitialized warning
  NFS: Trim extra slash in v4 nfs_path
parents a4fac3b5 62bdf94a

fs/nfs/client.c

+2 −1
Original line number Diff line number Diff line
@@ -314,7 +314,8 @@ static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *dat 
		/* Match the full socket address */

		if (!rpc_cmp_addr_port(sap, clap))

			/* Match all xprt_switch full socket addresses */

			if (!rpc_clnt_xprt_switch_has_addr(clp->cl_rpcclient,

			if (IS_ERR(clp->cl_rpcclient) ||

                            !rpc_clnt_xprt_switch_has_addr(clp->cl_rpcclient,

							   sap))

				continue;

fs/nfs/namespace.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ char *nfs_path(char **p, struct dentry *dentry, char *buffer, ssize_t buflen, 
		return end;

	}

	namelen = strlen(base);

	if (flags & NFS_PATH_CANONICAL) {

	if (*end == '/') {

		/* Strip off excess slashes in base string */

		while (namelen > 0 && base[namelen - 1] == '/')

			namelen--;

fs/nfs/nfs4session.c

+7 −5
Original line number Diff line number Diff line
@@ -178,12 +178,14 @@ static int nfs4_slot_get_seqid(struct nfs4_slot_table *tbl, u32 slotid, 
	__must_hold(&tbl->slot_tbl_lock)

{

	struct nfs4_slot *slot;

	int ret;



	slot = nfs4_lookup_slot(tbl, slotid);

	if (IS_ERR(slot))

		return PTR_ERR(slot);

	ret = PTR_ERR_OR_ZERO(slot);

	if (!ret)

		*seq_nr = slot->seq_nr;

	return 0;



	return ret;

}



/*
@@ -196,7 +198,7 @@ static int nfs4_slot_get_seqid(struct nfs4_slot_table *tbl, u32 slotid, 
static bool nfs4_slot_seqid_in_use(struct nfs4_slot_table *tbl,

		u32 slotid, u32 seq_nr)

{

	u32 cur_seq;

	u32 cur_seq = 0;

	bool ret = false;



	spin_lock(&tbl->slot_tbl_lock);

fs/nfs/pnfs.c

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +146,8 @@ set_pnfs_layoutdriver(struct nfs_server *server, const struct nfs_fh *mntfh, 
	u32 id;

	int i;



	if (fsinfo->nlayouttypes == 0)

		goto out_no_driver;

	if (!(server->nfs_client->cl_exchange_flags &

		 (EXCHGID4_FLAG_USE_NON_PNFS | EXCHGID4_FLAG_USE_PNFS_MDS))) {

		printk(KERN_ERR "NFS: %s: cl_exchange_flags 0x%x\n",

net/sunrpc/clnt.c

+5 −2
Original line number Diff line number Diff line
@@ -2753,14 +2753,18 @@ EXPORT_SYMBOL_GPL(rpc_cap_max_reconnect_timeout); 


void rpc_clnt_xprt_switch_put(struct rpc_clnt *clnt)

{

	rcu_read_lock();

	xprt_switch_put(rcu_dereference(clnt->cl_xpi.xpi_xpswitch));

	rcu_read_unlock();

}

EXPORT_SYMBOL_GPL(rpc_clnt_xprt_switch_put);



void rpc_clnt_xprt_switch_add_xprt(struct rpc_clnt *clnt, struct rpc_xprt *xprt)

{

	rcu_read_lock();

	rpc_xprt_switch_add_xprt(rcu_dereference(clnt->cl_xpi.xpi_xpswitch),

				 xprt);

	rcu_read_unlock();

}

EXPORT_SYMBOL_GPL(rpc_clnt_xprt_switch_add_xprt);
@@ -2770,9 +2774,8 @@ bool rpc_clnt_xprt_switch_has_addr(struct rpc_clnt *clnt, 
	struct rpc_xprt_switch *xps;

	bool ret;



	xps = rcu_dereference(clnt->cl_xpi.xpi_xpswitch);



	rcu_read_lock();

	xps = rcu_dereference(clnt->cl_xpi.xpi_xpswitch);

	ret = rpc_xprt_switch_has_addr(xps, sap);

	rcu_read_unlock();

	return ret;