Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2017bd19 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (22 commits)
  ceph: do not carry i_lock for readdir from dcache
  fs/ceph/xattr.c: Use kmemdup
  rbd: passing wrong variable to bvec_kunmap_irq()
  rbd: null vs ERR_PTR
  ceph: fix num_pages_free accounting in pagelist
  ceph: add CEPH_MDS_OP_SETDIRLAYOUT and associated ioctl.
  ceph: don't crash when passed bad mount options
  ceph: fix debugfs warnings
  block: rbd: removing unnecessary test
  block: rbd: fixed may leaks
  ceph: switch from BKL to lock_flocks()
  ceph: preallocate flock state without locks held
  ceph: add pagelist_reserve, pagelist_truncate, pagelist_set_cursor
  ceph: use mapping->nrpages to determine if mapping is empty
  ceph: only invalidate on check_caps if we actually have pages
  ceph: do not hide .snap in root directory
  rbd: introduce rados block device (rbd), based on libceph
  ceph: factor out libceph from Ceph file system
  ceph-rbd: osdc support for osd call and rollback operations
  ceph: messenger and osdc changes for rbd
  ...
parents 9f1ad094 efa4c120

MAINTAINERS

+11 −0
Original line number Diff line number Diff line
@@ -1527,6 +1527,8 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git 
S:	Supported

F:	Documentation/filesystems/ceph.txt

F:	fs/ceph

F:	net/ceph

F:	include/linux/ceph



CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:

M:	David Vrabel <david.vrabel@csr.com>
@@ -4805,6 +4807,15 @@ F: fs/qnx4/ 
F:	include/linux/qnx4_fs.h

F:	include/linux/qnxtypes.h



RADOS BLOCK DEVICE (RBD)

F:	include/linux/qnxtypes.h

M:	Yehuda Sadeh <yehuda@hq.newdream.net>

M:	Sage Weil <sage@newdream.net>

M:	ceph-devel@vger.kernel.org

S:	Supported

F:	drivers/block/rbd.c

F:	drivers/block/rbd_types.h



RADEON FRAMEBUFFER DISPLAY DRIVER

M:	Benjamin Herrenschmidt <benh@kernel.crashing.org>

L:	linux-fbdev@vger.kernel.org

drivers/block/Kconfig

+17 −0
Original line number Diff line number Diff line
@@ -488,4 +488,21 @@ config BLK_DEV_HD 


	  If unsure, say N.



config BLK_DEV_RBD

	tristate "Rados block device (RBD)"

	depends on INET && EXPERIMENTAL && BLOCK

	select CEPH_LIB

	select LIBCRC32C

	select CRYPTO_AES

	select CRYPTO

	default n

	help

	  Say Y here if you want include the Rados block device, which stripes

	  a block device over objects stored in the Ceph distributed object

	  store.



	  More information at http://ceph.newdream.net/.



	  If unsure, say N.



endif # BLK_DEV

drivers/block/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -37,5 +37,6 @@ obj-$(CONFIG_BLK_DEV_HD) += hd.o 


obj-$(CONFIG_XEN_BLKDEV_FRONTEND)	+= xen-blkfront.o

obj-$(CONFIG_BLK_DEV_DRBD)     += drbd/

obj-$(CONFIG_BLK_DEV_RBD)     += rbd.o



swim_mod-objs	:= swim.o swim_asm.o