From 64f2b76f28913a87dfceb9e6af20c7b40a58a1ca Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 30 Mar 2018 00:10:24 -0400 Subject: [PATCH] add patch null-out-kobject-during-sysfs-cleanup --- null-out-kobject-during-sysfs-cleanup | 36 +++++++++++++++++++++++++++++++++++ series | 2 ++ timestamps | 9 +++++---- 3 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 null-out-kobject-during-sysfs-cleanup diff --git a/null-out-kobject-during-sysfs-cleanup b/null-out-kobject-during-sysfs-cleanup new file mode 100644 index 00000000..4dfa04f8 --- /dev/null +++ b/null-out-kobject-during-sysfs-cleanup @@ -0,0 +1,36 @@ +ext4: null out kobject* during sysfs cleanup + +From: Tyson Nottingham + +Make cleanup of ext4_feat kobject consistent with similar objects. + +Signed-off-by: Tyson Nottingham +Signed-off-by: Theodore Ts'o +--- + fs/ext4/sysfs.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/fs/ext4/sysfs.c b/fs/ext4/sysfs.c +index 1205261..aa8165e 100644 +--- a/fs/ext4/sysfs.c ++++ b/fs/ext4/sysfs.c +@@ -464,6 +464,7 @@ int __init ext4_init_sysfs(void) + + feat_err: + kobject_put(ext4_feat); ++ ext4_feat = NULL; + kset_err: + kset_unregister(ext4_kset); + ext4_kset = NULL; +@@ -473,6 +474,7 @@ int __init ext4_init_sysfs(void) + void ext4_exit_sysfs(void) + { + kobject_put(ext4_feat); ++ ext4_feat = NULL; + kset_unregister(ext4_kset); + ext4_kset = NULL; + remove_proc_entry(proc_dirname, NULL); +-- +2.7.4 + + diff --git a/series b/series index c812f624..725766ce 100644 --- a/series +++ b/series @@ -23,6 +23,8 @@ fail-unalloc-root-dir-in-ext4_iget always-load-checksum-driver dont-allow-rw-mounts-of-metadata-blocks-over-lap-sb +null-out-kobject-during-sysfs-cleanup + #################################################### # unstable patches #################################################### diff --git a/timestamps b/timestamps index 0463047a..bb3f88fe 100755 --- a/timestamps +++ b/timestamps @@ -35,7 +35,6 @@ touch -d @1519013788 shutdown-eliminate-sleep touch -d @1519015518 use-shutdown-errcode touch -d @1519060973 jbd2-no-update-tail-after-abort touch -d @1519067807 fix-bitmap-init-jbd-conformance -touch -d @1519067867 stable-boundary touch -d @1519067887 jbd2-dont-double-bump-transaction-number touch -d @1519067887 jbd2-suppress-extra-newline-in-jbd2_debug touch -d @1519067887 journal-superblock-changes @@ -48,11 +47,13 @@ touch -d @1521733930 remove-EXT4_STATE_DIOREAD_LOCK-flag touch -d @1521734340 dont-complain-about-incorrect-features-when-probing touch -d @1522042370 use-generic_writepages-instead-of-__writepage-write_cache_pages touch -d @1522043043 fix-comments-in-ext4_swap_extents -touch -d @1522122572 series touch -d @1522122850 add-bitmap-block-validity-checks touch -d @1522348302 add-better-range-checking-for-xattr-value-sizes touch -d @1522374969 fail-unalloc-root-dir-in-ext4_iget touch -d @1522375831 always-load-checksum-driver touch -d @1522375835 dont-allow-rw-mounts-of-metadata-blocks-over-lap-sb -touch -d @1522375835 status -touch -d @1522376064 timestamps +touch -d @1522375895 stable-boundary +touch -d @1522382618 null-out-kobject-during-sysfs-cleanup +touch -d @1522382650 series +touch -d @1522382658 status +touch -d @1522383015 timestamps -- 2.11.4.GIT