Merge branch 'for-linus' of git://ceph.newdream.net/git/ceph-client

* 'for-linus' of git://ceph.newdream.net/git/ceph-client:
  libceph: fix double-free of page vector
  ceph: fix 32-bit ino numbers
  libceph: force resend of osd requests if we skip an osdmap
  ceph: use kernel DNS resolver
  ceph: fix ceph_monc_init memory leak
  ceph: let the set_layout ioctl set single traits
  Revert "ceph: don't truncate dirty pages in invalidate work thread"
  ceph: replace leading spaces with tabs
  libceph: warn on msg allocation failures
  libceph: don't complain on msgpool alloc failures
  libceph: always preallocate mon connection
  libceph: create messenger with client
  ceph: document ioctls
  ceph: implement (optional) max read size
  ceph: rename rsize -> rasize
  ceph: make readpages fully async

diff --combined drivers/block/rbd.c
index fe3c324,0b3c566..65cc424
--- 1/drivers/block/rbd.c
--- 2/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@@ -192,7 -192,7 +192,7 @@@ static ssize_t rbd_snap_add(struct devi
                            const char *buf,
                            size_t count);
  static void __rbd_remove_snap_dev(struct rbd_device *rbd_dev,
 -                                struct rbd_snap *snap);;
 +                                struct rbd_snap *snap);
  
  
  static struct rbd_device *dev_to_rbd(struct device *dev)
@@@ -260,7 -260,7 +260,7 @@@ static struct rbd_client *rbd_client_cr
        kref_init(&rbdc->kref);
        INIT_LIST_HEAD(&rbdc->node);
  
-       rbdc->client = ceph_create_client(opt, rbdc);
+       rbdc->client = ceph_create_client(opt, rbdc, 0, 0);
        if (IS_ERR(rbdc->client))
                goto out_rbdc;
        opt = NULL; /* Now rbdc->client is responsible for opt */

diff --combined include/linux/ceph/messenger.h
index ca768ae,bbd4a4b..ffbeb2c
--- 1/include/linux/ceph/messenger.h
--- 2/include/linux/ceph/messenger.h
+++ b/include/linux/ceph/messenger.h
@@@ -6,6 -6,7 +6,6 @@@
  #include <linux/net.h>
  #include <linux/radix-tree.h>
  #include <linux/uio.h>
 -#include <linux/version.h>
  #include <linux/workqueue.h>
  
  #include "types.h"
@@@ -237,7 -238,8 +237,8 @@@ extern void ceph_con_keepalive(struct c
  extern struct ceph_connection *ceph_con_get(struct ceph_connection *con);
  extern void ceph_con_put(struct ceph_connection *con);
  
- extern struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags);
+ extern struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags,
+                                    bool can_fail);
  extern void ceph_msg_kfree(struct ceph_msg *m);