3.11.10.4 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <mpatocka@xxxxxxxxxx>
commit 1ddd641ddcfa46d719189468b6856e9b17381a61 upstream.
The comparison is always true and the compiler optimizes it out anyway.
Milan offered additional context relative to the original commit
784aae735d ("dm: add name and uuid to sysfs") which introduced the code:
"I think it is just relict of some experiments before I committed this
simple embedded sysfs kobj handling".
Signed-off-by: Mikulas Patocka <mpatocka@xxxxxxxxxx>
Acked-by: Milan Broz <gmazyland@xxxxxxxxx>
Signed-off-by: Mike Snitzer <snitzer@xxxxxxxxxx>
[ luis: 3.11.y prereq for:
- 2995fa7 "dm sysfs: fix a module unload race" ]
Signed-off-by: Luis Henriques <luis.henriques@xxxxxxxxxxxxx>
---
drivers/md/dm.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 0cc1449..267495c 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -2768,17 +2768,11 @@ struct kobject *dm_kobject(struct mapped_device *md)
return &md->kobj;
}
-/*
- * struct mapped_device should not be exported outside of dm.c
- * so use this check to verify that kobj is part of md structure
- */
struct mapped_device *dm_get_from_kobject(struct kobject *kobj)
{
struct mapped_device *md;
md = container_of(kobj, struct mapped_device, kobj);
- if (&md->kobj != kobj)
- return NULL;
if (test_bit(DMF_FREEING, &md->flags) ||
dm_deleting_md(md))
--
1.8.3.2
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html