Commit 78a2cbd8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'libnvdimm-for-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm 

Pull nvdimm and DAX updates from Ira Weiny:
 "Most represent minor cleanups and code removals. One patch fixes
  potential NULL pointer arithmetic which was benign because the offset
  of the member was 0. Nevertheless it should be cleaned up.

   - typo fixes

   - clarify logic to remove potential NULL pointer math

   - remove dead code"

* tag 'libnvdimm-for-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  dax: Remove an unused field in struct dax_operations
  dax: delete a stale directory pmem
  nvdimm: rectify the illogical code within nd_dax_probe()
  nvdimm: Correct some typos in comments
parents 2c22dc1e f3dd9ae7

drivers/dax/pmem/Makefile

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-$(CONFIG_DEV_DAX_PMEM) += dax_pmem.o

obj-$(CONFIG_DEV_DAX_PMEM) += dax_pmem_core.o



dax_pmem-y := pmem.o

dax_pmem_core-y := core.o

dax_pmem_compat-y := compat.o

drivers/dax/pmem/pmem.c

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 2016 - 2018 Intel Corporation. All rights reserved. */

#include <linux/percpu-refcount.h>

#include <linux/memremap.h>

#include <linux/module.h>

#include <linux/pfn_t.h>

#include <linux/nd.h>

#include "../bus.h"

drivers/nvdimm/dax_devs.c

+2 −2
Original line number Diff line number Diff line
@@ -106,12 +106,12 @@ int nd_dax_probe(struct device *dev, struct nd_namespace_common *ndns) 


	nvdimm_bus_lock(&ndns->dev);

	nd_dax = nd_dax_alloc(nd_region);

	nd_pfn = &nd_dax->nd_pfn;

	dax_dev = nd_pfn_devinit(nd_pfn, ndns);

	dax_dev = nd_dax_devinit(nd_dax, ndns);

	nvdimm_bus_unlock(&ndns->dev);

	if (!dax_dev)

		return -ENOMEM;

	pfn_sb = devm_kmalloc(dev, sizeof(*pfn_sb), GFP_KERNEL);

	nd_pfn = &nd_dax->nd_pfn;

	nd_pfn->pfn_sb = pfn_sb;

	rc = nd_pfn_validate(nd_pfn, DAX_SIG);

	dev_dbg(dev, "dax: %s\n", rc == 0 ? dev_name(dax_dev) : "<none>");

drivers/nvdimm/nd.h

+7 −0
Original line number Diff line number Diff line
@@ -600,6 +600,13 @@ struct nd_dax *to_nd_dax(struct device *dev); 
int nd_dax_probe(struct device *dev, struct nd_namespace_common *ndns);

bool is_nd_dax(const struct device *dev);

struct device *nd_dax_create(struct nd_region *nd_region);

static inline struct device *nd_dax_devinit(struct nd_dax *nd_dax,

					    struct nd_namespace_common *ndns)

{

	if (!nd_dax)

		return NULL;

	return nd_pfn_devinit(&nd_dax->nd_pfn, ndns);

}

#else

static inline int nd_dax_probe(struct device *dev,

		struct nd_namespace_common *ndns)

drivers/nvdimm/nd_virtio.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static int virtio_pmem_flush(struct nd_region *nd_region) 
		dev_info(&vdev->dev, "failed to send command to virtio pmem device\n");

		err = -EIO;

	} else {

		/* A host repsonse results in "host_ack" getting called */

		/* A host response results in "host_ack" getting called */

		wait_event(req_data->host_acked, req_data->done);

		err = le32_to_cpu(req_data->resp.ret);

	}