linux-stable.git/drivers/block/nbd.c, branch v3.5

Merge branch 'akpm' (Andrew's patch-bomb)

2012-03-29T00:19:28+00:00

Merge third batch of patches from Andrew Morton:
 - Some MM stragglers
 - core SMP library cleanups (on_each_cpu_mask)
 - Some IPI optimisations
 - kexec
 - kdump
 - IPMI
 - the radix-tree iterator work
 - various other misc bits.

 "That'll do for -rc1.  I still have ~10 patches for 3.4, will send
  those along when they've baked a little more."

* emailed from Andrew Morton : (35 commits)
  backlight: fix typo in tosa_lcd.c
  crc32: add help text for the algorithm select option
  mm: move hugepage test examples to tools/testing/selftests/vm
  mm: move slabinfo.c to tools/vm
  mm: move page-types.c from Documentation to tools/vm
  selftests/Makefile: make `run_tests' depend on `all'
  selftests: launch individual selftests from the main Makefile
  radix-tree: use iterators in find_get_pages* functions
  radix-tree: rewrite gang lookup using iterator
  radix-tree: introduce bit-optimized iterator
  fs/proc/namespaces.c: prevent crash when ns_entries[] is empty
  nbd: rename the nbd_device variable from lo to nbd
  pidns: add reboot_pid_ns() to handle the reboot syscall
  sysctl: use bitmap library functions
  ipmi: use locks on watchdog timeout set on reboot
  ipmi: simplify locking
  ipmi: fix message handling during panics
  ipmi: use a tasklet for handling received messages
  ipmi: increase KCS timeouts
  ipmi: decrease the IPMI message transaction time in interrupt mode
  ...

nbd: rename the nbd_device variable from lo to nbd

2012-03-29T00:14:37+00:00

rename the nbd_device variable from "lo" to "nbd", since "lo" is just a name
copied from loop.c.

Signed-off-by: Wanlong Gao 
Cc: Paul Clements 
Cc: Jens Axboe 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

Remove all #inclusions of asm/system.h

2012-03-28T17:30:03+00:00

Remove all #inclusions of asm/system.h preparatory to splitting and killing
it.  Performed with the following command:

perl -p -i -e 's!^#\s*include\s*.*\n!!' `grep -Irl '^#\s*include\s*' *`

Signed-off-by: David Howells

nbd-replace-some-printk-with-dev_warn-and-dev_info-checkpatch-fixes

2011-08-19T12:48:28+00:00

ERROR: code indent should use tabs where possible
#30: FILE: drivers/block/nbd.c:578:
+^I        dev_info(disk_to_dev(lo->disk), "NBD_DISCONNECT\n");$

total: 1 errors, 0 warnings, 35 lines checked

NOTE: whitespace errors detected, you may wish to use scripts/cleanpatch or
      scripts/cleanfile

./patches/nbd-replace-some-printk-with-dev_warn-and-dev_info.patch has style problems, please review.

If any of these errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.

Please run checkpatch prior to sending patches

Cc: Paul Clements 
Cc: WANG Cong 
Signed-off-by: Andrew Morton 
Signed-off-by: Jens Axboe

nbd: replace some printk with dev_warn() and dev_info()

2011-08-19T12:48:28+00:00

Signed-off-by: WANG Cong 
Cc: Paul Clements 
Signed-off-by: Andrew Morton 
Signed-off-by: Jens Axboe

nbd: lower the loglevel of an error message

2011-08-19T12:48:28+00:00

This is only an error, no need to use KERN_CRIT log level.

Signed-off-by: WANG Cong 
Cc: Paul Clements 
Signed-off-by: Andrew Morton 
Signed-off-by: Jens Axboe

nbd: replace printk KERN_ERR with dev_err()

2011-08-19T12:48:22+00:00

Signed-off-by: WANG Cong 
Cc: Paul Clements 
Signed-off-by: Andrew Morton 
Signed-off-by: Jens Axboe

nbd: replace sysfs_create_file() with device_create_file()

2011-08-19T12:48:21+00:00

Signed-off-by: WANG Cong 
Cc: Paul Clements 
Signed-off-by: Andrew Morton 
Signed-off-by: Jens Axboe

nbd: use task_pid_nr() to get current pid

2011-08-19T12:48:17+00:00

Signed-off-by: WANG Cong 
Cc: Paul Clements 
Signed-off-by: Andrew Morton 
Signed-off-by: Jens Axboe

nbd: adjust 'max_part' according to part_shift

2011-05-28T12:44:46+00:00

The 'max_part' parameter determines how many partitions are supported
on each nbd device. However the actual number can be changed to the
power of 2 minus 1 form during the module initialization as
alloc_disk() is called with (1 << part_shift) for some reason.

So adjust 'max_part' also at least for consistency with loop and brd.
It is exported via sysfs already, and a user should check this value
after module loading if [s]he wants to use that number correctly
(i.e. fdisk or something).

Signed-off-by: Namhyung Kim 
Cc: Laurent Vivier 
Cc: Paul Clements 
Signed-off-by: Jens Axboe