Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932068AbZIUKHS (ORCPT ); Mon, 21 Sep 2009 06:07:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755842AbZIUKHP (ORCPT ); Mon, 21 Sep 2009 06:07:15 -0400 Received: from mail-bw0-f210.google.com ([209.85.218.210]:55866 "EHLO mail-bw0-f210.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755832AbZIUKHN (ORCPT ); Mon, 21 Sep 2009 06:07:13 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=Xv7LRwx0uPkOmJXIXodQqbLkkrsMowDbTuSne4gpnYpXB6HqISjkTauhtbswrOksZ6 69Hl1kNSDXK0lBzSJkTlQiaW+2cPLZTNFQhmsBdS4iZ10ARVv8AiEcAEvkuG9ygHzOmO PKKJZuYAVKLcpRkMgnrSqK0H2caBmFLFuiaD8= MIME-Version: 1.0 Date: Mon, 21 Sep 2009 12:07:16 +0200 Message-ID: Subject: [PATCH] Add missing blk_trace_remove_sysfs to be in pair with blk_trace_init_sysfs From: Zdenek Kabelac To: Linux Kernel Mailing List Cc: mbroz@redhat.com, lizf@cn.fujitsu.com, tytso@mit.edu, jens.axboe@oracle.com, mingo@elte.hu Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4028 Lines: 105 Subject: [PATCH] Add missing blk_trace_remove_sysfs to be in pair with blk_trace_init_sysfs From: Zdenek Kabelac Adds missing blk_trace_remove_sysfs() to be in pair with blk_trace_init_sysfs() introduced in commit 1d54ad6da9192fed5dd3b60224d9f2dfea0dcd82. Problem was noticed via kmemleak backtrace when some sysfs entries were note properly destroyed during device removal: unreferenced object 0xffff88001aa76640 (size 80): comm "lvcreate", pid 2120, jiffies 4294885144 hex dump (first 32 bytes): 01 00 00 00 00 00 00 00 f0 65 a7 1a 00 88 ff ff .........e...... 90 66 a7 1a 00 88 ff ff 86 1d 53 81 ff ff ff ff .f........S..... backtrace: [] kmemleak_alloc+0x26/0x60 [] kmem_cache_alloc+0x133/0x1c0 [] sysfs_new_dirent+0x41/0x120 [] sysfs_add_file_mode+0x3c/0xb0 [] internal_create_group+0xc1/0x1a0 [] sysfs_create_group+0x13/0x20 [] blk_trace_init_sysfs+0x14/0x20 [] blk_register_queue+0x3c/0xf0 [] add_disk+0x94/0x160 [] dm_create+0x598/0x6e0 [dm_mod] [] dev_create+0x51/0x350 [dm_mod] [] ctl_ioctl+0x1a3/0x240 [dm_mod] [] dm_compat_ctl_ioctl+0x12/0x20 [dm_mod] [] compat_sys_ioctl+0xcd/0x4f0 [] sysenter_dispatch+0x7/0x2c [] 0xffffffffffffffff Signed-off-by: Zdenek Kabelac --- block/blk-sysfs.c | 2 ++ include/linux/blktrace_api.h | 2 ++ kernel/trace/blktrace.c | 5 +++++ 3 files changed, 9 insertions(+), 0 deletions(-) diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index d3aa2aa..130b10c 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -447,6 +447,7 @@ int blk_register_queue(struct gendisk *disk) if (ret) { kobject_uevent(&q->kobj, KOBJ_REMOVE); kobject_del(&q->kobj); + blk_trace_remove_sysfs(disk_to_dev(disk)); return ret; } @@ -465,6 +466,7 @@ void blk_unregister_queue(struct gendisk *disk) kobject_uevent(&q->kobj, KOBJ_REMOVE); kobject_del(&q->kobj); + blk_trace_remove_sysfs(disk_to_dev(disk)); kobject_put(&disk_to_dev(disk)->kobj); } } diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h index 7e4350e..622939a 100644 --- a/include/linux/blktrace_api.h +++ b/include/linux/blktrace_api.h @@ -198,6 +198,7 @@ extern int blk_trace_setup(struct request_queue *q, char *name, dev_t dev, char __user *arg); extern int blk_trace_startstop(struct request_queue *q, int start); extern int blk_trace_remove(struct request_queue *q); +extern void blk_trace_remove_sysfs(struct device *dev); extern int blk_trace_init_sysfs(struct device *dev); extern struct attribute_group blk_trace_attr_group; @@ -211,6 +212,7 @@ extern struct attribute_group blk_trace_attr_group; # define blk_trace_startstop(q, start) (-ENOTTY) # define blk_trace_remove(q) (-ENOTTY) # define blk_add_trace_msg(q, fmt, ...) do { } while (0) +# define blk_trace_remove_sysfs(struct device *dev) do { } while (0) static inline int blk_trace_init_sysfs(struct device *dev) { return 0; diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index 7a34cb5..b5b8e35 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -1653,6 +1653,11 @@ int blk_trace_init_sysfs(struct device *dev) return sysfs_create_group(&dev->kobj, &blk_trace_attr_group); } +void blk_trace_remove_sysfs(struct device *dev) +{ + sysfs_remove_group(&dev->kobj, &blk_trace_attr_group); +} + #endif /* CONFIG_BLK_DEV_IO_TRACE */ #ifdef CONFIG_EVENT_TRACING -- 1.6.4.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/