Commit 8841b5f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-4.11-2' of git://git.linux-nfs.org/projects/anna/linux-nfs 

Pull NFS client fixes from Anna Schumaker:
 "We have a handful of stable fixes to fix kernel warnings and other
  bugs that have been around for a while. We've also found a few other
  reference counting bugs and memory leaks since the initial 4.11 pull.

  Stable Bugfixes:
   - Fix decrementing nrequests in NFS v4.2 COPY to fix kernel warnings
   - Prevent a double free in async nfs4_exchange_id()
   - Squelch a kbuild sparse complaint for xprtrdma

  Other Bugfixes:
   - Fix a typo (NFS_ATTR_FATTR_GROUP_NAME) that causes a memory leak
   - Fix a reference leak that causes kernel warnings
   - Make nfs4_cb_sv_ops static to fix a sparse warning
   - Respect a server's max size in CREATE_SESSION
   - Handle errors from nfs4_pnfs_ds_connect
   - Flexfiles layout shouldn't mark devices as unavailable"

* tag 'nfs-for-4.11-2' of git://git.linux-nfs.org/projects/anna/linux-nfs:
  pNFS/flexfiles: never nfs4_mark_deviceid_unavailable
  pNFS: return status from nfs4_pnfs_ds_connect
  NFSv4.1 respect server's max size in CREATE_SESSION
  NFS prevent double free in async nfs4_exchange_id
  nfs: make nfs4_cb_sv_ops static
  xprtrdma: Squelch kbuild sparse complaint
  NFS: fix the fault nrequests decreasing for nfs_inode COPY
  NFSv4: fix a reference leak caused WARNING messages
  nfs4: fix a typo of NFS_ATTR_FATTR_GROUP_NAME
parents eab60d4e da066f3f

fs/nfs/callback.c

+2 −2
Original line number Diff line number Diff line
@@ -232,12 +232,12 @@ static struct svc_serv_ops nfs41_cb_sv_ops = { 
	.svo_module		= THIS_MODULE,

};



struct svc_serv_ops *nfs4_cb_sv_ops[] = {

static struct svc_serv_ops *nfs4_cb_sv_ops[] = {

	[0] = &nfs40_cb_sv_ops,

	[1] = &nfs41_cb_sv_ops,

};

#else

struct svc_serv_ops *nfs4_cb_sv_ops[] = {

static struct svc_serv_ops *nfs4_cb_sv_ops[] = {

	[0] = &nfs40_cb_sv_ops,

	[1] = NULL,

};

fs/nfs/client.c

+24 −1
Original line number Diff line number Diff line
@@ -325,10 +325,33 @@ static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *dat 
	return NULL;

}



static bool nfs_client_init_is_complete(const struct nfs_client *clp)

/*

 * Return true if @clp is done initializing, false if still working on it.

 *

 * Use nfs_client_init_status to check if it was successful.

 */

bool nfs_client_init_is_complete(const struct nfs_client *clp)

{

	return clp->cl_cons_state <= NFS_CS_READY;

}

EXPORT_SYMBOL_GPL(nfs_client_init_is_complete);



/*

 * Return 0 if @clp was successfully initialized, -errno otherwise.

 *

 * This must be called *after* nfs_client_init_is_complete() returns true,

 * otherwise it will pop WARN_ON_ONCE and return -EINVAL

 */

int nfs_client_init_status(const struct nfs_client *clp)

{

	/* called without checking nfs_client_init_is_complete */

	if (clp->cl_cons_state > NFS_CS_READY) {

		WARN_ON_ONCE(1);

		return -EINVAL;

	}

	return clp->cl_cons_state;

}

EXPORT_SYMBOL_GPL(nfs_client_init_status);



int nfs_wait_client_init_complete(const struct nfs_client *clp)

{

fs/nfs/filelayout/filelayoutdev.c

+7 −1
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ nfs4_fl_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx) 
	struct nfs4_deviceid_node *devid = FILELAYOUT_DEVID_NODE(lseg);

	struct nfs4_pnfs_ds *ret = ds;

	struct nfs_server *s = NFS_SERVER(lseg->pls_layout->plh_inode);

	int status;



	if (ds == NULL) {

		printk(KERN_ERR "NFS: %s: No data server for offset index %d\n",
@@ -277,9 +278,14 @@ nfs4_fl_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx) 
	if (ds->ds_clp)

		goto out_test_devid;



	nfs4_pnfs_ds_connect(s, ds, devid, dataserver_timeo,

	status = nfs4_pnfs_ds_connect(s, ds, devid, dataserver_timeo,

			     dataserver_retrans, 4,

			     s->nfs_client->cl_minorversion);

	if (status) {

		nfs4_mark_deviceid_unavailable(devid);

		ret = NULL;

		goto out;

	}



out_test_devid:

	if (ret->ds_clp == NULL ||

fs/nfs/flexfilelayout/flexfilelayout.h

+13 −1
Original line number Diff line number Diff line
@@ -175,7 +175,19 @@ ff_layout_no_read_on_rw(struct pnfs_layout_segment *lseg) 
static inline bool

ff_layout_test_devid_unavailable(struct nfs4_deviceid_node *node)

{

	return nfs4_test_deviceid_unavailable(node);

	/*

	 * Flexfiles should never mark a DS unavailable, but if it does

	 * print a (ratelimited) warning as this can affect performance.

	 */

	if (nfs4_test_deviceid_unavailable(node)) {

		u32 *p = (u32 *)node->deviceid.data;



		pr_warn_ratelimited("NFS: flexfiles layout referencing an "

				"unavailable device [%x%x%x%x]\n",

				p[0], p[1], p[2], p[3]);

		return true;

	}

	return false;

}



static inline int

fs/nfs/flexfilelayout/flexfilelayoutdev.c

+3 −2
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ nfs4_ff_layout_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx, 
	struct inode *ino = lseg->pls_layout->plh_inode;

	struct nfs_server *s = NFS_SERVER(ino);

	unsigned int max_payload;

	int status;



	if (!ff_layout_mirror_valid(lseg, mirror, true)) {

		pr_err_ratelimited("NFS: %s: No data server for offset index %d\n",
@@ -404,7 +405,7 @@ nfs4_ff_layout_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx, 
	/* FIXME: For now we assume the server sent only one version of NFS

	 * to use for the DS.

	 */

	nfs4_pnfs_ds_connect(s, ds, devid, dataserver_timeo,

	status = nfs4_pnfs_ds_connect(s, ds, devid, dataserver_timeo,

			     dataserver_retrans,

			     mirror->mirror_ds->ds_versions[0].version,

			     mirror->mirror_ds->ds_versions[0].minor_version);
@@ -420,11 +421,11 @@ nfs4_ff_layout_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx, 
			mirror->mirror_ds->ds_versions[0].wsize = max_payload;

		goto out;

	}

out_fail:

	ff_layout_track_ds_error(FF_LAYOUT_FROM_HDR(lseg->pls_layout),

				 mirror, lseg->pls_range.offset,

				 lseg->pls_range.length, NFS4ERR_NXIO,

				 OP_ILLEGAL, GFP_NOIO);

out_fail:

	if (fail_return || !ff_layout_has_available_ds(lseg))

		pnfs_error_mark_layout_for_return(ino, lseg);

	ds = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE