[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180725162849.8320-2-yehs2007@zoho.com>
Date: Thu, 26 Jul 2018 00:28:44 +0800
From: Huaisheng Ye <yehs2007@...o.com>
To: linux-nvdimm@...ts.01.org, dan.j.williams@...el.com
Cc: ross.zwisler@...ux.intel.com, willy@...radead.org,
vishal.l.verma@...el.com, dave.jiang@...el.com,
schwidefsky@...ibm.com, heiko.carstens@...ibm.com,
viro@...iv.linux.org.uk, martin.petersen@...cle.com,
axboe@...nel.dk, gregkh@...uxfoundation.org,
bart.vanassche@....com, jack@...e.cz, agk@...hat.com,
snitzer@...hat.com, dm-devel@...hat.com,
linux-kernel@...r.kernel.org, linux-s390@...r.kernel.org,
linux-fsdevel@...r.kernel.org, chengnt@...ovo.com, colyli@...e.de,
Huaisheng Ye <yehs1@...ovo.com>
Subject: [PATCH v2 1/6] libnvdimm, pmem: kaddr and pfn can be NULL to ->direct_access()
From: Huaisheng Ye <yehs1@...ovo.com>
pmem_direct_access() needs to check the validity of pointers kaddr
and pfn for NULL assignment. If anyone equals to NULL, it doesn't need
to calculate the value.
If pointer equals to NULL, that is to say callers may have no need for
kaddr or pfn, so this patch is prepared for allowing them to pass in
NULL instead of having to pass in a pointer or local variable that
they then just throw away.
Signed-off-by: Huaisheng Ye <yehs1@...ovo.com>
---
drivers/nvdimm/pmem.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 8b1fd7f..ecf9024 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -227,8 +227,11 @@ __weak long __pmem_direct_access(struct pmem_device *pmem, pgoff_t pgoff,
if (unlikely(is_bad_pmem(&pmem->bb, PFN_PHYS(pgoff) / 512,
PFN_PHYS(nr_pages))))
return -EIO;
- *kaddr = pmem->virt_addr + offset;
- *pfn = phys_to_pfn_t(pmem->phys_addr + offset, pmem->pfn_flags);
+
+ if (kaddr)
+ *kaddr = pmem->virt_addr + offset;
+ if (pfn)
+ *pfn = phys_to_pfn_t(pmem->phys_addr + offset, pmem->pfn_flags);
/*
* If badblocks are present, limit known good range to the
--
1.8.3.1
Powered by blists - more mailing lists