- jbd-only-create-debugfs-entries-if-cache-initialisation-is-successful.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     jbd: only create debugfs entries if cache initialisation is successful
has been removed from the -mm tree.  Its filename was
     jbd-only-create-debugfs-entries-if-cache-initialisation-is-successful.patch

This patch was dropped because an updated version will be merged

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: jbd: only create debugfs entries if cache initialisation is successful
From: "Duane Griffin" <duaneg@xxxxxxxxx>

JBD debugfs entries should only be created if cache initialisation is
successful.  At the moment they are being created unconditionally which will
leave them dangling if cache (and hence module) initialisation fails.

Signed-off-by: Duane Griffin <duaneg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 fs/jbd/journal.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff -puN fs/jbd/journal.c~jbd-only-create-debugfs-entries-if-cache-initialisation-is-successful fs/jbd/journal.c
--- a/fs/jbd/journal.c~jbd-only-create-debugfs-entries-if-cache-initialisation-is-successful
+++ a/fs/jbd/journal.c
@@ -1942,9 +1942,10 @@ static int __init journal_init(void)
 	BUILD_BUG_ON(sizeof(struct journal_superblock_s) != 1024);
 
 	ret = journal_init_caches();
-	if (ret != 0)
+	if (ret == 0)
+		jbd_create_debugfs_entry();
+	else
 		journal_destroy_caches();
-	jbd_create_debugfs_entry();
 	return ret;
 }
 
_

Patches currently in -mm which might be from duaneg@xxxxxxxxx are

jbd-only-create-debugfs-entries-if-cache-initialisation-is-successful.patch
jbd2-only-create-debugfs-and-stats-entries-if-cache-initialisation-is-successful.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux