02 Oct, 2009
27 commits
-
Signed-off-by: Philipp Reisner
Signed-off-by: Lars Ellenberg -
prepare_discard_fn() was being called in a place where memory allocation
was effectively impossible. This makes it inappropriate for all but
the most trivial translations of Linux's DISCARD operation to the block
command set. Additionally adding a payload there makes the ownership
of the bio backing unclear as it's now allocated by the device driver
and not the submitter as usual.It is replaced with QUEUE_FLAG_DISCARD which is used to indicate whether
the queue supports discard operations or not. blkdev_issue_discard now
allocates a one-page, sector-length payload which is the right thing
for the common ATA and SCSI implementations.The mtd implementation of prepare_discard_fn() is replaced with simply
checking for the request being a discard.Largely based on a previous patch from Matthew Wilcox
which did the prepare_discard_fn but not the different payload allocation
yet.Signed-off-by: Christoph Hellwig
-
Fix these build errors when CONFIG_PROC_FS is not set:
drivers/block/cciss.c: In function 'cciss_show_raid_level':
drivers/block/cciss.c:623: error: 'RAID_UNKNOWN' undeclared (first use in this function)
drivers/block/cciss.c:626: error: 'raid_label' undeclared (first use in this function)
drivers/block/cciss.c: In function 'cciss_geometry_inquiry':
drivers/block/cciss.c:2696: error: 'RAID_UNKNOWN' undeclared (first use in this function)Signed-off-by: Alexander Beregalov
Signed-off-by: Jens Axboe -
Signed-off-by: Jens Axboe
-
cciss: Dynamically allocate the drive_info_struct for each logical drive.
This reduces the size of the per-hba ctlr_info structure from 106936
bytes to 8132 bytes. That's on 32-bit systems. On 64-bit systems, the
improvement is even bigger. Without this, the ctlr_info struct is so big
that the driver won't even load on a 64 bit system if CISS_MAX_LUN was
at it's current setting of 1024 logical drives.Signed-off-by: Stephen M. Cameron
Signed-off-by: Jens Axboe -
Add usage_count attribute to each logical drive at
/sys/devices//ccissX/cXdY/usage_count for controller X,
logical drive Y. The usage count is the number of times
the device has currently been opened.Signed-off-by: Stephen M. Cameron
Signed-off-by: Jens Axboe -
and change get rid of some magic numbers in raid lavel decoding.
Add raid_level attribute to each logical drive at
/sys/devices//ccissX/cXdY/raid_level for controller X,
logical drive YSigned-off-by: Stephen M. Cameron
Signed-off-by: Jens Axboe -
cciss: fix some magic numbers in the raid-level decoding
Signed-off-by: Stephen M. Cameron
Signed-off-by: Jens Axboe -
Add lunid attribute to each logical drive at
/sys/devices//ccissX/cXdY/lunid for controller X,
logical drive YSigned-off-by: Stephen M. Cameron
Signed-off-by: Jens Axboe -
Don't check h->busy_initializing in cciss_open(). Open won't be
called before things are ready, but h->busy_initializing won't be
unset until after the initial rebuild_lun_table is finished. But,
to read the partitions, cciss_open will be called for each logical
drive during rebuild_lun_table. If cciss_open checks h->busy_initializing,
then the reading of the partition information during the initial
rebuild_lun_table will fail, which is especially bad news if it
happens to be your boot device.Signed-off-by: Stephen M. Cameron
Signed-off-by: Jens Axboe -
Preserve all 8 bytes of the LunID field returned
by CCISS_REPORT_LOGICAL instead of only saving 4 bytes.
This fixes a bug with logical volume addressing encountered on
an MSA2012.Signed-off-by: Stephen M. Cameron
Signed-off-by: Jens Axboe -
Silence noisy per-disk messages output by cciss_read_capacity
Signed-off-by: Stephen M. Cameron
Signed-off-by: Jens Axboe -
Fix bug that free_hba was calling put_disk for all gendisk[]
pointers -- all 1024 of them -- regardless of whether the were
used or not (NULL). This bug could cause rmmod to oops if logical
drives had been deleted during the driver's lifetime.Signed-off-by: Stephen M. Cameron
Signed-off-by: Jens Axboe -
When rebuild_lun_table is reached via sysfs, the usage count that
is checked prior to messing with c0d0 has different constraints
(must be zero) than if rebuild_lun_table is reached via ioctl
(must be one.) Fix rebuild_lun_table to take that into account.Signed-off-by: Stephen M. Cameron
Signed-off-by: Jens Axboe -
When removing a logical drive, clear all the information that is
now exposed by sysfs (e.g. vendor, model, serial number.)Signed-off-by: Stephen M. Cameron
Signed-off-by: Jens Axboe -
For c0dx where x is not 0, we handle deletion and addition simply,
but for c0d0, there is the special case that even when there's no
disk, the device node exists so that the controller may be accessed.
So, for c0d0, we only create the sysfs entries once, when a controller
is added, and only remove them once, when a controller is being
taken down.Signed-off-by: Stephen M. Cameron
Signed-off-by: Jens Axboe -
Handle cases when cciss_add_disk fails.
Signed-off-by: Stephen M. Cameron
Signed-off-by: Jens Axboe -
Handle failure of blk_init_queue gracefully in cciss_add_disk.
Signed-off-by: Stephen M. Cameron
Signed-off-by: Jens Axboe -
Rearrange logical drive sysfs code to make the "changing a disk" path work.
Signed-off-by: Stephen M. Cameron
Signed-off-by: Jens Axboe -
Dynamically allocate struct device for each logical drive as needed
instead of allocating the maximum we would ever need at driver init time.Signed-off-by: Stephen M. Cameron
Signed-off-by: Jens Axboe -
Remove some unused code in rebuild_lun_table()
Signed-off-by: Stephen M. Cameron
Signed-off-by: Jens Axboe -
Added /sys/bus/pci/devices//ccissX/rescan sysfs entry used
to kick off a rescan that discovers logical drive topology changes.Signed-off-by: Andrew Patterson
Signed-off-by: Stephen M. Cameron
Acked-by: Mike Miller
Signed-off-by: Jens Axboe -
Replace the use of one scan kthread per controller with one per driver.
Use a queue to hold a list of controllers that need to be rescanned with
routines to add and remove controllers from the queue.Fix locking and completion handling to prevent a hang during rmmod.
Signed-off-by: Andrew Patterson
Signed-off-by: Stephen M. Cameron
Acked-by: Mike Miller
Signed-off-by: Jens Axboe -
Sysfs entries for logical drives need to be removed when a drive is
deleted during driver cleanup.Signed-off-by: Andrew Patterson
Signed-off-by: Stephen M. Cameron
Acked-by: Mike Miller
Signed-off-by: Jens Axboe -
Change schedule_timeout() parameter to not be specific to HZ=1000.
Signed-off-by: Randy Dunlap
Acked-by: Mike Miller
Cc: Marcin Slusarz
Cc: "Cameron, Steve"
Signed-off-by: Andrew Morton
Signed-off-by: Jens Axboe -
Signed-off-by: Alexey Dobriyan
Cc: Yang Hongyang
Cc: Tejun Heo
Signed-off-by: Andrew Morton
Signed-off-by: Jens Axboe -
Signed-off-by: Alexey Dobriyan
Cc: Chirag Kantharia
Cc: Tejun Heo
Cc: Grant Likely
Signed-off-by: Andrew Morton
Signed-off-by: Jens Axboe
28 Sep, 2009
3 commits
-
The following commit made console open fails while booting:
commit b50989dc444599c8b21edc23536fc305f4e9b7d5
Author: Alan Cox
Date: Sat Sep 19 13:13:22 2009 -0700tty: make the kref destructor occur asynchronously
Due to tty release routines run in a workqueue now, error like the
following will be reported while booting:INIT open /dev/console Input/output error
It also causes hibernation regression to appear as reported at
http://bugzilla.kernel.org/show_bug.cgi?id=14229The reason is that now there's latency issue with closing, but when
we open a "closing not finished" tty, -EIO will be returned.Fix it as per the following Alan's suggestion:
Fun but it's actually not a bug and the fix is wrong in itself as
the port may be closing but not yet being destructed, in which case
it seems to do the wrong thing. Opening a tty that is closing (and
could be closing for long periods) is supposed to return -EIO.I suspect a better way to deal with this and keep the old console
timing is to split tty->shutdown into two functions.tty->shutdown() - called synchronously just before we dump the tty
onto the waitqueue for destructiontty->cleanup() - called when the destructor runs.
We would then do the shutdown part which can occur in IRQ context
fine, before queueing the rest of the release (from tty->magic = 0
... the end) to occur asynchronouslyThe USB update in -next would then need a call like
if (tty->cleanup)
tty->cleanup(tty);at the top of the async function and the USB shutdown to be split
between shutdown and cleanup as the USB resource cleanup and final
tidy cannot occur synchronously as it needs to sleep.In other words the logic becomes
final kref put
make object unfindableasync
clean it upSigned-off-by: Dave Young
[ rjw: Rebased on top of 2.6.31-git, reworked the changelog. ]
Signed-off-by: "Rafael J. Wysocki"
[ Changed serial naming to match new rules, dropped tty_shutdown as per
comments from Alan Stern - Linus ]
Signed-off-by: Linus Torvalds -
Commit 3d5b6fb47a8e68fa311ca2c3447e7f8a7c3a9cf3 ("ACPI: Kill overly
verbose "power state" log messages") removed the actual use of this
variable, but didn't remove the variable itself, resulting in build
warnings likedrivers/acpi/processor_idle.c: In function ‘acpi_processor_power_init’:
drivers/acpi/processor_idle.c:1169: warning: unused variable ‘i’Just get rid of the now unused variable.
Signed-off-by: Linus Torvalds
-
* mark struct vm_area_struct::vm_ops as const
* mark vm_ops in AGP codeBut leave TTM code alone, something is fishy there with global vm_ops
being used.Signed-off-by: Alexey Dobriyan
Signed-off-by: Linus Torvalds
27 Sep, 2009
8 commits
-
I was recently lucky enough to get a 64-CPU system, so my kernel log
ends up with 64 lines like:ACPI: CPU0 (power states: C1[C1] C2[C3])
This is pretty useless clutter because this info is already available
after boot from both /sys/devices/system/cpu/cpu*/cpuidle/state?/ as
well as /proc/acpi/processor/CPU*/power.So just delete the code that prints the C-states in processor_idle.c.
Signed-off-by: Roland Dreier
Signed-off-by: Len Brown -
The message "ACPI: Device needs an ACPI driver" is misleading. The
device _may_ need an ACPI driver, if the BIOS implemented a custom
API for the device in question (which, AFAIK, can't be checked.) If
not, then either a generic ACPI driver may be used (for example
"thermal"), or nothing can be done (other than a white list).I propose to reword the message to:
ACPI: If an ACPI driver is available for this device, you should use
it instead of the native driverwhich I think is more correct. Comments and suggestions welcome.
I also added a message warning about possible problems and system
instability when users pass acpi_enforce_resources=lax, as suggested
by Len.Signed-off-by: Jean Delvare
Cc: Thomas Renninger
Cc: Alan Jenkins
Signed-off-by: Len Brown -
Fix this problem when CONFIG_THINKPAD_ACPI_HOTKEY_POLL is undefined:
CHECK drivers/platform/x86/thinkpad_acpi.c
drivers/platform/x86/thinkpad_acpi.c:1968:21: error: not an lvalue
CC [M] drivers/platform/x86/thinkpad_acpi.o
drivers/platform/x86/thinkpad_acpi.c: In function 'tpacpi_hotkey_driver_mask_set':
drivers/platform/x86/thinkpad_acpi.c:1968: error: lvalue required as left operand of assignmentReported-by: Noah Dain
Reported-by: Audrius Kazukauskas
Signed-off-by: Henrique de Moraes Holschuh
Signed-off-by: Len Brown -
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
leds: move leds-clevo-mail's probe function to .devinit.text
leds: Fix indentation in LEDS_LP3944 Kconfig entry
leds: Fix LED names
leds: Fix leds-pca9532 whitespace issues
leds: fix coding style in worker thread code for ledtrig-gpio.
leds: gpio-leds: fix typographics fault
leds: Add WM831x status LED driver -
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
backlight: new driver for ADP5520/ADP5501 MFD PMICs
backlight: extend event support to also support poll()
backlight/eeepc-laptop: Update the backlight state when we change brightness
backlight/acpi: Update the backlight state when we change brightness
backlight: Allow drivers to update the core, and generate events on changes
backlight: switch to da903x driver to dev_pm_ops
backlight: Add support for the Avionic Design Xanthos backlight device.
backlight: spi driver for LMS283GF05 LCD
backlight: move hp680-bl's probe function to .devinit.text
backlight: Add support for new Apple machines.
backlight: mbp_nvidia_bl: add support for MacBookAir 1,1
backlight: Add WM831x backlight driverTrivial conflicts due to '#ifdef CONFIG_PM' differences in
drivers/video/backlight/da903x_bl.c -
* remove asm/atomic.h inclusion from kref.h -- not needed, linux/types.h
is enough for atomic_t
* remove linux/kref.h inclusion from files which do not need it.Signed-off-by: Alexey Dobriyan
Signed-off-by: Linus Torvalds -
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (32 commits)
ACPI: i2c-scmi: don't use acpi_device_uid()
ACPI: simplify building device HID/CID list
ACPI: remove acpi_device_uid() and related stuff
ACPI: remove acpi_device.flags.hardware_id
ACPI: remove acpi_device.flags.compatible_ids
ACPI: maintain a single list of _HID and _CID IDs
ACPI: make sure every acpi_device has an ID
ACPI: use acpi_device_hid() when possible
ACPI: fix synthetic HID for \_SB_
ACPI: handle re-enumeration, when acpi_devices might already exist
ACPI: factor out device type and status checking
ACPI: add acpi_bus_get_status_handle()
ACPI: use acpi_walk_namespace() to enumerate devices
ACPI: identify device tree root by null parent pointer, not ACPI_BUS_TYPE
ACPI: enumerate namespace before adding functional fixed hardware devices
ACPI: convert acpi_bus_scan() to operate on an acpi_handle
ACPI: add acpi_bus_get_parent() and remove "parent" arguments
ACPI: remove unnecessary argument checking
ACPI: remove redundant "type" arguments
ACPI: remove acpi_device_set_context() "type" argument
... -
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
at91_can: Forgotten git 'add' of at91_can.c
TI Davinci EMAC: Fix in vector definition for EMAC_VERSION_2
ax25: Fix ax25_cb refcounting in ax25_ctl_ioctl
virtio_net: Check for room in the vq before adding buffer
virtio_net: avoid (most) NETDEV_TX_BUSY by stopping queue early.
virtio_net: formalize skb_vnet_hdr
virtio_net: don't free buffers in xmit ring
virtio_net: return NETDEV_TX_BUSY instead of queueing an extra skb.
virtio_net: skb_orphan() and nf_reset() in xmit path.
26 Sep, 2009
2 commits
-
Signed-off-by: Michael Hennerich
Signed-off-by: Bryan Wu
Signed-off-by: Mike Frysinger
Signed-off-by: Richard Purdie -
Extend the backlight event support to also allow the use of
poll()/select() on actual_brightness.We already have the entire event hookup anyway, adding a single
function call in one line to get functionality like that is a really
good deal.Signed-off-by: Henrique de Moraes Holschuh
Signed-off-by: Richard Purdie
