aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-03-06dm mpath: pass struct pgpath to pg init doneMoger, Babu1-3/+2
This patch removes some unnecessary argument casting. There is no functional change with this patch. Passes 'struct pgpath' through to pg_init_done() instead of the enclosed 'struct dm_path'. Tested the changes with LSI storage.. CC: Chandra Seetharaman <[email protected]> Signed-off-by: Babu Moger <[email protected]> Acked-by: Kiyoshi Ueda <[email protected]> Signed-off-by: Alasdair G Kergon <[email protected]>
2010-03-05Merge branch 'slab-for-linus' of ↵Linus Torvalds7-260/+146
git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 * 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: SLUB: Fix per-cpu merge conflict failslab: add ability to filter slab caches slab: fix regression in touched logic dma kmalloc handling fixes slub: remove impossible condition slab: initialize unused alien cache entry as NULL at alloc_alien_cache(). SLUB: Make slub statistics use this_cpu_inc SLUB: this_cpu: Remove slub kmem_cache fields SLUB: Get rid of dynamic DMA kmalloc cache allocation SLUB: Use this_cpu operations in slub
2010-03-05Merge branch 'nfs-for-2.6.34' of ↵Linus Torvalds24-443/+642
git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'nfs-for-2.6.34' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (44 commits) NFS: Remove requirement for inode->i_mutex from nfs_invalidate_mapping NFS: Clean up nfs_sync_mapping NFS: Simplify nfs_wb_page() NFS: Replace __nfs_write_mapping with sync_inode() NFS: Simplify nfs_wb_page_cancel() NFS: Ensure inode is always marked I_DIRTY_DATASYNC, if it has unstable pages NFS: Run COMMIT as an asynchronous RPC call when wbc->for_background is set NFS: Reduce the number of unnecessary COMMIT calls NFS: Add a count of the number of unstable writes carried by an inode NFS: Cleanup - move nfs_write_inode() into fs/nfs/write.c nfs41 fix NFS4ERR_CLID_INUSE for exchange id NFS: Fix an allocation-under-spinlock bug SUNRPC: Handle EINVAL error returns from the TCP connect operation NFSv4.1: Various fixes to the sequence flag error handling nfs4: renewd renew operations should take/put a client reference nfs41: renewd sequence operations should take/put client reference nfs: prevent backlogging of renewd requests nfs: kill renewd before clearing client minor version NFS: Make close(2) asynchronous when closing NFS O_DIRECT files NFS: Improve NFS iostat byte count accuracy for writes ...
2010-03-05Merge branch 'for-linus' of ↵Linus Torvalds12-144/+238
git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: fs/9p: Add hardlink support to .u extension 9P2010.L handshake: .L protocol negotiation 9P2010.L handshake: Remove "dotu" variable 9P2010.L handshake: Add mount option 9P2010.L handshake: Add VFS flags net/9p: Handle mount errors correctly. net/9p: Remove MAX_9P_CHAN limit net/9p: Add multi channel support.
2010-03-05Merge branch 'for_linus' of ↵Linus Torvalds87-1545/+1554
git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: (33 commits) quota: stop using QUOTA_OK / NO_QUOTA dquot: cleanup dquot initialize routine dquot: move dquot initialization responsibility into the filesystem dquot: cleanup dquot drop routine dquot: move dquot drop responsibility into the filesystem dquot: cleanup dquot transfer routine dquot: move dquot transfer responsibility into the filesystem dquot: cleanup inode allocation / freeing routines dquot: cleanup space allocation / freeing routines ext3: add writepage sanity checks ext3: Truncate allocated blocks if direct IO write fails to update i_size quota: Properly invalidate caches even for filesystems with blocksize < pagesize quota: generalize quota transfer interface quota: sb_quota state flags cleanup jbd: Delay discarding buffers in journal_unmap_buffer ext3: quota_write cross block boundary behaviour quota: drop permission checks from xfs_fs_set_xstate/xfs_fs_set_xquota quota: split out compat_sys_quotactl support from quota.c quota: split out netlink notification support from quota.c quota: remove invalid optimization from quota_sync_all ... Fixed trivial conflicts in fs/namei.c and fs/ufs/inode.c
2010-03-05hwmon: Remove the deprecated adt7473 driverAmerigo Wang5-1275/+0
adt7473 driver is obsoleted by adt7475 driver. And it is scheduled to be removed in Feb 2010. Signed-off-by: WANG Cong <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: Fix off-by-one kind valuesJean Delvare3-15/+11
Recent changes on the I2C front have left off-by-one array indexes in 3 hwmon drivers. Fix them. Faulty commit: e5e9f44c2 i2c: Drop I2C_CLIENT_INSMOD_2 to 8 Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Jean Delvare <[email protected]> Cc: Hans de Goede <[email protected]> Cc: Andre Prendel <[email protected]> Cc: [email protected]
2010-03-05hwmon: (tmp421) Fix temperature conversionsJean Delvare1-2/+4
The low bits of temperature registers are status bits, they must be masked out before converting the register values to temperatures. Signed-off-by: Jean Delvare <[email protected]> Tested-by: Andre Prendel <[email protected]> Cc: [email protected]
2010-03-05hwmon: (tmp421) Restore missing inputsJean Delvare1-7/+7
An off-by-one error caused some inputs to not be created by the driver when they should. TMP421 gets only one input instead of two, TMP422 gets two instead of three, etc. Fix the bug by listing explicitly the number of inputs each device has. Signed-off-by: Jean Delvare <[email protected]> Tested-by: Andre Prendel <[email protected]> Cc: [email protected]
2010-03-05hwmon: Driver for Andigilog aSC7621 family monitoring chipsGeorge Joseph5-0/+1572
Hwmon driver for Andigilog aSC7621 family monitoring chips. Signed-off-by: George Joseph <[email protected]> Acked-by: Hans de Goede <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (adt7411) Improve lockingWolfram Sang1-7/+14
Add proper locking for the cached variables. Also get rid of ref_is_vdd, which became obsolete. Signed-off-by: Wolfram Sang <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: Add driver for ADT7411 voltage and temperature sensorWolfram Sang4-0/+412
Add basic support for the ADT7411. Reads out all conversion results (via I2C, SPI yet missing) and allows some on-the-fly configuration. Tested with a custom board. Signed-off-by: Sascha Hauer <[email protected]> Signed-off-by: Wolfram Sang <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (w83793) Add watchdog functionalitySven Anders2-4/+481
Add watchdog functionality to the Winbond W83793 driver. Signed-off-by: Sven Anders <[email protected]> Acked-by: Hans de Goede <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (g760a) Make rpm_from_cnt staticJean Delvare1-1/+1
Function rpm_from_cnt is only used internally so it can be made static. Make it inline while we're here, for performance reasons (although hopefully gcc would figure out by itself...) Signed-off-by: Jean Delvare <[email protected]> Cc: Herbert Valerio Riedel <[email protected]> Acked-by: Martin Michlmayr <[email protected]>
2010-03-05hwmon: (it87) Validate auto pwm settingsJean Delvare2-0/+36
Before switching to automatic fan control mode, make sure that all the trip points make sense. Otherwise, the control loop could lead to weird fan behavior. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (it87) Add support for old automatic fan speed controlJean Delvare2-4/+205
Add support for the automatic fan speed control interface as implemented by IT8705F chips up to revision F and IT8712F chips up to revision G. This implementation fits very well in our standard sysfs interface. I implemented the old and not the new interface because the only chip I have at hand is an old one, and the new interface is more difficult to map to the standard sysfs interface. Adding support later should be possible though, if someone with a supported chip is interested. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (it87) Drop dead web links in documentationJean Delvare1-13/+5
Unfortunately ITE is no longer publicly providing datasheets for their IT87xxF series of chips. They may send them on request if you ask politely. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (it87) Add an entry in MAINTAINERSJean Delvare1-0/+7
As I've just done a lot of changes to the it87 driver, I volunteer to maintain it for the year to come. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (it87) Use strict_strtol instead of simple_strtolJean Delvare1-15/+44
For consistency and robustness, use strict_strtol instead of simple_strtol. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (it87) Fix many checkpatch errors and warningsJean Delvare1-75/+87
Fix 20 errors and 11 warnings reported by the checkpatch script. The remainining errors would require more work. The remaining warnings will be addressed later. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (it87) Add support for beep on alarmJean Delvare2-0/+126
The IT87xxF chips support beeping on alarm, if properly wired and configured. There is one control bit for each input type (temperature, fan, voltage.) Let the user see and change them. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (it87) Create vid attributes by groupJean Delvare1-8/+7
Only VID-related attributes are left in it87_attributes_opt, so we might as well rename it to it87_attributes_vid and use this group to create all attributes at once. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (it87) Refactor attributes creation and removalJean Delvare1-130/+103
There is a lot of code redundancy in the creation of the fan and pwm attributes. Move these attributes to arrays so that the code can be simplified. This in turns makes the attributes removal code larger, so move it to a separate function that can be called in both the standard removal case and the error path during probing. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (it87) Expose the PWM/temperature mappingsJean Delvare1-4/+69
Let the user read the PWM-to-temperature mappings. Until the trip points are also exposed, this is essentially a way to know how the BIOS has set things up. The ability to change the settings will be added later, together with the trip points. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (it87) Display fan outputs in automatic mode as suchJean Delvare1-38/+61
The it87 driver doesn't yet support automatic fan control. Let it at least tell the user when a fan output is in automatic mode. Also let the user switch from automatic mode (possibly set by the BIOS) to manual mode and back without losing the settings. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (lm90) Add SMBus alert supportJean Delvare2-0/+75
Tested successfully with an ADM1032 chip on its evaluation board. It should work fine with all other chips as well. At this point this is more of a proof-of-concept, we don't do anything terribly useful on SMBus alert: we simply log the event. But this could later evolve into libsensors signaling so that user-space applications can take an appropriate action. Signed-off-by: Jean Delvare <[email protected]> Cc: David Brownell <[email protected]> Cc: Trent Piepho <[email protected]>
2010-03-05hwmon: (lm90) Restore configuration on exitJean Delvare1-4/+10
Restore the chip configuration when unloading the driver. This ensures we don't leave the chip running if it was initially stopped. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (lm90) Add support for the Winbond/Nuvoton W83L771AWG/ASGJean Delvare3-3/+24
This chips is found on several Zotac Ion ITX boards, amongst others. Signed-off-by: Jean Delvare <[email protected]> Cc: MC Matti <[email protected]> Cc: Manuel Lamotte-Schubert <[email protected]>
2010-03-05Merge branch 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds74-1661/+3770
* 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (145 commits) KVM: x86: Add KVM_CAP_X86_ROBUST_SINGLESTEP KVM: VMX: Update instruction length on intercepted BP KVM: Fix emulate_sys[call, enter, exit]()'s fault handling KVM: Fix segment descriptor loading KVM: Fix load_guest_segment_descriptor() to inject page fault KVM: x86 emulator: Forbid modifying CS segment register by mov instruction KVM: Convert kvm->requests_lock to raw_spinlock_t KVM: Convert i8254/i8259 locks to raw_spinlocks KVM: x86 emulator: disallow opcode 82 in 64-bit mode KVM: x86 emulator: code style cleanup KVM: Plan obsolescence of kernel allocated slots, paravirt mmu KVM: x86 emulator: Add LOCK prefix validity checking KVM: x86 emulator: Check CPL level during privilege instruction emulation KVM: x86 emulator: Fix popf emulation KVM: x86 emulator: Check IOPL level during io instruction emulation KVM: x86 emulator: fix memory access during x86 emulation KVM: x86 emulator: Add Virtual-8086 mode of emulation KVM: x86 emulator: Add group9 instruction decoding KVM: x86 emulator: Add group8 instruction decoding KVM: do not store wqh in irqfd ... Trivial conflicts in Documentation/feature-removal-schedule.txt
2010-03-05fs/9p: Add hardlink support to .u extensionAneesh Kumar K.V1-1/+18
For regular file and directories we put the link count in th extension field in a tagged string format. Signed-off-by: Aneesh Kumar K.V <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2010-03-059P2010.L handshake: .L protocol negotiationSripathi Kodi1-3/+22
This patch adds 9P2010.L protocol negotiation with the server Signed-off-by: Sripathi Kodi <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2010-03-059P2010.L handshake: Remove "dotu" variableSripathi Kodi6-65/+87
Removes 'dotu' variable and make everything dependent on 'proto_version' field. Signed-off-by: Sripathi Kodi <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2010-03-059P2010.L handshake: Add mount optionSripathi Kodi2-0/+43
Add new mount V9FS mount option to specify protocol version This patch adds a new mount option to specify protocol version. With this option it is possible to use "-o version=" switch to specify 9P protocol version to use. Valid options for version are: 9p2000 9p2000.u 9p2010.L Signed-off-by: Sripathi Kodi <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2010-03-059P2010.L handshake: Add VFS flagsSripathi Kodi5-28/+36
Add 9P2000.u and 9P2010.L protocol flags to V9FS VFS This patch adds 9P2000.u and 9P2010.L protocol flags into V9FS VFS side code and removes the single flag used for 'extended'. Signed-off-by: Sripathi Kodi <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2010-03-05net/9p: Handle mount errors correctly.Aneesh Kumar K.V1-1/+3
With this patch we have # mount -t 9p -o trans=virtio virtio2 /mnt/ # mount -t 9p -o trans=virtio virtio2 /mnt/ mount: virtio2 already mounted or /mnt/ busy mount: according to mtab, virtio2 is already mounted on /mnt # mount -t 9p -o trans=virtio virtio3 /mnt/ -o debug=0xfff mount: special device virtio3 does not exist Signed-off-by: Aneesh Kumar K.V <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2010-03-05net/9p: Remove MAX_9P_CHAN limitAneesh Kumar K.V2-46/+27
Use a list to track the channel instead of statically allocated array Signed-off-by: Aneesh Kumar K.V <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2010-03-05net/9p: Add multi channel support.Aneesh Kumar K.V2-7/+9
This is needed for supporting multiple mount points. We can find out the device names to be used with mount by checking /sys/devices/virtio-pci/virtio*/device file if the device file have value 9 then the specific virtio device can be used for mounting. ex: #cat /sys/devices/virtio-pci/virtio1/device 9 now we can mount using # mount -t 9p -o trans=virtio virtio1 /mnt/ Signed-off-by: Aneesh Kumar K.V <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2010-03-05Merge branch 'writeback-for-2.6.34' into nfs-for-2.6.34Trond Myklebust5508-138110/+336593
2010-03-05NFS: Remove requirement for inode->i_mutex from nfs_invalidate_mappingTrond Myklebust4-43/+3
Signed-off-by: Trond Myklebust <[email protected]>
2010-03-05NFS: Clean up nfs_sync_mappingTrond Myklebust1-9/+5
Remove the redundant call to filemap_write_and_wait(). Signed-off-by: Trond Myklebust <[email protected]>
2010-03-05NFS: Simplify nfs_wb_page()Trond Myklebust2-98/+23
Signed-off-by: Trond Myklebust <[email protected]>
2010-03-05NFS: Replace __nfs_write_mapping with sync_inode()Trond Myklebust3-49/+10
Now that we have correct COMMIT semantics in writeback_single_inode, we can reduce and simplify nfs_wb_all(). Also replace nfs_wb_nocommit() with a call to filemap_write_and_wait(), which doesn't need to hold the inode->i_mutex. With that done, we can eliminate nfs_write_mapping() altogether. Signed-off-by: Trond Myklebust <[email protected]>
2010-03-05NFS: Simplify nfs_wb_page_cancel()Trond Myklebust2-40/+1
In all cases we should be able to just remove the request and call cancel_dirty_page(). Signed-off-by: Trond Myklebust <[email protected]>
2010-03-05NFS: Ensure inode is always marked I_DIRTY_DATASYNC, if it has unstable pagesTrond Myklebust1-0/+2
Since nfs_scan_list() doesn't wait for locked pages, we have a race in which it is possible to end up with an inode that needs to send a COMMIT, but which does not have the I_DIRTY_DATASYNC flag set. Signed-off-by: Trond Myklebust <[email protected]>
2010-03-05NFS: Run COMMIT as an asynchronous RPC call when wbc->for_background is setTrond Myklebust1-1/+1
Signed-off-by: Trond Myklebust <[email protected]> Acked-by: Peter Zijlstra <[email protected]> Acked-by: Wu Fengguang <[email protected]>
2010-03-05NFS: Reduce the number of unnecessary COMMIT callsTrond Myklebust1-4/+22
If the caller is doing a non-blocking flush, and there are still writebacks pending on the wire, we can usually defer the COMMIT call until those writes are done. Also ensure that we honour the wbc->nonblocking flag. Signed-off-by: Trond Myklebust <[email protected]>
2010-03-05NFS: Add a count of the number of unstable writes carried by an inodeTrond Myklebust3-4/+12
In order to know when we should do opportunistic commits of the unstable writes, when the VM is doing a background flush, we add a field to count the number of unstable writes. Signed-off-by: Trond Myklebust <[email protected]>
2010-03-05NFS: Cleanup - move nfs_write_inode() into fs/nfs/write.cTrond Myklebust3-20/+23
The sole purpose of nfs_write_inode is to commit unstable writes, so move it into fs/nfs/write.c, and make nfs_commit_inode static. Signed-off-by: Trond Myklebust <[email protected]>
2010-03-05Merge branch 'write_inode2' of ↵Linus Torvalds48-107/+123
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'write_inode2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: pass writeback_control to ->write_inode make sure data is on disk before calling ->write_inode
2010-03-05Merge branch 'for-linus' of ↵Linus Torvalds1-259/+262
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: Switch !O_CREAT case to use of do_last() Get rid of symlink body copying Finish pulling of -ESTALE handling to upper level in do_filp_open() Turn do_link spaghetty into a normal loop Unify exits in O_CREAT handling Kill is_link argument of do_last() Pull handling of LAST_BIND into do_last(), clean up ok: part in do_filp_open() Leave mangled flag only for setting nd.intent.open.flag Get rid of passing mangled flag to do_last() Don't pass mangled open_flag to finish_open() pull more into do_last() bail out with ELOOP earlier in do_link loop pull the common predecessors into do_last() postpone __putname() until after do_last() unroll do_last: loop in do_filp_open() Shift releasing nd->root from do_last() to its caller gut do_filp_open() a bit more (do_last separation) beginning to untangle do_filp_open()