Skip to contentSkip to conversation

fix for loop warning

GIT PULL Jens Axboe 3 participants 4 messages Oct 27, 2010 – Oct 28, 2010 Block layer

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

Hi Linus,

One-liner fix for a warning regression introduced with the loop changes pulled for 2.6.37-rc1

Please pull.

The following changes since commit 9db59aff3fb32b05a7e2464dd543de03b2b3cebc:

loop: Properly clear sysfs in autoclear mode (2010-10-26 22:13:27 -0600)

are available in the git repository at:

git://git.kernel.dk/linux-2.6-block.git for-linus

drivers/block/loop.c +1 -1
index 1e5284e..450c958 100644
@@ -1049,9 +1049,9 @@ static int loop_clr_fd(struct loop_device *lo, struct block_device *bdev)
 	if (bdev)
 		invalidate_bdev(bdev);
 	set_capacity(lo->lo_disk, 0);
-	loop_sysfs_exit(lo);
 	if (bdev) {
 		bd_set_size(bdev, 0);
+		loop_sysfs_exit(lo);
 		/* let user-space know about this change */
 		kobject_uevent(&disk_to_dev(bdev->bd_disk)->kobj, KOBJ_CHANGE);
 	}
Signature · 1 line
Jens Axboe
#1 lore raw
Quoted 2 lines · Jens Axboe

 git://git.kernel.dk/linux-2.6-block.git for-linus

"Already up-to-date."

Forgot to push?

Linus

author
#2 lore raw
In reply to Linus Torvalds
Quoted 7 lines · Linus Torvalds
Quoted 2 lines · Jens Axboe

git://git.kernel.dk/linux-2.6-block.git for-linus

"Already up-to-date."

Forgot to push?

Must have... The branch has now been updated with a few other pending patches. All pretty trivial and straight forward changes.

Please pull (again :-).

git://git.kernel.dk/linux-2.6-block.git for-linus

Andrew Morton (1):
drivers/block/aoe/aoeblk.c: ratelimit a warning printk

Geert Uytterhoeven (1):
drivers/block/z2ram.c: correct printing of sector_t

Mike Miller (1):
cciss: remove overlapping PCI IDs

Milan Broz (1):
loop: Properly clear sysfs in autoclear mode

Nicolas Kaiser (1):
drivers/block/drbd/drbd_main.c: fix error path

Tejun Heo (1):
aoe: don't use flush_scheduled_work()

Vasiliy Kulikov (1):
block: cciss: fix information leak to userland

 drivers/block/aoe/aoeblk.c     |    4 +++-
 drivers/block/aoe/aoedev.c     |    4 +---
 drivers/block/cciss.c          |   37 +------------------------------------
 drivers/block/drbd/drbd_main.c |    2 +-
 drivers/block/loop.c           |    2 +-
 drivers/block/z2ram.c          |    6 ++++--
 6 files changed, 11 insertions(+), 44 deletions(-)
Signature · 1 line
Jens Axboe