Alex Elder
913d2fdcf6
rbd: always pass ops array to rbd_req_sync_op() ...
All of the callers of rbd_req_sync_op() except one pass a non-null
"ops" pointer. The only one that does not is rbd_req_sync_read(),
which passes CEPH_OSD_OP_READ as its "opcode" and, CEPH_OSD_FLAG_READ
for "flags".
By allocating the ops array in rbd_req_sync_read() and moving the
special case code for the null ops pointer into it, it becomes
clear that much of that code is not even necessary.
In addition, the "opcode" argument to rbd_req_sync_op() is never
actually used, so get rid of that.
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2012-07-30 18:21:46 -07:00
x86, realmode: Unbreak the ia64 build of drivers/acpi/sleep.c
2012-05-30 10:12:48 -07:00
arm-soc: driver specific updates
2012-05-26 12:22:27 -07:00
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
solos-pci: Fix DMA support
2012-05-24 16:22:53 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-06-01 10:34:35 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-24 11:54:29 -07:00
rbd: always pass ops array to rbd_req_sync_op()
2012-07-30 18:21:46 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-24 11:54:29 -07:00
Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux
2012-05-24 12:42:54 -07:00
arm-soc: soc specific changes, part 2
2012-05-26 13:05:55 -07:00
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
Power management updates for 3.5
2012-05-23 14:07:06 -07:00
arm-soc: device tree conversions, part 2
2012-05-26 12:57:47 -07:00
Merge branch 'x86/trampoline' into x86/urgent
2012-05-30 12:11:32 -07:00
Driver core pull for 3.5-rc1
2012-05-22 16:02:13 -07:00
IEEE 1394 (FireWire) subsystem updates post v3.4:
2012-05-24 12:57:47 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-05-29 18:27:19 -07:00
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
2012-06-01 15:40:29 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
Driver core pull for 3.5-rc1
2012-05-22 16:02:13 -07:00
hwmon/sch56xx: Depend on watchdog for watchdog core functions
2012-05-30 07:56:20 +02:00
i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING
2012-05-30 10:55:34 +02:00
InfiniBand/RDMA changes for the 3.5 merge window:
2012-05-21 17:54:55 -07:00
i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING
2012-05-30 10:55:34 +02:00
IOMMU Updates for Linux 3.5
2012-05-30 08:49:28 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-24 11:54:29 -07:00
leds: add LM3533 LED driver
2012-05-29 16:22:32 -07:00
Improve multipath's retrying mechanism in some defined circumstances
2012-06-02 17:39:40 -07:00
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-05-31 18:10:18 -07:00
ARM: ux500: Provide regulator support for SMSC911x via Device Tree
2012-06-01 02:04:46 +02:00
MFD changes for 3.5
2012-05-29 11:53:11 -07:00
arm-soc: device tree conversions, part 2
2012-05-26 12:57:47 -07:00
- More robust parsing especially of xattr data in JFFS2
2012-06-01 16:55:42 -07:00
fec_mpc52xx: fix timestamp filtering
2012-06-02 17:09:08 -04:00
NFC: potential integer overflow problem in check_crc()
2012-05-25 11:16:16 -04:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-05-29 18:27:19 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
Driver core pull for 3.5-rc1
2012-05-22 16:02:13 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-05-29 18:27:19 -07:00
pinctrl-nomadik: Allow Device Tree driver probing
2012-06-01 02:03:25 +02:00
apple-gmux: Fix up the suspend/resume patch
2012-06-01 15:18:52 -04:00
A bunch of fixes for v3.5, nothing extraordinary.
2012-05-31 12:10:15 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
rapidio/tsi721: add DMA engine support
2012-05-31 17:49:31 -07:00
MFD changes for 3.5
2012-05-29 11:53:11 -07:00
IOMMU Updates for Linux 3.5
2012-05-30 08:49:28 -07:00
drivers/rtc/rtc-s3c.c: fix compiler warning
2012-05-29 16:22:34 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2012-05-31 10:51:10 -07:00
SCSI misc on 20120531
2012-05-31 12:02:41 -07:00
sh: intc: Kill off special reservation interface.
2012-05-22 19:07:55 +09:00
arm-soc: soc specific changes, part 2
2012-05-26 13:05:55 -07:00
mm/fs: route MADV_REMOVE to FALLOC_FL_PUNCH_HOLE
2012-05-29 16:22:22 -07:00
Merge branch 'sbp-target-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-05-23 16:52:27 -07:00
tty: Revert the tty locking series, it needs more work
2012-06-02 15:21:43 -07:00
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
fbdev updates for 3.5
2012-06-01 16:57:51 -07:00
virtio-mmio: Devices parameter parsing
2012-05-22 12:16:15 +09:30
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
watchdog: iTCO_wdt.c: fix printk format warnings
2012-05-30 08:16:48 +02:00
Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-05-29 20:14:53 -07:00
Staging tree pull request for 3.5-rc1
2012-05-22 16:34:21 -07:00
arm-soc: driver specific updates
2012-05-26 12:22:27 -07:00
913d2fdcf6