jbd2: move bdget out of critical section

bdget() should not be called when we hold spinlocks since it might sleep. Reviewed-by: Jan Kara <[email protected]> Signed-off-by: Zhu Yanhai <[email protected]> Signed-off-by: "Theodore Ts'o" <[email protected]>
mna · Apr 4, 2011 · 50f689a · 50f689a
1 parent 0ce790e
commit 50f689a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
@@ -2413,10 +2413,12 @@ const char *jbd2_dev_to_name(dev_t device)
 	new_dev = kmalloc(sizeof(struct devname_cache), GFP_KERNEL);
 	if (!new_dev)
 		return "NODEV-ALLOCFAILURE"; /* Something non-NULL */
+	bd = bdget(device);
 	spin_lock(&devname_cache_lock);
 	if (devcache[i]) {
 		if (devcache[i]->device == device) {
 			kfree(new_dev);
+			bdput(bd);
 			ret = devcache[i]->devname;
 			spin_unlock(&devname_cache_lock);
 			return ret;
@@ -2425,7 +2427,6 @@ const char *jbd2_dev_to_name(dev_t device)
 	}
 	devcache[i] = new_dev;
 	devcache[i]->device = device;
-	bd = bdget(device);
 	if (bd) {
 		bdevname(bd, devcache[i]->devname);
 		bdput(bd);