[PATCH 0/2] bcache patches for Linux v5.13 - 3rd wave

[PATCH 0/2] bcache patches for Linux v5.13 - 3rd wave

[Coly Li]

HI Jens,

Here are the current bcache fixes for already merged patches in
linux-next for Linux v5.13. 

Thank you in advance for taking them.

Coly Li
---

Colin Ian King (1):
  bcache: Set error return err to -ENOMEM on allocation failure

Coly Li (1):
  bcache: Kconfig dependence fix for NVDIMM support

 drivers/md/bcache/Kconfig     | 4 ++--
 drivers/md/bcache/nvm-pages.c | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

-- 
2.26.2

[PATCH 1/2] bcache: Kconfig dependence fix for NVDIMM support

[Coly Li]

In drivers/md/bcache/Kconfig, setting BCACHE_NVM_PAGES to "selected"
LIBNVDIMM and DAX is improper. This patch changes to Kconfig dependance
from "selected" to "depends on" for LIBNVDIMM and DAX.

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Coly Li <colyli@suse.de>
---
 drivers/md/bcache/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/md/bcache/Kconfig b/drivers/md/bcache/Kconfig
index 0996e366ad0b..59999f24d89e 100644
--- a/drivers/md/bcache/Kconfig
+++ b/drivers/md/bcache/Kconfig
@@ -40,7 +40,7 @@ config BCACHE_NVM_PAGES
 	bool "NVDIMM support for bcache (EXPERIMENTAL)"
 	depends on BCACHE
 	depends on PHYS_ADDR_T_64BIT
-	select LIBNVDIMM
-	select DAX
+	depends on LIBNVDIMM
+	depends on DAX
 	help
 	nvm pages allocator for bcache.
-- 
2.26.2

[PATCH 2/2] bcache: Set error return err to -ENOMEM on allocation failure

[Coly Li]

From: Colin Ian King <colin.king@canonical.com>

Currently when ns fails to be allocated the error return path returns
an uninitialized return code in variable 'err'. Fix this by setting
err to -ENOMEM.

Addresses-Coverity: ("Uninitialized scalar variable")
Fixes: 688330711e9a ("bcache: initialize the nvm pages allocator")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Coly Li <colyli@suse.de>
---
 drivers/md/bcache/nvm-pages.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/md/bcache/nvm-pages.c b/drivers/md/bcache/nvm-pages.c
index 08cd45e90481..2e124d546099 100644
--- a/drivers/md/bcache/nvm-pages.c
+++ b/drivers/md/bcache/nvm-pages.c
@@ -584,6 +584,7 @@ struct bch_nvm_namespace *bch_register_namespace(const char *dev_path)
 		return ERR_PTR(PTR_ERR(bdev));
 	}
 
+	err = -ENOMEM;
 	ns = kzalloc(sizeof(struct bch_nvm_namespace), GFP_KERNEL);
 	if (!ns)
 		goto bdput;
-- 
2.26.2

Re: [PATCH 1/2] bcache: Kconfig dependence fix for NVDIMM support

[Randy Dunlap]

On 4/19/21 9:44 PM, Coly Li wrote:
> In drivers/md/bcache/Kconfig, setting BCACHE_NVM_PAGES to "selected"
> LIBNVDIMM and DAX is improper. This patch changes to Kconfig dependance
> from "selected" to "depends on" for LIBNVDIMM and DAX.
> 
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Jens Axboe <axboe@kernel.dk>
> Signed-off-by: Coly Li <colyli@suse.de>

Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested


Thanks.

> ---
>  drivers/md/bcache/Kconfig | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/md/bcache/Kconfig b/drivers/md/bcache/Kconfig
> index 0996e366ad0b..59999f24d89e 100644
> --- a/drivers/md/bcache/Kconfig
> +++ b/drivers/md/bcache/Kconfig
> @@ -40,7 +40,7 @@ config BCACHE_NVM_PAGES
>  	bool "NVDIMM support for bcache (EXPERIMENTAL)"
>  	depends on BCACHE
>  	depends on PHYS_ADDR_T_64BIT
> -	select LIBNVDIMM
> -	select DAX
> +	depends on LIBNVDIMM
> +	depends on DAX
>  	help
>  	nvm pages allocator for bcache.
> 


-- 
~Randy