Skip to contentSkip to conversation

ext4 crypto: fix an error code in ext4_init_crypto()

PATCH In review Dan Carpenter 2 participants 2 messages Apr 9, 2015 – Apr 11, 2015

Subsystems (2)
Kernel janitors ext4 file system
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 ext4 crypto: fix an error code in ext4_init_crypto()

The callers don't care about the error so it doesn't make a difference, but static checkers complain so let's return an error code here.

Signed-off-by Dan Carpenter <[email protected]>
fs/ext4/crypto.c +4 -2
index 226e07f..6110ccd 100644
@@ -233,7 +233,7 @@ void ext4_exit_crypto(void)
  */
 int ext4_init_crypto(void)
 {
-	int i, res = 0;
+	int i, res;
 
 	mutex_lock(&crypto_init);
 	if (ext4_read_workqueue)

@@ -257,8 +257,10 @@ int ext4_init_crypto(void)
 
 	ext4_bounce_page_pool  		mempool_create_page_pool(num_prealloc_crypto_pages, 0);
-	if (!ext4_bounce_page_pool)
+	if (!ext4_bounce_page_pool) {
+		res = -ENOMEM;
 		goto fail;
+	}
 already_initialized:
 	mutex_unlock(&crypto_init);
 	return 0;
maintainer
#1 lore raw
Quoted 4 lines · Dan Carpenter

The callers don't care about the error so it doesn't make a difference, but static checkers complain so let's return an error code here.

Signed-off-by Dan Carpenter <[email protected]>

Thanks for pointing this out! I will merge this with the next version of the ext4 crypto patches.

- Ted