Joe Perches
724ee626f3
drivers/block/floppy.c: remove unnecessary casting in fd_ioctl
...
Convert outparam to const void *.
Cast outparam to const char * for strlen().
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
0aad92cfea
drivers/block/floppy.c: remove misleading, used once FD_IOCTL_ALLOWED macro
...
Just code the test directly
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
712e1de43e
drivers/block/floppy.c: remove obfuscating CODE2SIZE macro
...
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
ded2863d09
drivers/block/floppy.c: add __func__ to debugt
...
Make debugt messages a little neater.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
7f2527174a
drivers/block/floppy.c: convert raw_cmd_copyin from while(1) to label: goto
...
Reduces indent.
Makes a bit more readable and intelligible.
Return value now at bottom of function.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
ce2f11fe78
drivers/block/floppy.c: remove some unnecessary casting
...
Remove char/void __user * use.
Remove kmalloc cast.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
1ebddd85a6
drivers/block/floppy.c: use %pf in logging messages
...
Print the function name not the pointer address where useful and possible
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
275176bc2a
drivers/block/floppy.c: use __func__ where appropriate
...
Add and use __func__ to is_alive.
Use __func__ in some DPRINTs.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
891eda80a5
drivers/block/floppy.c: DPRINT neatening
...
Move DPRINT macro definition above 1st use Consolidate a format string
(>80 columns) Add a newline to an unterminated message Comment neatened
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
1a23d13335
drivers/block/floppy.c: remove #define FLOPPY_SANITY_CHECK
...
The code could not be compiled without the #define, so just remove it and
the #ifdef/#endif lines.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
73507e6cd8
drivers/block/floppy.c: remove unnecessary argument from [__]reschedule_timeout
...
Prior to patch "drivers/block/floppy.c: Use pr_<level>" only
reschedule_timeout(,"request done"...) printed a numeric value after a
reschedule_timeout event message.
Restore that behavior and remove the now unnecessary argument.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
0da3132f90
drivers/block/floppy.c: unclutter redo_fd_request logic
...
Change for(;;) with continue; to label: goto label
Reduces indentation and adds a bit of clarity.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
416d8d2888
drivers/block/floppy.c: remove REPEAT macro
...
Macros with hidden flow changes aren't nice.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:30 -08:00
Joe Perches
15b2630c58
drivers/block/floppy.c: remove unnecessary return and braces
...
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:30 -08:00
Joe Perches
57584c5a38
drivers/block/floppy.c: add function is_ready_state
...
Used a couple of times, might simplify the code a bit.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:30 -08:00
Joe Perches
29f1c7848f
drivers/block/floppy.c: convert int initialising to bool initialized
...
Don't initialize initialized either. Default is false.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:30 -08:00
Joe Perches
4d18ef09df
drivers/block/floppy.c: remove #define DEVICE_NAME "floppy"
...
Use it directly in the one place it's used.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:30 -08:00
Joe Perches
c529730a98
drivers/block/floppy.c: move leading && and || to preceding line
...
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:30 -08:00
Joe Perches
74f63f469e
drivers/block/floppy.c: convert int 1/0 to bool true/false
...
Various functions use int where bool is appropriate
lock_fdc, wait_til_done, poll_drive, user_reset_fdc
Convert to bool.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:30 -08:00
Joe Perches
55eee80c62
drivers/block/floppy.c: remove macros CALL, WAIT and IWAIT
...
Obfuscating macros with embedded returns are not nice
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:30 -08:00
Joe Perches
86b12b48a2
drivers/block/floppy.c: remove [_]COPYIN [_]COPYOUT and ECALL macros
...
Remove these obfuscating macros with hidden returns
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:30 -08:00
Joe Perches
4575b55281
drivers/block/floppy.c: remove most uses of CALL and ECALL macros
...
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:30 -08:00
Joe Perches
e029853612
drivers/block/floppy.c: remove [U]CLEARF, [U]SETF, and [U]TESTF macros
...
Use clear_bit, set_bit, and test_bit functions directly
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:30 -08:00
Joe Perches
87f530d8f1
drivers/block/floppy.c: add debug_dcl(...) macro
...
Converted #ifdef DCL_DEBUG if (test) DPRINTK(...); #endif
to debug_dcl(test, ...);
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:30 -08:00
Joe Perches
52a0d61f64
drivers/block/floppy.c: remove macro LOCK_FDC
...
Macros with hidden returns aren't nice.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:29 -08:00
Joe Perches
a0a52d67de
drivers/block/floppy.c: remove a few spaces from function casts
...
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:29 -08:00
Joe Perches
da27365342
drivers/block/floppy.c: remove IN/OUT macros, indent switch/case
...
Remove ugly IN/OUT macros, use direct case and code
Add missing semicolon after ECALL
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:29 -08:00
Joe Perches
96534f1dd5
drivers/block/floppy.c: indent a comment
...
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:29 -08:00
Joe Perches
b87c9e0a88
drivers/block/floppy.c: remove CLEARSTRUCT macro, use memset
...
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:29 -08:00
Joe Perches
bb57f0c662
drivers/block/floppy.c: comment neatening and remove naked ;
...
Spacing, column alignment and a for loop with
a naked semicolon converted to an assign and while
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:29 -08:00
Joe Perches
2300f90e31
drivers/block/floppy.c: remove LAST_OUT macro
...
Macros with hidden returns are not nice.
Convert the 2 uses to use direct code.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:29 -08:00
Joe Perches
d7b2b2ecd8
drivers/block/floppy.c: hoist assigns from if()s, neatening
...
Move assigns above if()s
Remove unnecessary parentheses from returns
Use a temporary for a duplicated test
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:29 -08:00
Joe Perches
045f983630
drivers/block/floppy.c: remove used once CHECK_READY macro
...
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:29 -08:00
Joe Perches
a81ee54471
drivers/block/floppy.c: remove unnecessary braces
...
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:29 -08:00
Joe Perches
b46df356de
drivers/block/floppy.c: use pr_<level>
...
Convert bare printk to pr_info and pr_cont
Convert printk(KERN_ERR to pr_err
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:29 -08:00
Joe Perches
48c8cee61f
drivers/block/floppy.c: #define space and column neatening
...
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:29 -08:00
Joe Perches
d49375434e
drivers/block/floppy.c: convert some #include <asm/ to #include <linux/
...
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:28 -08:00
Wu Fengguang
718a38211b
mm: introduce dump_page() and print symbolic flag names
...
- introduce dump_page() to print the page info for debugging some error
condition.
- convert three mm users: bad_page(), print_bad_pte() and memory offline
failure.
- print an extra field: the symbolic names of page->flags
Example dump_page() output:
[ 157.521694] page:ffffea0000a7cba8 count:2 mapcount:1 mapping:ffff88001c901791 index:0x147
[ 157.525570] page flags: 0x100000000100068(uptodate|lru|active|swapbacked)
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com >
Cc: Ingo Molnar <mingo@elte.hu >
Cc: Alex Chiang <achiang@hp.com >
Cc: Rik van Riel <riel@redhat.com >
Cc: Andi Kleen <andi@firstfloor.org >
Cc: Mel Gorman <mel@linux.vnet.ibm.com >
Cc: Christoph Lameter <cl@linux-foundation.org >
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:28 -08:00
Julia Lawall
9b3a6549b2
drivers/scsi/ses.c: eliminate double free
...
The few lines below the kfree of hdr_buf may go to the label err_free
which will also free hdr_buf. The most straightforward solution seems to
be to just move the kfree of hdr_buf after these gotos.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/ )
// <smpl>
@r@
identifier E;
expression E1;
iterator I;
statement S;
@@
*kfree(E);
... when != E = E1
when != I(E,...) S
when != &E
*kfree(E);
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk >
Cc: James Bottomley <James.Bottomley@HansenPartnership.com >
Cc: <stable@kernel.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:28 -08:00
Thomas Gleixner
2d30a1f631
mm: do not iterate over NR_CPUS in __zone_pcp_update()
...
__zone_pcp_update() iterates over NR_CPUS instead of limiting the access
to the possible cpus. This might result in access to uninitialized areas
as the per cpu allocator only populates the per cpu memory for possible
cpus.
This problem was created as a result of the dynamic allocation of pagesets
from percpu memory that went in during the merge window - commit
99dcc3e5a9
("this_cpu: Page allocator
conversion").
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi >
Acked-by: Tejun Heo <tj@kernel.org >
Acked-by: Christoph Lameter <cl@linux-foundation.org >
Acked-by: Mel Gorman <mel@csn.ul.ie >
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:28 -08:00
KAMEZAWA Hiroyuki
53bddb4e9f
nommu: fix build breakage
...
Commit 34e55232e5
("mm: avoid false sharing
of mm_counter") added sync_mm_rss() for syncing loosely accounted rss
counters. It's for CONFIG_MMU but sync_mm_rss is called even in NOMMU
enviroment (kerne/exit.c, fs/exec.c). Above commit doesn't handle it
well.
This patch changes
SPLIT_RSS_COUNTING depends on SPLIT_PTLOCKS && CONFIG_MMU
And for avoid unnecessary function calls, sync_mm_rss changed to be inlined
noop function in header file.
Reported-by: David Howells <dhowells@redhat.com >
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com >
Signed-off-by: Mike Frysinger <vapier@gentoo.org >
Signed-off-by: Michal Simek <monstr@monstr.eu >
Signed-off-by: David Howells <dhowells@redhat.com >
Cc: Greg Ungerer <gerg@snapgear.com >
Cc: Geert Uytterhoeven <geert@linux-m68k.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:28 -08:00
Mike Frysinger
936ed49a54
MAINTAINERS: add bfin_sdh driver
...
Signed-off-by: Mike Frysinger <vapier@gentoo.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:28 -08:00
Albert Herranz
516a824222
sdio: recognize io card without powercycle
...
SDIO Simplified Specification V2.00 states that it is strongly recommended
that the host executes either a power reset or issues a CMD52 (I/O Reset)
to re-initialize an I/O only card or the I/O portion of a combo card.
Additionally, the CMD52 must be issued first because it cannot be issued
after a CMD0.
With this patch the Nintendo Wii SDIO-based WLAN card is detected after a
system reset, without requiring a complete system powercycle.
Signed-off-by: Albert Herranz <albert_herranz@yahoo.es >
Cc: <linux-mmc@vger.kernel.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:28 -08:00
Uwe Kleine-König
d0ab4a4d50
rtc/hctosys: only claim the RTC provided the system time if it did
...
Without this patch /sys/class/rtc/$CONFIG_RTC_HCTOSYS_DEVICE/hctosys
contains a 1 (meaning "This rtc was used to initialize the system clock")
even if reading the time at bootup failed.
Moreover change error handling in rtc_hctosys() to use goto and so reduce
the indention level.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de >
Cc: Paul Gortmaker <p_gortmaker@yahoo.com >
Acked-by: Alessandro Zummo <a.zummo@towertech.it >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:28 -08:00
Richard Kennedy
019b4d123a
fs: buffer_head: remove kmem_cache constructor to reduce memory usage under slub
...
When using slub, having a kmem_cache constructor forces slub to add a free
pointer to the size of the cached object, which can have a significant
impact to the number of small objects that can fit into a slab.
As buffer_head is relatively small and we can have large numbers of them,
removing the constructor is a definite win.
On x86_64 removing the constructor gives me 39 objects/slab, 3 more than
without the patch. And on x86_32 73 objects/slab, which is 9 more.
As alloc_buffer_head() already initializes each new object there is very
little difference in actual code run.
Signed-off-by: Richard Kennedy <richard@rsk.demon.co.uk >
Cc: Alexander Viro <viro@zeniv.linux.org.uk >
Cc: Jens Axboe <jens.axboe@oracle.com >
Acked-by: Nick Piggin <npiggin@suse.de >
Cc: "Theodore Ts'o" <tytso@mit.edu >
Reviewed-by: Rik van Riel <riel@redhat.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:27 -08:00
Joe Perches
03affdef4f
fs/ocfs2/cluster/tcp.c: remove use of NIPQUAD, use %pI4
...
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Mark Fasheh <mfasheh@suse.com >
Acked-by: Joel Becker <joel.becker@oracle.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:27 -08:00
Roland Dreier
0636b33c5f
Merge branches 'cxgb3', 'ipoib', 'misc' and 'nes' into for-next
2010-03-12 10:54:20 -08:00
Chien Tung
a72042c08a
RDMA/nes: Fix CX4 link problem in back-to-back configuration
...
Commit 09124e19
("RDMA/nes: Add support for KR device id 0x0110") took
out too much code and broke CX4 link detection in back-to-back
configuration. Put back the code that does the link check.
Signed-off-by: Chien Tung <chien.tin.tung@intel.com >
Signed-off-by: Roland Dreier <rolandd@cisco.com >
2010-03-12 10:54:11 -08:00
Stanislaw Gruszka
15365c108e
posix-cpu-timers: Reset expire cache when no timer is running
...
When a process deletes cpu timer or a timer expires we do not clear
the expiration cache sig->cputimer_expires.
As a result the fastpath_timer_check() which prevents us to loop over
all threads in case no timer is active is not working and we run the
slow path needlessly on every tick.
Zero sig->cputimer_expires in stop_process_timers().
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com >
Cc: Ingo Molnar <mingo@elte.hu >
Cc: Oleg Nesterov <oleg@redhat.com >
Cc: Peter Zijlstra <peterz@infradead.org >
Cc: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com >
Cc: Spencer Candland <spencer@bluehost.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
2010-03-12 19:12:18 +01:00
Andrew Morton
829b6c1ef4
timer stats: Fix del_timer_sync() and try_to_del_timer_sync()
...
These functions forgot to run timer_stats_timer_clear_start_info(). It's
unobvious what effect this has and whether it matters much - we won't be
printing it out anyway if the timer's detached.
Untested, just an Ingo trollpatch.
[ Nevertheless correct - tglx ]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Cc: Ingo Molnar <mingo@elte.hu >
Cc: johnstul@us.ibm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
2010-03-12 19:11:29 +01:00