Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62f75c2f authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Linus Torvalds
Browse files

[PATCH] dm: move idr_pre_get 



idr_pre_get() can sleep while allocating memory.

The next patch will change _minor_lock into a spinlock, so this patch moves
idr_pre_get() outside the lock in preparation.

[akpm: too late for 2.6.17 - suitable for 2.6.17.x after it has settled]

Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ba61fdd1

drivers/md/dm.c

+9 −14
Original line number Diff line number Diff line
@@ -766,6 +766,10 @@ static int specific_minor(struct mapped_device *md, unsigned int minor) 
	if (minor >= (1 << MINORBITS))

		return -EINVAL;



	r = idr_pre_get(&_minor_idr, GFP_KERNEL);

	if (!r)

		return -ENOMEM;



	mutex_lock(&_minor_lock);



	if (idr_find(&_minor_idr, minor)) {
@@ -773,16 +777,9 @@ static int specific_minor(struct mapped_device *md, unsigned int minor) 
		goto out;

	}



	r = idr_pre_get(&_minor_idr, GFP_KERNEL);

	if (!r) {

		r = -ENOMEM;

		goto out;

	}



	r = idr_get_new_above(&_minor_idr, MINOR_ALLOCED, minor, &m);

	if (r) {

	if (r)

		goto out;

	}



	if (m != minor) {

		idr_remove(&_minor_idr, m);
@@ -800,13 +797,11 @@ static int next_free_minor(struct mapped_device *md, unsigned int *minor) 
	int r;

	unsigned int m;



	mutex_lock(&_minor_lock);



	r = idr_pre_get(&_minor_idr, GFP_KERNEL);

	if (!r) {

		r = -ENOMEM;

		goto out;

	}

	if (!r)

		return -ENOMEM;



	mutex_lock(&_minor_lock);



	r = idr_get_new(&_minor_idr, MINOR_ALLOCED, &m);

	if (r) {