Commit 894f5c55 authored by Mike Snitzer's avatar Mike Snitzer Committed by Trond Myklebust
Browse files

nfs/localio: eliminate unnecessary kref in nfs_local_fsync_ctx 



nfs_local_commit() doesn't need async cleanup of nfs_local_fsync_ctx,
so there is no need to use a kref.

Signed-off-by: default avatarMike Snitzer <snitzer@kernel.org>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent fb4e525d

fs/nfs/localio.c

+3 −17
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ struct nfs_local_fsync_ctx { 
	struct nfsd_file	*localio;

	struct nfs_commit_data	*data;

	struct work_struct	work;

	struct kref		kref;

	struct completion	*done;

};

static void nfs_local_fsync_work(struct work_struct *work);
@@ -683,30 +682,17 @@ nfs_local_fsync_ctx_alloc(struct nfs_commit_data *data, 
		ctx->localio = localio;

		ctx->data = data;

		INIT_WORK(&ctx->work, nfs_local_fsync_work);

		kref_init(&ctx->kref);

		ctx->done = NULL;

	}

	return ctx;

}



static void

nfs_local_fsync_ctx_kref_free(struct kref *kref)

{

	kfree(container_of(kref, struct nfs_local_fsync_ctx, kref));

}



static void

nfs_local_fsync_ctx_put(struct nfs_local_fsync_ctx *ctx)

{

	kref_put(&ctx->kref, nfs_local_fsync_ctx_kref_free);

}



static void

nfs_local_fsync_ctx_free(struct nfs_local_fsync_ctx *ctx)

{

	nfs_local_release_commit_data(ctx->localio, ctx->data,

				      ctx->data->task.tk_ops);

	nfs_local_fsync_ctx_put(ctx);

	kfree(ctx);

}



static void
@@ -739,7 +725,7 @@ int nfs_local_commit(struct nfsd_file *localio, 
	}



	nfs_local_init_commit(data, call_ops);

	kref_get(&ctx->kref);



	if (how & FLUSH_SYNC) {

		DECLARE_COMPLETION_ONSTACK(done);

		ctx->done = &done;
@@ -747,6 +733,6 @@ int nfs_local_commit(struct nfsd_file *localio, 
		wait_for_completion(&done);

	} else

		queue_work(nfsiod_workqueue, &ctx->work);

	nfs_local_fsync_ctx_put(ctx);



	return 0;

}