Commit 50f689af authored by Zhu Yanhai's avatar Zhu Yanhai Committed by Theodore Ts'o
Browse files

jbd2: move bdget out of critical section 



bdget() should not be called when we hold spinlocks since
it might sleep.

Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarZhu Yanhai <gaoyang.zyh@taobao.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 0ce790e7

fs/jbd2/journal.c

+2 −1
Original line number Diff line number Diff line
@@ -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);