aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-03-24xtensa: Convert genirq namespaceThomas Gleixner3-13/+13
Scripted with coccinelle. Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-24xtensa: Use generic IRQ Kconfig and set GENERIC_HARDIRQS_NO_DEPRECATEDThomas Gleixner1-3/+2
All chips converted. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Chris Zankel <[email protected]> LKML-Reference: <[email protected]>
2011-03-24xtensa: Convert s6000 gpio irq_chip to new functionsThomas Gleixner1-18/+17
Also use proper wrappers for irq_desc access. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Chris Zankel <[email protected]> LKML-Reference: <[email protected]>
2011-03-24xtensa: Convert main irq_chip to new functionsThomas Gleixner1-22/+21
Signed-off-by: Thomas Gleixner <[email protected]> Cc: Chris Zankel <[email protected]> LKML-Reference: <[email protected]>
2011-03-24um: Use generic show_interrupts()Thomas Gleixner2-46/+1
Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-24um: Convert genirq namespaceThomas Gleixner1-5/+4
Scripted with coccinelle. Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-24m32r: Use generic show_interrupts()Thomas Gleixner2-45/+1
Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-24m32r: Convert genirq namespaceThomas Gleixner8-75/+75
Scripted with coccinelle. Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-24h8300: Use generic show_interrupts()Thomas Gleixner2-31/+1
Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-24h8300: Convert genirq namespaceThomas Gleixner1-1/+1
Scripted with coccinelle. Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-24avr32: Cleanup eic_set_irq_type()Thomas Gleixner1-20/+11
No need to fiddle in irq_desc. The trigger mask can be written back into irq_data. Return IRQ_SET_MASK_OK_NOCOPY, so the generic code wont overwrite it again. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hans-Christian Egtvedt <[email protected]>
2011-03-24avr32: Use generic show_interrupts()Thomas Gleixner2-37/+1
Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hans-Christian Egtvedt <[email protected]>
2011-03-24avr: Cleanup genirq namespaceThomas Gleixner5-17/+17
Scripted conversion to new function names with coccinelle. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hans-Christian Egtvedt <[email protected]>
2011-03-24avr32: Use generic IRQ config, enable GENERIC_HARDIRQS_NO_DEPRECATEDThomas Gleixner1-9/+4
Use the generic Kconfig for interrupts and enable GENERIC_HARDIRQS_NO_DEPRECATED. All conversions done. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hans-Christian Egtvedt <[email protected]> LKML-Reference: <[email protected]>
2011-03-24avr32: At32ap: Convert pop irq_chip to new functionsThomas Gleixner1-13/+10
Also replace the open coded handler call with the proper wrapper. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hans-Christian Egtvedt <[email protected]> LKML-Reference: <[email protected]>
2011-03-24avr32: At32ap: Convert intc irq_chip to new functionsThomas Gleixner1-7/+5
Also replace the open coded handler call with the proper wrapper. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hans-Christian Egtvedt <[email protected]> LKML-Reference: <[email protected]>
2011-03-24avr32: At32ap: Convert extint irq_chip to new functionsThomas Gleixner1-22/+23
Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hans-Christian Egtvedt <[email protected]> LKML-Reference: <[email protected]>
2011-03-24slub: Fix debugobjects with lockless fastpathThomas Gleixner1-2/+2
On Thu, 24 Mar 2011, Ingo Molnar wrote: > RIP: 0010:[<ffffffff810570a9>] [<ffffffff810570a9>] get_next_timer_interrupt+0x119/0x260 That's a typical timer crash, but you were unable to debug it with debugobjects because commit d3f661d6 broke those. Cc: Christoph Lameter <[email protected]> Tested-by: Ingo Molnar <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: Pekka Enberg <[email protected]>
2011-03-24autofs4: Do not potentially dereference NULL pointer returned by fget() in ↵Jesper Juhl1-0/+4
autofs_dev_ioctl_setpipefd() In fs/autofs4/dev-ioctl.c::autofs_dev_ioctl_setpipefd() we call fget(), which may return NULL, but we do not explicitly test for that NULL return so we may end up dereferencing a NULL pointer - bad. When I originally submitted this patch I had chosen EBUSY as the return value to use if this happens. Ian Kent was kind enough to explain why that would most likely be wrong and why EBADF should most likely be used instead. This version of the patch uses EBADF. Signed-off-by: Jesper Juhl <[email protected]> Signed-off-by: Ian Kent <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-03-24autofs4 - remove autofs4_lockIan Kent4-31/+20
The autofs4_lock introduced by the rcu-walk changes has unnecessarily broad scope. The locking is better handled by the per-autofs super block lookup_lock. Signed-off-by: Ian Kent <[email protected]> Acked-by: David Howells <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-03-24autofs4 - fix d_manage() return on rcu-walkIan Kent1-0/+2
The daemon never needs to block and, in the rcu-walk case an error return isn't used, so always return zero. Signed-off-by: Ian Kent <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-03-24autofs4 - fix autofs4_expire_indirect() traversalIan Kent1-1/+51
The vfs-scale changes changed the traversal used in autofs4_expire_indirect() from a list to a depth first tree traversal which isn't right. Signed-off-by: Ian Kent <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-03-24autofs4 - fix dentry leak in autofs4_expire_direct()Ian Kent1-4/+3
There is a missing dput() when returning from autofs4_expire_direct() when we see that the dentry is already a pending mount. Signed-off-by: Ian Kent <[email protected]> Acked-by: David Howells <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-03-24autofs4 - reinstate last used update on accessIan Kent2-34/+14
When direct (and offset) mounts were introduced the the last used timeout could no longer be updated in ->d_revalidate(). This is because covered direct mounts would be followed over without calling the autofs file system. As a result the definition of the busyness check for all entries was changed to be "actually busy" being an open file or working directory within the automount. But now we have a call back in the follow so the last used update on any access can be re-instated. This requires DCACHE_MANAGE_TRANSIT to always be set. Signed-off-by: Ian Kent <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-03-24vfs - check non-mountpoint dentry might block in __follow_mount_rcu()Ian Kent1-5/+18
When following a mount in rcu-walk mode we must check if the incoming dentry is telling us it may need to block, even if it isn't actually a mountpoint. Signed-off-by: Ian Kent <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-03-24NFS: Determine initial mount securityBryan Schumaker3-2/+50
When sec=<something> is not presented as a mount option, we should attempt to determine what security flavor the server is using. Signed-off-by: Bryan Schumaker <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-24NFS: use secinfo when crossing mountpointsBryan Schumaker7-11/+165
A submount may use different security than the parent mount does. We should figure out what sec flavor the submount uses at mount time. Signed-off-by: Bryan Schumaker <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-24NFS: Add secinfo procedureBryan Schumaker4-0/+208
This patch adds the nfs4 operation secinfo as a valid nfs rpc operation. Signed-off-by: Bryan Schumaker <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-24NFS: lookup supports alternate clientBryan Schumaker8-49/+60
A later patch will need to perform a lookup using an alternate client with a different security flavor. This patch adds support for doing that on NFS v4. Signed-off-by: Bryan Schumaker <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-24NFS: convert call_sync() to a functionBryan Schumaker1-23/+30
This patch changes nfs4_call_sync() from a macro into a static inline function. As a macro, the call_sync() function will not do any type checking and depends on the sequence arguments always having the same name. As a function, we get to have type checking and can rename the arguments if we so choose. Signed-off-by: Bryan Schumaker <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-24Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds172-2112/+1520
* 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block: (65 commits) Documentation/iostats.txt: bit-size reference etc. cfq-iosched: removing unnecessary think time checking cfq-iosched: Don't clear queue stats when preempt. blk-throttle: Reset group slice when limits are changed blk-cgroup: Only give unaccounted_time under debug cfq-iosched: Don't set active queue in preempt block: fix non-atomic access to genhd inflight structures block: attempt to merge with existing requests on plug flush block: NULL dereference on error path in __blkdev_get() cfq-iosched: Don't update group weights when on service tree fs: assign sb->s_bdi to default_backing_dev_info if the bdi is going away block: Require subsystems to explicitly allocate bio_set integrity mempool jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging fs: make fsync_buffers_list() plug mm: make generic_writepages() use plugging blk-cgroup: Add unaccounted time to timeslice_used. block: fixup plugging stubs for !CONFIG_BLOCK block: remove obsolete comments for blkdev_issue_zeroout. blktrace: Use rq->cmd_flags directly in blk_add_trace_rq. ... Fix up conflicts in fs/{aio.c,super.c}
2011-03-24Merge branch 'next' of ↵Linus Torvalds39-502/+1924
git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300 * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300: MN10300: gcc 4.6 vs am33 inline assembly MN10300: Deprecate gdbstub MN10300: Allow KGDB to use the MN10300 serial ports MN10300: Emulate single stepping in KGDB on MN10300 MN10300: Generalise kernel debugger kernel halt, reboot or power off hook KGDB: Notify GDB of machine halt, reboot or power off MN10300: Use KGDB MN10300: Create generic kernel debugger hooks MN10300: Create general kernel debugger cache flushing MN10300: Introduce a general config option for kernel debugger hooks MN10300: The icache invalidate functions should disable the icache first MN10300: gdbstub: Restrict single-stepping to non-preemptable non-SMP configs
2011-03-24Merge branch 'release' of ↵Linus Torvalds3-4/+21
git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: pstore: cleanups to pstore_dump() [IA64] New syscalls for 2.6.39
2011-03-24Merge branch 'rmobile-latest' of ↵Linus Torvalds9-32/+59
git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: mmc: Add MMC_PROGRESS_* mmc, ARM: Rename SuperH Mobile ARM zboot helpers ARM: mach-shmobile: add coherent DMA mask to CEU camera devices ARM: mach-shmobile: Dynamic backlight control for Mackerel
2011-03-24Merge branch 'sh-latest' of ↵Linus Torvalds14-197/+104
git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Fix build alloc_thread_info_node function sh: Fix ptrace hw_breakpoint handling sh: Fix ptrace fpu state initialisation sh: Re-enable GENERIC_HARDIRQS_NO_DEPRECATED. sh: pmb: Use struct syscore_ops instead of sysdevs sh: Use struct syscore_ops instead of sysdevs sh: Conver to asm-generic/sizes.h. sh: wire up sys_syncfs.
2011-03-24Merge branch 'usb-linus' of ↵Linus Torvalds8-28/+19
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: USB: cdc-acm: fix potential null-pointer dereference on disconnect USB: cdc-acm: fix potential null-pointer dereference USB: cdc-acm: fix memory corruption / panic USB: Fix 'bad dma' problem on WDM device disconnect usb: wwan: fix compilation without CONFIG_PM_RUNTIME USB: uss720 fixup refcount position usb: musb: blackfin: fix typo in new bfin_musb_vbus_status func usb: musb: blackfin: fix typo in new dev_pm_ops struct usb: musb: blackfin: fix typo in platform driver name usb: musb: Fix for merge issue ehci-hcd: Bug fix: don't set a QH's Halt bit USB: Do not pass negative length to snoop_urb()
2011-03-24Merge branch 'v4l_for_linus' of ↵Linus Torvalds469-19254/+77749
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits) [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE [media] v4l: soc-camera: Store negotiated buffer settings [media] rc: interim support for 32-bit NEC-ish scancodes [media] mceusb: topseed 0x0011 needs gen3 init for tx to work [media] lirc_zilog: error out if buffer read bytes != chunk size [media] lirc: silence some compile warnings [media] hdpvr: use same polling interval as other OS [media] ir-kbd-i2c: pass device code w/key in hauppauge case [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping [media] rc-rc5-hauppauge-new: Add support for the old Black RC [media] rc-rc5-hauppauge-new: Add the old control to the table [media] rc-winfast: Fix the keycode tables [media] a800: Fix a few wrong IR key assignments [media] opera1: Use multimedia keys instead of an app-specific mapping [media] dw2102: Use multimedia keys instead of an app-specific mapping ... Fix up trivial conflicts (remove/modify and some real conflicts) in: arch/arm/mach-omap2/devices.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/dabusb/dabusb.c drivers/staging/dabusb/dabusb.h drivers/staging/easycap/easycap_ioctl.c drivers/staging/usbvideo/usbvideo.c drivers/staging/usbvideo/vicam.c
2011-03-24Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegraLinus Torvalds20-34/+787
* 'for-linus' of git://android.git.kernel.org/kernel/tegra: ARM: tegra: harmony: initialize the TPS65862 PMIC ARM: tegra: update defconfig ARM: tegra: harmony: update PCI-e initialization sequence ARM: tegra: trimslice: enable MMC/SD slots ARM: tegra: enable new drivers in defconfig ARM: tegra: Add Toshiba AC100 support ARM: tegra: harmony: Set WM8903 gpio_base ARM: tegra: harmony: I2C-related portions of audio support ARM: tegra: harmony: register i2c devices ARM: tegra: seaboard: register i2c devices ARM: tegra: harmony: Beginnings of audio support ARM: tegra: create defines for SD-related GPIO names ARM: tegra: add devices.c entries for audio
2011-03-24Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds6-58/+52
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6: spi/pl022: Add loopback support for the SPI on 5500 spi/omap_mcspi: Fix broken last word xfer of/flattree: minor cleanups dt: eliminate OF_NO_DEEP_PROBE and test for NULL match table dt: protect against NULL matches passed to of_match_node() dt: Refactor of_platform_bus_probe()
2011-03-25mmc: Add MMC_PROGRESS_*Simon Horman4-11/+17
This is my second attempt to make this enum generally available. The first attempt added MMCIF_PROGRESS_* to include/linux/mmc/sh_mmcif.h. However this is not sufficiently generic as the enum will be used by SDHI boot code. Signed-off-by: Simon Horman <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2011-03-25mmc, ARM: Rename SuperH Mobile ARM zboot helpersSimon Horman4-22/+21
These headers and helpers will also be used for SDHI boot so the mmcif name will start to make a lot less sense. Signed-off-by: Simon Horman <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2011-03-24Merge branch 'idle-release' of ↵Linus Torvalds1-11/+11
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6 * 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6: intel_idle: Rename cpuidle states
2011-03-24Merge branch 'release' of ↵Linus Torvalds55-2374/+2920
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (42 commits) ACPI: minor printk format change in acpi_pad ACPI: make acpi_pad /sys output more readable ACPICA: Update version to 20110316 ACPICA: Header support for SLIC table ACPI: Make sure the FADT is at least rev 2 before using the reset register ACPI: Bug compatibility for Windows on the ACPI reboot vector ACPICA: Fix access width for reset vector ACPI battery: fribble sysfs files from a resume notifier ACPI button: remove unused procfs I/F ACPI, APEI, Add PCIe AER error information printing support PCIe, AER, use pre-generated prefix in error information printing ACPI, APEI, Add ERST record ID cache ACPI: Use syscore_ops instead of sysdev class and sysdev ACPI: Remove the unused EC sysdev class ACPI: use __cpuinit for the acpi_processor_set_pdc() call tree ACPI: use __init where possible in processor driver Thermal_Framework-Fix_crash_during_hwmon_unregister ACPICA: Update version to 20110211. ACPICA: Add mechanism to defer _REG methods for some installed handlers ACPICA: Add support for FunctionalFixedHW in acpi_ut_get_region_name ...
2011-03-24Merge branch 'for-linus' of ↵Linus Torvalds6-2/+20
git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: Blackfin: bf54x: re-enable anomaly 05000353 for all revs Blackfin: enable atomic64_t support Blackfin: wire up new syncfs syscall Blackfin: SMP: flush CoreB cache when shutting down
2011-03-24Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6Linus Torvalds7-20/+14
* 'for-linus' of git://git.infradead.org/ubi-2.6: UBIFS: fix assertion warning and refine comments UBIFS: kill CONFIG_UBIFS_FS_DEBUG_CHKS UBIFS: use GFP_NOFS properly UBI: use GFP_NOFS properly
2011-03-24Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linuxLinus Torvalds10-115/+135
* 'for-2.6.39' of git://linux-nfs.org/~bfields/linux: SUNRPC: Remove resource leak in svc_rdma_send_error() nfsd: wrong index used in inner loop nfsd4: fix comment and remove unused nfsd4_file fields nfs41: make sure nfs server return right ca_maxresponsesize_cached nfsd: fix compile error svcrpc: fix bad argument in unix_domain_find nfsd4: fix struct file leak nfsd4: minor nfs4state.c reshuffling svcrpc: fix rare race on unix_domain creation nfsd41: modify the members value of nfsd4_op_flags nfsd: add proc file listing kernel's gss_krb5 enctypes gss:krb5 only include enctype numbers in gm_upcall_enctypes NFSD, VFS: Remove dead code in nfsd_rename() nfsd: kill unused macro definition locks: use assign_type()
2011-03-24Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linusLinus Torvalds12-44/+145
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus: Squashfs: Use vmalloc rather than kmalloc for zlib workspace Squashfs: handle corruption of directory structure Squashfs: wrap squashfs_mount() definition Squashfs: xz_wrapper doesn't need to include squashfs_fs_i.h anymore Squashfs: Update documentation to include compression options Squashfs: Update Kconfig help text to include xz compression Squashfs: add compression options support to xz decompressor Squashfs: extend decompressor framework to handle compression options
2011-03-24Merge branch 'for-linus' of ↵Linus Torvalds7-252/+524
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB: Increase DMA max_segment_size on Mellanox hardware IB/mad: Improve an error message so error code is included RDMA/nes: Don't print success message at level KERN_ERR RDMA/addr: Fix return of uninitialized ret value IB/srp: try to use larger FMR sizes to cover our mappings IB/srp: add support for indirect tables that don't fit in SRP_CMD IB/srp: rework mapping engine to use multiple FMR entries IB/srp: allow sg_tablesize to be set for each target IB/srp: move IB CM setup completion into its own function IB/srp: always avoid non-zero offsets into an FMR
2011-03-24Merge branch 'for-next' of ↵Linus Torvalds110-785/+6059
git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (90 commits) mfd: Push byte swaps out of wm8994 bulk read path mfd: Rename ab8500 gpadc header mfd: Constify WM8994 write path mfd: Push byte swap out of WM8994 bulk I/O mfd: Avoid copying data in WM8994 I2C write mfd: Remove copy from WM831x I2C write function mfd: Staticise WM8994 PM ops regulator: Add a subdriver for TI TPS6105x regulator portions v2 mfd: Add a core driver for TI TPS61050/TPS61052 chips v2 gpio: Add Tunnel Creek support to sch_gpio mfd: Add Tunnel Creek support to lpc_sch pci_ids: Add Intel Tunnel Creek LPC Bridge device ID. regulator: MAX8997/8966 support mfd: Add WM8994 bulk register write operation mfd: Append additional read write on 88pm860x mfd: Adopt mfd_data in 88pm860x input driver mfd: Adopt mfd_data in 88pm860x regulator mfd: Adopt mfd_data in 88pm860x led mfd: Adopt mfd_data in 88pm860x backlight mfd: Fix MAX8997 Kconfig entry typos ...
2011-03-24Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osdLinus Torvalds7-65/+259
* 'for-linus' of git://git.open-osd.org/linux-open-osd: exofs: deprecate the commands pending counter exofs: Write sbi->s_nextid as part of the Create command exofs: Add option to mount by osdname exofs: Override read-ahead to align on stripe_size exofs: simple fsync race fix exofs: Optimize read_4_write exofs: Trivial: fix some indentation and debug prints exofs: Remove redundant unlikely()