linux.git/drivers/block/floppy.c, branch v3.7-rc5

floppy: remove dr, reuse drive on do_floppy_init

2012-10-30T07:36:07+00:00

This is a small cleanup, that also may turn error handling of
unitialized disks more readable. We don't need a separate variable to
track allocated disks, remove dr and reuse drive variable instead.

Signed-off-by: Herton Ronaldo Krzesinski 
Signed-off-by: Jiri Kosina 
Signed-off-by: Jens Axboe

floppy: use common function to check if floppies can be registered

2012-10-30T07:34:25+00:00

The same checks to see if a drive can be or is registered are
repeated through the code, factor out the checks in a common function
and replace the repeated checks with it.

Signed-off-by: Herton Ronaldo Krzesinski 
Signed-off-by: Jiri Kosina 
Signed-off-by: Jens Axboe

floppy: properly handle failure on add_disk loop

2012-10-30T07:34:25+00:00

On floppy initialization, if something failed inside the loop we call
add_disk, there was no cleanup of previous iterations in the error
handling.

Cc: stable@vger.kernel.org
Signed-off-by: Herton Ronaldo Krzesinski 
Signed-off-by: Jiri Kosina 
Signed-off-by: Jens Axboe

floppy: do put_disk on current dr if blk_init_queue fails

2012-10-30T07:34:25+00:00

If blk_init_queue fails, we do not call put_disk on the current dr
(dr is decremented first in the error handling loop).

Cc: stable@vger.kernel.org
Reviewed-by: Ben Hutchings 
Signed-off-by: Herton Ronaldo Krzesinski 
Signed-off-by: Jiri Kosina 
Signed-off-by: Jens Axboe

floppy: don't call alloc_ordered_workqueue inside the alloc_disk loop

2012-10-30T07:34:24+00:00

Since commit 070ad7e ("floppy: convert to delayed work and single-thread
wq"), we end up calling alloc_ordered_workqueue multiple times inside
the loop, which shouldn't be intended. Besides the leak, other side
effect in the current code is if blk_init_queue fails, we would end up
calling unregister_blkdev even if we didn't call yet register_blkdev.

Just moved the allocation of floppy_wq before the loop, and adjusted the
code accordingly.

Cc: stable@vger.kernel.org # 3.5+
Acked-by: Vivek Goyal 
Reviewed-by: Ben Hutchings 
Signed-off-by: Herton Ronaldo Krzesinski 
Signed-off-by: Jiri Kosina 
Signed-off-by: Jens Axboe

workqueue: deprecate __cancel_delayed_work()

2012-08-21T20:18:24+00:00

Now that cancel_delayed_work() can be safely called from IRQ handlers,
there's no reason to use __cancel_delayed_work().  Use
cancel_delayed_work() instead of __cancel_delayed_work() and mark the
latter deprecated.

Signed-off-by: Tejun Heo 
Acked-by: Jens Axboe 
Cc: Jiri Kosina 
Cc: Roland Dreier 
Cc: Tomi Valkeinen

workqueue: use mod_delayed_work() instead of __cancel + queue

2012-08-21T20:18:24+00:00

Now that mod_delayed_work() is safe to call from IRQ handlers,
__cancel_delayed_work() followed by queue_delayed_work() can be
replaced with mod_delayed_work().

Most conversions are straight-forward except for the following.

* net/core/link_watch.c: linkwatch_schedule_work() was doing a quite
  elaborate dancing around its delayed_work.  Collapse it such that
  linkwatch_work is queued for immediate execution if LW_URGENT and
  existing timer is kept otherwise.

Signed-off-by: Tejun Heo 
Cc: "David S. Miller" 
Cc: Tomi Valkeinen

Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy into for-3.6/drivers

2012-07-31T09:47:36+00:00

floppy: remove duplicated flag FD_RAW_NEED_DISK

2012-07-31T09:38:39+00:00

Fix coccinelle warning (without behavior change):

drivers/block/floppy.c:2518:32-48: duplicated argument to & or |

Signed-off-by: Fengguang Wu 
Signed-off-by: Jiri Kosina

Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-3.6/drivers

2012-07-30T07:03:10+00:00