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

Pull ceph updates from Sage Weil:
 "This is a big batch.  From Ilya we have:

   - rbd support for more than ~250 mapped devices (now uses same scheme
     that SCSI does for device major/minor numbering)
   - crush updates for new mapping behaviors (will be needed for coming
     erasure coding support, among other things)
   - preliminary support for tiered storage pools

  There is also a big series fixing a pile cephfs bugs with clustered
  MDSs from Yan Zheng, ACL support for cephfs from Guangliang Zhao, ceph
  fscache improvements from Li Wang, improved behavior when we get
  ENOSPC from Josh Durgin, some readv/writev improvements from
  Majianpeng, and the usual mix of small cleanups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (76 commits)
  ceph: cast PAGE_SIZE to size_t in ceph_sync_write()
  ceph: fix dout() compile warnings in ceph_filemap_fault()
  libceph: support CEPH_FEATURE_OSD_CACHEPOOL feature
  libceph: follow redirect replies from osds
  libceph: rename ceph_osd_request::r_{oloc,oid} to r_base_{oloc,oid}
  libceph: follow {read,write}_tier fields on osd request submission
  libceph: add ceph_pg_pool_by_id()
  libceph: CEPH_OSD_FLAG_* enum update
  libceph: replace ceph_calc_ceph_pg() with ceph_oloc_oid_to_pg()
  libceph: introduce and start using oid abstraction
  libceph: rename MAX_OBJ_NAME_SIZE to CEPH_MAX_OID_NAME_LEN
  libceph: move ceph_file_layout helpers to ceph_fs.h
  libceph: start using oloc abstraction
  libceph: dout() is missing a newline
  libceph: add ceph_kv{malloc,free}() and switch to them
  libceph: support CEPH_FEATURE_EXPORT_PEER
  ceph: add imported caps when handling cap export message
  ceph: add open export target session helper
  ceph: remove exported caps when handling cap import message
  ceph: handle session flush message
  ...

38 files changed, 2261 insertions, 679 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-rbd b/Documentation/ABI/testing/sysfs-bus-rbd
index 0a306476424e..501adc2a9ec7 100644
--- a/Documentation/ABI/testing/sysfs-bus-rbd
+++ b/Documentation/ABI/testing/sysfs-bus-rbd
@@ -18,6 +18,28 @@ Removal of a device:
 
   $ echo <dev-id> > /sys/bus/rbd/remove
 
+What:           /sys/bus/rbd/add_single_major
+Date:           December 2013
+KernelVersion:  3.14
+Contact:        Sage Weil <sage@inktank.com>
+Description:    Available only if rbd module is inserted with single_major
+                parameter set to true.
+                Usage is the same as for /sys/bus/rbd/add.  If present,
+                should be used instead of the latter: any attempts to use
+                /sys/bus/rbd/add if /sys/bus/rbd/add_single_major is
+                available will fail for backwards compatibility reasons.
+
+What:           /sys/bus/rbd/remove_single_major
+Date:           December 2013
+KernelVersion:  3.14
+Contact:        Sage Weil <sage@inktank.com>
+Description:    Available only if rbd module is inserted with single_major
+                parameter set to true.
+                Usage is the same as for /sys/bus/rbd/remove.  If present,
+                should be used instead of the latter: any attempts to use
+                /sys/bus/rbd/remove if /sys/bus/rbd/remove_single_major is
+                available will fail for backwards compatibility reasons.
+
 Entries under /sys/bus/rbd/devices/<dev-id>/
 --------------------------------------------
 
@@ -33,6 +55,10 @@ major
 
         The block device major number.
 
+minor
+
+        The block device minor number.  (December 2013, since 3.14.)
+
 name
 
         The name of the rbd image.
diff --git a/MAINTAINERS b/MAINTAINERS
index 2507f38b208f..9bf651c57806 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7075,7 +7075,7 @@ F:	drivers/media/parport/*-qcam*
 RADOS BLOCK DEVICE (RBD)
 M:      Yehuda Sadeh <yehuda@inktank.com>
 M:      Sage Weil <sage@inktank.com>
-M:      Alex Elder <elder@inktank.com>
+M:      Alex Elder <elder@kernel.org>
 M:      ceph-devel@vger.kernel.org
 W:      http://ceph.com/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index cb1db2979d3d..16cab6635163 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -41,6 +41,7 @@
 #include <linux/fs.h>
 #include <linux/blkdev.h>
 #include <linux/slab.h>
+#include <linux/idr.h>
 
 #include "rbd_types.h"
 
@@ -89,9 +90,9 @@ static int atomic_dec_return_safe(atomic_t *v)
 }
 
 #define RBD_DRV_NAME "rbd"
-#define RBD_DRV_NAME_LONG "rbd (rados block device)"
 
-#define RBD_MINORS_PER_MAJOR    256             /* max minors per blkdev */
+#define RBD_MINORS_PER_MAJOR            256
+#define RBD_SINGLE_MAJOR_PART_SHIFT     4
 
 #define RBD_SNAP_DEV_NAME_PREFIX        "snap_"
 #define RBD_MAX_SNAP_NAME_LEN   \
@@ -323,6 +324,7 @@ struct rbd_device {
         int                     dev_id;         /* blkdev unique id */
 
         int                     major;          /* blkdev assigned major */
+        int                     minor;
         struct gendisk          *disk;          /* blkdev's gendisk and rq */
 
         u32                     image_format;   /* Either 1 or 2 */
@@ -386,6 +388,17 @@ static struct kmem_cache	*rbd_img_request_cache;
 static struct kmem_cache        *rbd_obj_request_cache;
 static struct kmem_cache        *rbd_segment_name_cache;
 
+static int rbd_major;
+static DEFINE_IDA(rbd_dev_id_ida);
+
+/*
+ * Default to false for now, as single-major requires >= 0.75 version of
+ * userspace rbd utility.
+ */
+static bool single_major = false;
+module_param(single_major, bool, S_IRUGO);
+MODULE_PARM_DESC(single_major, "Use a single major number for all rbd devices (default: false)");
+
 static int rbd_img_request_submit(struct rbd_img_request *img_request);
 
 static void rbd_dev_device_release(struct device *dev);
@@ -394,18 +407,52 @@ static ssize_t rbd_add(struct bus_type *bus, const char *buf,
                        size_t count);
 static ssize_t rbd_remove(struct bus_type *bus, const char *buf,
                           size_t count);
+static ssize_t rbd_add_single_major(struct bus_type *bus, const char *buf,
+                                    size_t count);
+static ssize_t rbd_remove_single_major(struct bus_type *bus, const char *buf,
+                                       size_t count);
 static int rbd_dev_image_probe(struct rbd_device *rbd_dev, bool mapping);