03 Aug, 2011
18 commits
-
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (28 commits)
ACPI: delete stale reference in kernel-parameters.txt
ACPI: add missing _OSI strings
ACPI: remove NID_INVAL
thermal: make THERMAL_HWMON implementation fully internal
thermal: split hwmon lookup to a separate function
thermal: hide CONFIG_THERMAL_HWMON
ACPI print OSI(Linux) warning only once
ACPI: DMI workaround for Asus A8N-SLI Premium and Asus A8N-SLI DELUX
ACPI / Battery: propagate sysfs error in acpi_battery_add()
ACPI / Battery: avoid acpi_battery_add() use-after-free
ACPI: introduce "acpi_rsdp=" parameter for kdump
ACPI: constify ops structs
ACPI: fix CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS
ACPI: fix 80 char overflow
ACPI / Battery: Resolve the race condition in the sysfs_remove_battery()
ACPI / Battery: Add the check before refresh sysfs in the battery_notify()
ACPI / Battery: Add the hibernation process in the battery_notify()
ACPI / Battery: Rename acpi_battery_quirks2 with acpi_battery_quirks
ACPI / Battery: Change 16-bit signed negative battery current into correct value
ACPI / Battery: Add the power unit macro
... -
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
arch/tile/mm/init.c: trivial: use BUG_ON
arch/tile: remove useless set_fixmap_nocache() macro
arch/tile: add hypervisor-based character driver for SPI flash ROM
ioctl-number.txt: add the tile hardwall ioctl range
tile: use generic-y format for one-line asm-generic headers
clocksource: tile: convert to use clocksource_register_hz -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (31 commits)
Btrfs: don't call writepages from within write_full_page
Btrfs: Remove unused variable 'last_index' in file.c
Btrfs: clean up for find_first_extent_bit()
Btrfs: clean up for wait_extent_bit()
Btrfs: clean up for insert_state()
Btrfs: remove unused members from struct extent_state
Btrfs: clean up code for merging extent maps
Btrfs: clean up code for extent_map lookup
Btrfs: clean up search_extent_mapping()
Btrfs: remove redundant code for dir item lookup
Btrfs: make acl functions really no-op if acl is not enabled
Btrfs: remove remaining ref-cache code
Btrfs: remove a BUG_ON() in btrfs_commit_transaction()
Btrfs: use wait_event()
Btrfs: check the nodatasum flag when writing compressed files
Btrfs: copy string correctly in INO_LOOKUP ioctl
Btrfs: don't print the leaf if we had an error
btrfs: make btrfs_set_root_node void
Btrfs: fix oops while writing data to SSD partitions
Btrfs: Protect the readonly flag of block group
...Fix up trivial conflicts (due to acl and writeback cleanups) in
- fs/btrfs/acl.c
- fs/btrfs/ctree.h
- fs/btrfs/extent_io.c -
* 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6:
MAINTAINERS: Add keyword match for of_match_table to device tree section
of: constify property name parameters for helper functions
input: xilinx_ps2: Add missing of_address.h header
of: address: use resource_size helper -
* 'spi/next' of git://git.secretlab.ca/git/linux-2.6:
spi/pl022: remove function cannot exit -
* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: (34 commits)
dm table: set flush capability based on underlying devices
dm crypt: optionally support discard requests
dm raid: add md raid1 support
dm raid: support metadata devices
dm raid: add write_mostly parameter
dm raid: add region_size parameter
dm raid: improve table parameters documentation
dm ioctl: forbid multiple device specifiers
dm ioctl: introduce __get_dev_cell
dm ioctl: fill in device parameters in more ioctls
dm flakey: add corrupt_bio_byte feature
dm flakey: add drop_writes
dm flakey: support feature args
dm flakey: use dm_target_offset and support discards
dm table: share target argument parsing functions
dm snapshot: skip reading origin when overwriting complete chunk
dm: ignore merge_bvec for snapshots when safe
dm table: clean dm_get_device and move exports
dm raid: tidy includes
dm ioctl: prevent empty message
... -
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-watchdog:
watchdog: Cleanup WATCHDOG_CORE help text
watchdog: Fix POST failure on ASUS P5N32-E SLI and similar boards
watchdog: shwdt: fix usage of mod_timer -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: asihpi - Clarify adapter index validity check
ALSA: asihpi - Don't leak firmware if mem alloc fails
ALSA: rtctimer.c needs module.h
ASoC: Fix txx9aclc.c build
ALSA: hdspm - Add firmware revision 0xcc for RME MADI
ALSA: hdspm - Fix reported external sample rate on RME MADI and MADIface
ALSA: hdspm - Provide MADI speed mode selector on RME MADI and MADIface
ALSA: sound/core/pcm_compat.c: adjust array index -
…pm', 'kexec-param' and 'misc' into release
Conflicts:
Documentation/kernel-parameters.txtSigned-off-by: Len Brown <len.brown@intel.com>
-
Says for acpi=
See also Documentation/power/pm.txt, pci=noacpibut this file does not exist
Reported-by: Alan Cox
Signed-off-by: Len Brown -
Use BUG_ON(x) rather than if(x) BUG();
The semantic patch that fixes this problem is as follows:
(http://coccinelle.lip6.fr/)//
@@ identifier x; @@
-if (x) BUG();
+BUG_ON(x);@@ identifier x; @@
-if (!x) BUG();
+BUG_ON(!x);
//Signed-off-by: Julia Lawall
Signed-off-by: Chris Metcalf -
Linux supports some optional features, but it should notify the BIOS about
them via the _OSI method. Currently Linux doesn't notify any, which might
make such features not work because the BIOS doesn't know about them.Jarosz has a system which needs this to make ACPI processor aggregator
device work.Reported-by: "Jarosz, Sebastian"
Signed-off-by: Shaohua Li
Acked-by: Matthew Garrett
Signed-off-by: Andrew Morton
Signed-off-by: Len Brown -
b552a8c56db8 ("ACPI: remove NID_INVAL") removed the left over uses of
NID_INVAL, but didn't actually remove the definition. Remove it.Signed-off-by: David Rientjes
Signed-off-by: Andrew Morton
Signed-off-by: Len Brown -
THERMAL_HWMON is implemented inside the thermal_sys driver and has no
effect on drivers implementing thermal zones, so they shouldn't see
anything related to it in . Making the THERMAL_HWMON
implementation fully internal has two advantages beyond the cleaner
design:* This avoids rebuilding all thermal drivers if the THERMAL_HWMON
implementation changes, or if CONFIG_THERMAL_HWMON gets enabled or
disabled.* This avoids breaking the thermal kABI in these cases too, which should
make distributions happy.The only drawback I can see is slightly higher memory fragmentation, as
the number of kzalloc() calls will increase by one per thermal zone. But
I doubt it will be a problem in practice, as I've never seen a system with
more than two thermal zones.Signed-off-by: Jean Delvare
Cc: Rene Herman
Acked-by: Guenter Roeck
Signed-off-by: Andrew Morton
Signed-off-by: Len Brown -
We'll soon need to reuse it.
Signed-off-by: Jean Delvare
Cc: Rene Herman
Acked-by: Guenter Roeck
Signed-off-by: Andrew Morton
Signed-off-by: Len Brown -
It's about time to revert 16d752397301b9 ("thermal: Create
CONFIG_THERMAL_HWMON=n"). Anybody running a kernel >= 2.6.40 would also
be running a recent enough version of lm-sensors.Actually having CONFIG_THERMAL_HWMON is pretty convenient so instead of
dropping it, we keep it but hide it.Signed-off-by: Jean Delvare
Cc: Rene Herman
Acked-by: Guenter Roeck
Signed-off-by: Andrew Morton
Signed-off-by: Len Brown -
If a patch is working with an of_match_table it's probably adding an OF
binding to a driver in which case the binding ought to be reviewed by the
device tree folks to make sure that things like the device matches are set
up correctly.Signed-off-by: Mark Brown
Signed-off-by: Grant Likely
02 Aug, 2011
22 commits
-
The helper functions for reading u32 integers, u32 arrays and strings
should have the property name as a const pointer.Cc: Grant Likely
Signed-off-by: Jamie Iles
Signed-off-by: Grant Likely -
The remove function in the PL022 driver cannot abort the remove
function any way, so restructure the code so as not to make that
assumption. Remove will now proceed no matter whether it can
stop the transfer queue or not.Reported-by: Russell King
Signed-off-by: Linus Walleij
Signed-off-by: Grant Likely -
DM has always advertised both REQ_FLUSH and REQ_FUA flush capabilities
regardless of whether or not a given DM device's underlying devices
also advertised a need for them.Block's flush-merge changes from 2.6.39 have proven to be more costly
for DM devices. Performance regressions have been reported even when
DM's underlying devices do not advertise that they have a write cache.Fix the performance regressions by configuring a DM device's flushing
capabilities based on those of the underlying devices' capabilities.Signed-off-by: Mike Snitzer
Signed-off-by: Alasdair G Kergon -
Add optional parameter field to dmcrypt table and support
"allow_discards" option.Discard requests bypass crypt queue processing. Bio is simple remapped
to underlying device.Note that discard will be never enabled by default because of security
consequences. It is up to the administrator to enable it for encrypted
devices.(Note that userspace cryptsetup does not understand new optional
parameters yet. Support for this will come later. Until then, you
should use 'dmsetup' to enable and disable this.)Signed-off-by: Milan Broz
Signed-off-by: Alasdair G Kergon -
Support the MD RAID1 personality through dm-raid.
Signed-off-by: Jonathan Brassow
Signed-off-by: Alasdair G Kergon -
Add the ability to parse and use metadata devices to dm-raid. Although
not strictly required, without the metadata devices, many features of
RAID are unavailable. They are used to store a superblock and bitmap.The role, or position in the array, of each device must be recorded in
its superblock. This is to help with fault handling, array reshaping,
and sanity checks. RAID 4/5/6 devices must be loaded in a specific order:
in this way, the 'array_position' field helps validate the correctness
of the mapping when it is loaded. It can be used during reshaping to
identify which devices are added/removed. Fault handling is impossible
without this field. For example, when a device fails it is recorded in
the superblock. If this is a RAID1 device and the offending device is
removed from the array, there must be a way during subsequent array
assembly to determine that the failed device was the one removed. This
is done by correlating the 'array_position' field and the bit-field
variable 'failed_devices'.Signed-off-by: Jonathan Brassow
Signed-off-by: Alasdair G Kergon -
Add the write_mostly parameter to RAID1 dm-raid tables.
This allows the user to set the WriteMostly flag on a RAID1 device that
should normally be avoided for read I/O.Signed-off-by: Jonathan Brassow
Signed-off-by: Alasdair G Kergon -
Allow the user to specify the region_size.
Ensures that the supplied value meets md's constraints, viz. the number of
regions does not exceed 2^21.Signed-off-by: Jonathan Brassow
Signed-off-by: Alasdair G Kergon -
Add more information about some dm-raid table parameters and clarify how
parameters are printed when 'dmsetup table' is issued.Signed-off-by: Jonathan Brassow
Signed-off-by: Alasdair G Kergon -
Exactly one of name, uuid or device must be specified when referencing
an existing device. This removes the ambiguity (risking the wrong
device being updated) if two conflicting parameters were specified.
Previously one parameter got used and any others were ignored silently.Signed-off-by: Mikulas Patocka
Signed-off-by: Alasdair G Kergon -
Move logic to find device based on major/minor number to a separate
function __get_dev_cell (similar to __get_uuid_cell and __get_name_cell).
This makes the function __find_device_hash_cell more straightforward.Signed-off-by: Mikulas Patocka
Signed-off-by: Alasdair G Kergon -
Move parameter filling from find_device to __find_device_hash_cell.
This patch causes ioctls using __find_device_hash_cell
(DM_DEV_REMOVE_CMD, DM_DEV_SUSPEND_CMD - resume, DM_TABLE_CLEAR_CMD)
to return device parameters, bringing them into line with the other
ioctls.Signed-off-by: Mikulas Patocka
Signed-off-by: Alasdair G Kergon -
Add corrupt_bio_byte feature to simulate corruption by overwriting a byte at a
specified position with a specified value during intervals when the device is
"down".Signed-off-by: Mike Snitzer
Signed-off-by: Alasdair G Kergon -
Add 'drop_writes' option to drop writes silently while the
device is 'down'. Reads are not touched.Signed-off-by: Mike Snitzer
Signed-off-by: Alasdair G Kergon -
Add the ability to specify arbitrary feature flags when creating a
flakey target. This code uses the same target argument helpers that
the multipath target does.Also remove the superfluous 'dm-flakey' prefixes from the error messages,
as they already contain the prefix 'flakey'.Signed-off-by: Mike Snitzer
Signed-off-by: Alasdair G Kergon -
Use dm_target_offset() and support discards.
Signed-off-by: Mike Snitzer
Signed-off-by: Alasdair G Kergon -
Move multipath target argument parsing code into dm-table so other
targets can share it.Signed-off-by: Mike Snitzer
Signed-off-by: Alasdair G Kergon -
If we write a full chunk in the snapshot, skip reading the origin device
because the whole chunk will be overwritten anyway.This patch changes the snapshot write logic when a full chunk is written.
In this case:
1. allocate the exception
2. dispatch the bio (but don't report the bio completion to device mapper)
3. write the exception record
4. report bio completedCallbacks must be done through the kcopyd thread, because callbacks must not
race with each other. So we create two new functions:dm_kcopyd_prepare_callback: allocate a job structure and prepare the callback.
(This function must not be called from interrupt context.)dm_kcopyd_do_callback: submit callback.
(This function may be called from interrupt context.)Performance test (on snapshots with 4k chunk size):
without the patch:
non-direct-io sequential write (dd): 17.7MB/s
direct-io sequential write (dd): 20.9MB/s
non-direct-io random write (mkfs.ext2): 0.44swith the patch:
non-direct-io sequential write (dd): 26.5MB/s
direct-io sequential write (dd): 33.2MB/s
non-direct-io random write (mkfs.ext2): 0.27sSigned-off-by: Mikulas Patocka
Signed-off-by: Alasdair G Kergon -
Add a new flag DMF_MERGE_IS_OPTIONAL to struct mapped_device to indicate
whether the device can accept bios larger than the size its merge
function returns. When set, use this to send large bios to snapshots
which can split them if necessary. Snapshot I/O may be significantly
fragmented and this approach seems to improve peformance.Before the patch, dm_set_device_limits restricted bio size to page size
if the underlying device had a merge function and the target didn't
provide a merge function. After the patch, dm_set_device_limits
restricts bio size to page size if the underlying device has a merge
function, doesn't have DMF_MERGE_IS_OPTIONAL flag and the target doesn't
provide a merge function.The snapshot target can't provide a merge function because when the merge
function is called, it is impossible to determine where the bio will be
remapped. Previously this led us to impose a 4k limit, which we can
now remove if the snapshot store is located on a device without a merge
function. Together with another patch for optimizing full chunk writes,
it improves performance from 29MB/s to 40MB/s when writing to the
filesystem on snapshot store.If the snapshot store is placed on a non-dm device with a merge function
(such as md-raid), device mapper still limits all bios to page size.Signed-off-by: Mikulas Patocka
Signed-off-by: Alasdair G Kergon -
There is no need for __table_get_device to be factored out.
Also move the exports to the end of their respective functions.Signed-off-by: Mike Snitzer
Signed-off-by: Alasdair G Kergon -
A dm target only needs to use include/linux dm headers.
Signed-off-by: Alasdair G Kergon
-
Detect invalid empty messages in core dm instead of requiring every target to
check this.Signed-off-by: Alasdair G Kergon
