From patchwork Fri Dec  3 19:54:05 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jonthan Brassow <jbrassow@redhat.com>
X-Patchwork-Id: 378901
Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB3Ju9s1007616
	for <patchwork-dm-devel@patchwork.kernel.org>;
	Fri, 3 Dec 2010 19:56:29 GMT
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
	(lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oB3JsCNi009413;
	Fri, 3 Dec 2010 14:54:13 -0500
Received: from int-mx10.intmail.prod.int.phx2.redhat.com
	(int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id oB3JsB1A000753 for <dm-devel@listman.util.phx.redhat.com>;
	Fri, 3 Dec 2010 14:54:11 -0500
Received: from hydrogen.msp.redhat.com (hydrogen.msp.redhat.com [10.15.80.1])
	by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with
	ESMTP id oB3Js52d025014
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <dm-devel@redhat.com>; Fri, 3 Dec 2010 14:54:06 -0500
Received: from hydrogen.msp.redhat.com ([127.0.0.1])
	by hydrogen.msp.redhat.com (8.14.1/8.14.1) with ESMTP id
	oB3Js5mx002914; Fri, 3 Dec 2010 13:54:05 -0600
Received: (from jbrassow@localhost)
	by hydrogen.msp.redhat.com (8.14.1/8.14.1/Submit) id oB3Js5Kl002913;
	Fri, 3 Dec 2010 13:54:05 -0600
Date: Fri, 3 Dec 2010 13:54:05 -0600
From: Jonathan Brassow <jbrassow@redhat.com>
Message-Id: <201012031954.oB3Js5Kl002913@hydrogen.msp.redhat.com>
To: dm-devel@redhat.com
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
X-loop: dm-devel@redhat.com
Subject: [dm-devel] [PATCH 3 of 15] md fix null pointer deref
X-BeenThere: dm-devel@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
Reply-To: device-mapper development <dm-devel@redhat.com>
List-Id: device-mapper development <dm-devel.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/dm-devel>,
	<mailto:dm-devel-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/dm-devel>
List-Post: <mailto:dm-devel@redhat.com>
List-Help: <mailto:dm-devel-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/dm-devel>,
	<mailto:dm-devel-request@redhat.com?subject=subscribe>
MIME-Version: 1.0
Sender: dm-devel-bounces@redhat.com
Errors-To: dm-devel-bounces@redhat.com
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Fri, 03 Dec 2010 19:56:31 +0000 (UTC)


Index: linux-2.6/drivers/md/md.c
===================================================================
--- linux-2.6.orig/drivers/md/md.c
+++ linux-2.6/drivers/md/md.c
@@ -7309,6 +7309,8 @@ static int __init md_init(void)
 	raid_table_header = register_sysctl_table(raid_root_table);
 
 	md_geninit();
+	if (start_dirty_degraded)
+		printk(KERN_INFO "md: start_dirty_degraded set\n");
 	return 0;
 
 err_mdp:
Index: linux-2.6/drivers/md/raid5.c
===================================================================
--- linux-2.6.orig/drivers/md/raid5.c
+++ linux-2.6/drivers/md/raid5.c
@@ -5339,7 +5339,7 @@ static int raid5_spare_active(mddev_t *m
 		    && !test_bit(Faulty, &tmp->rdev->flags)
 		    && !test_and_set_bit(In_sync, &tmp->rdev->flags)) {
 			count++;
-			sysfs_notify_dirent(tmp->rdev->sysfs_state);
+			sysfs_notify_dirent_safe(tmp->rdev->sysfs_state);
 		}
 	}
 	spin_lock_irqsave(&conf->device_lock, flags);