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

Commit 5e3a9888 authored by Weston Andros Adamson's avatar Weston Andros Adamson Committed by Anna Schumaker
Browse files

pnfs_nfs: fix _cancel_empty_pagelist 



pnfs_generic_commit_cancel_empty_pagelist calls nfs_commitdata_release,
but that is wrong: nfs_commitdata_release puts the open context, something
that isn't valid until nfs_init_commit is called, which is never the case
when pnfs_generic_commit_cancel_empty_pagelist is called.

This was introduced in "nfs: avoid race that crashes nfs_init_commit".

Signed-off-by: default avatarWeston Andros Adamson <dros@primarydata.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent cea7f829

fs/nfs/pnfs_nfs.c

+10 −2
Original line number Diff line number Diff line
@@ -247,7 +247,11 @@ void pnfs_fetch_commit_bucket_list(struct list_head *pages, 
}



/* Helper function for pnfs_generic_commit_pagelist to catch an empty

 * page list. This can happen when two commits race. */

 * page list. This can happen when two commits race.

 *

 * This must be called instead of nfs_init_commit - call one or the other, but

 * not both!

 */

static bool

pnfs_generic_commit_cancel_empty_pagelist(struct list_head *pages,

					  struct nfs_commit_data *data,
@@ -256,7 +260,11 @@ pnfs_generic_commit_cancel_empty_pagelist(struct list_head *pages, 
	if (list_empty(pages)) {

		if (atomic_dec_and_test(&cinfo->mds->rpcs_out))

			wake_up_atomic_t(&cinfo->mds->rpcs_out);

		nfs_commitdata_release(data);

		/* don't call nfs_commitdata_release - it tries to put

		 * the open_context which is not acquired until nfs_init_commit

		 * which has not been called on @data */

		WARN_ON_ONCE(data->context);

		nfs_commit_free(data);

		return true;

	}