Patched in Tegra support.

14 files changed, 128 insertions, 181 deletions

diff --git a/include/linux/ceph/auth.h b/include/linux/ceph/auth.h
index d4080f309b5..aa13392a7ef 100644
--- a/include/linux/ceph/auth.h
+++ b/include/linux/ceph/auth.h
@@ -14,14 +14,6 @@
 struct ceph_auth_client;
 struct ceph_authorizer;
 
-struct ceph_auth_handshake {
-        struct ceph_authorizer *authorizer;
-        void *authorizer_buf;
-        size_t authorizer_buf_len;
-        void *authorizer_reply_buf;
-        size_t authorizer_reply_buf_len;
-};
-
 struct ceph_auth_client_ops {
         const char *name;
 
@@ -51,7 +43,9 @@ struct ceph_auth_client_ops {
          * the response to authenticate the service.
          */
         int (*create_authorizer)(struct ceph_auth_client *ac, int peer_type,
-                                 struct ceph_auth_handshake *auth);
+                                 struct ceph_authorizer **a,
+                                 void **buf, size_t *len,
+                                 void **reply_buf, size_t *reply_len);
         int (*verify_authorizer_reply)(struct ceph_auth_client *ac,
                                        struct ceph_authorizer *a, size_t len);
         void (*destroy_authorizer)(struct ceph_auth_client *ac,
diff --git a/include/linux/ceph/ceph_features.h b/include/linux/ceph/ceph_features.h
deleted file mode 100644
index dad579b0c0e..00000000000
--- a/include/linux/ceph/ceph_features.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef __CEPH_FEATURES
-#define __CEPH_FEATURES
-
-/*
- * feature bits
- */
-#define CEPH_FEATURE_UID            (1<<0)
-#define CEPH_FEATURE_NOSRCADDR      (1<<1)
-#define CEPH_FEATURE_MONCLOCKCHECK  (1<<2)
-#define CEPH_FEATURE_FLOCK          (1<<3)
-#define CEPH_FEATURE_SUBSCRIBE2     (1<<4)
-#define CEPH_FEATURE_MONNAMES       (1<<5)
-#define CEPH_FEATURE_RECONNECT_SEQ  (1<<6)
-#define CEPH_FEATURE_DIRLAYOUTHASH  (1<<7)
-/* bits 8-17 defined by user-space; not supported yet here */
-#define CEPH_FEATURE_CRUSH_TUNABLES (1<<18)
-
-/*
- * Features supported.
- */
-#define CEPH_FEATURES_SUPPORTED_DEFAULT  \
-        (CEPH_FEATURE_NOSRCADDR |        \
-         CEPH_FEATURE_CRUSH_TUNABLES)
-
-#define CEPH_FEATURES_REQUIRED_DEFAULT   \
-        (CEPH_FEATURE_NOSRCADDR)
-#endif
diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h
index cf6f4d998a7..b8c60694b2b 100644
--- a/include/linux/ceph/ceph_fs.h
+++ b/include/linux/ceph/ceph_fs.h
@@ -12,8 +12,8 @@
 #ifndef CEPH_FS_H
 #define CEPH_FS_H
 
-#include <linux/ceph/msgr.h>
-#include <linux/ceph/rados.h>
+#include "msgr.h"
+#include "rados.h"
 
 /*
  * subprotocol versions.  when specific messages types or high-level
@@ -35,6 +35,20 @@
 /* arbitrary limit on max # of monitors (cluster of 3 is typical) */
 #define CEPH_MAX_MON   31
 
+
+/*
+ * feature bits
+ */
+#define CEPH_FEATURE_UID            (1<<0)
+#define CEPH_FEATURE_NOSRCADDR      (1<<1)
+#define CEPH_FEATURE_MONCLOCKCHECK  (1<<2)
+#define CEPH_FEATURE_FLOCK          (1<<3)
+#define CEPH_FEATURE_SUBSCRIBE2     (1<<4)
+#define CEPH_FEATURE_MONNAMES       (1<<5)
+#define CEPH_FEATURE_RECONNECT_SEQ  (1<<6)
+#define CEPH_FEATURE_DIRLAYOUTHASH  (1<<7)
+
+
 /*
  * ceph_file_layout - describe data layout for a file/inode
  */
@@ -51,7 +65,7 @@ struct ceph_file_layout {
         __le32 fl_object_stripe_unit;  /* UNUSED.  for per-object parity, if any */
 
         /* object -> pg layout */
-        __le32 fl_unused;       /* unused; used to be preferred primary (-1) */
+        __le32 fl_pg_preferred; /* preferred primary for pg (-1 for none) */
         __le32 fl_pg_pool;      /* namespace, crush ruleset, rep level */
 } __attribute__ ((packed));
 
@@ -370,7 +384,7 @@ union ceph_mds_request_args {
                 __le32 stripe_count;         /* ... */
                 __le32 object_size;
                 __le32 file_replication;
-                __le32 unused;               /* used to be preferred osd */
+                __le32 preferred;
         } __attribute__ ((packed)) open;
         struct {
                 __le32 flags;
diff --git a/include/linux/ceph/debugfs.h b/include/linux/ceph/debugfs.h
index 1df086d7882..2a79702e092 100644
--- a/include/linux/ceph/debugfs.h
+++ b/include/linux/ceph/debugfs.h
@@ -1,8 +1,8 @@
 #ifndef _FS_CEPH_DEBUGFS_H
 #define _FS_CEPH_DEBUGFS_H
 
-#include <linux/ceph/ceph_debug.h>
-#include <linux/ceph/types.h>
+#include "ceph_debug.h"
+#include "types.h"
 
 #define CEPH_DEFINE_SHOW_FUNC(name)                                     \
 static int name##_open(struct inode *inode, struct file *file)          \
diff --git a/include/linux/ceph/decode.h b/include/linux/ceph/decode.h
index 63d092822ba..c5b6939fb32 100644
--- a/include/linux/ceph/decode.h
+++ b/include/linux/ceph/decode.h
@@ -1,12 +1,10 @@
 #ifndef __CEPH_DECODE_H
 #define __CEPH_DECODE_H
 
-#include <linux/err.h>
-#include <linux/bug.h>
-#include <linux/time.h>
 #include <asm/unaligned.h>
+#include <linux/time.h>
 
-#include <linux/ceph/types.h>
+#include "types.h"
 
 /*
  * in all cases,
@@ -47,14 +45,9 @@ static inline void ceph_decode_copy(void **p, void *pv, size_t n)
 /*
  * bounds check input.
  */
-static inline int ceph_has_room(void **p, void *end, size_t n)
-{
-        return end >= *p && n <= end - *p;
-}
-
 #define ceph_decode_need(p, end, n, bad)                \
         do {                                            \
-                if (!likely(ceph_has_room(p, end, n)))  \
+                if (unlikely(*(p) + (n) > (end)))       \
                         goto bad;                       \
         } while (0)
 
@@ -86,52 +79,6 @@ static inline int ceph_has_room(void **p, void *end, size_t n)
         } while (0)
 
 /*
- * Allocate a buffer big enough to hold the wire-encoded string, and
- * decode the string into it.  The resulting string will always be
- * terminated with '\0'.  If successful, *p will be advanced
- * past the decoded data.  Also, if lenp is not a null pointer, the
- * length (not including the terminating '\0') will be recorded in
- * *lenp.  Note that a zero-length string is a valid return value.
- *
- * Returns a pointer to the newly-allocated string buffer, or a
- * pointer-coded errno if an error occurs.  Neither *p nor *lenp
- * will have been updated if an error is returned.
- *
- * There are two possible failures:
- *   - converting the string would require accessing memory at or
- *     beyond the "end" pointer provided (-E
- *   - memory could not be allocated for the result
- */
-static inline char *ceph_extract_encoded_string(void **p, void *end,
-                                                size_t *lenp, gfp_t gfp)
-{
-        u32 len;
-        void *sp = *p;
-        char *buf;
-
-        ceph_decode_32_safe(&sp, end, len, bad);
-        if (!ceph_has_room(&sp, end, len))
-                goto bad;
-
-        buf = kmalloc(len + 1, gfp);
-        if (!buf)
-                return ERR_PTR(-ENOMEM);
-
-        if (len)
-                memcpy(buf, sp, len);
-        buf[len] = '\0';
-
-        *p = (char *) *p + sizeof (u32) + len;
-        if (lenp)
-                *lenp = (size_t) len;
-
-        return buf;
-
-bad:
-        return ERR_PTR(-ERANGE);
-}
-
-/*
  * struct ceph_timespec <-> struct timespec
  */
 static inline void ceph_decode_timespec(struct timespec *ts,
@@ -198,7 +145,7 @@ static inline void ceph_encode_filepath(void **p, void *end,
                                         u64 ino, const char *path)
 {
         u32 len = path ? strlen(path) : 0;
-        BUG_ON(*p + 1 + sizeof(ino) + sizeof(len) + len > end);
+        BUG_ON(*p + sizeof(ino) + sizeof(len) + len > end);
         ceph_encode_8(p, 1);
         ceph_encode_64(p, ino);
         ceph_encode_32(p, len);
@@ -219,7 +166,7 @@ static inline void ceph_encode_string(void **p, void *end,
 
 #define ceph_encode_need(p, end, n, bad)                \
         do {                                            \
-                if (!likely(ceph_has_room(p, end, n)))  \
+                if (unlikely(*(p) + (n) > (end)))       \
                         goto bad;                       \
         } while (0)
 
diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
index 084d3c622b1..563755181c1 100644
--- a/include/linux/ceph/libceph.h
+++ b/include/linux/ceph/libceph.h
@@ -1,13 +1,12 @@
 #ifndef _FS_CEPH_LIBCEPH_H
 #define _FS_CEPH_LIBCEPH_H
 
-#include <linux/ceph/ceph_debug.h>
+#include "ceph_debug.h"
 
 #include <asm/unaligned.h>
 #include <linux/backing-dev.h>
 #include <linux/completion.h>
 #include <linux/exportfs.h>
-#include <linux/bug.h>
 #include <linux/fs.h>
 #include <linux/mempool.h>
 #include <linux/pagemap.h>
@@ -15,12 +14,18 @@
 #include <linux/writeback.h>
 #include <linux/slab.h>
 
-#include <linux/ceph/types.h>
-#include <linux/ceph/messenger.h>
-#include <linux/ceph/msgpool.h>
-#include <linux/ceph/mon_client.h>
-#include <linux/ceph/osd_client.h>
-#include <linux/ceph/ceph_fs.h>
+#include "types.h"
+#include "messenger.h"
+#include "msgpool.h"
+#include "mon_client.h"
+#include "osd_client.h"
+#include "ceph_fs.h"
+
+/*
+ * Supported features
+ */
+#define CEPH_FEATURE_SUPPORTED_DEFAULT CEPH_FEATURE_NOSRCADDR
+#define CEPH_FEATURE_REQUIRED_DEFAULT  CEPH_FEATURE_NOSRCADDR
 
 /*
  * mount options
@@ -43,6 +48,7 @@ struct ceph_options {
         struct ceph_entity_addr my_addr;
         int mount_timeout;
         int osd_idle_ttl;
+        int osd_timeout;
         int osd_keepalive_timeout;
 
         /*
@@ -62,6 +68,7 @@ struct ceph_options {
  * defaults
  */
 #define CEPH_MOUNT_TIMEOUT_DEFAULT  60
+#define CEPH_OSD_TIMEOUT_DEFAULT    60  /* seconds */
 #define CEPH_OSD_KEEPALIVE_DEFAULT  5
 #define CEPH_OSD_IDLE_TTL_DEFAULT    60
 
@@ -124,7 +131,7 @@ struct ceph_client {
         u32 supported_features;
         u32 required_features;
 
-        struct ceph_messenger msgr;   /* messenger instance */
+        struct ceph_messenger *msgr;   /* messenger instance */
         struct ceph_mon_client monc;
         struct ceph_osd_client osdc;
 
@@ -152,7 +159,7 @@ struct ceph_client {
 struct ceph_snap_context {
         atomic_t nref;
         u64 seq;
-        u32 num_snaps;
+        int num_snaps;
         u64 snaps[];
 };
 
@@ -200,7 +207,7 @@ extern struct kmem_cache *ceph_cap_cachep;
 extern struct kmem_cache *ceph_dentry_cachep;
 extern struct kmem_cache *ceph_file_cachep;
 
-extern struct ceph_options *ceph_parse_options(char *options,
+extern int ceph_parse_options(struct ceph_options **popt, char *options,
                               const char *dev_name, const char *dev_name_end,
                               int (*parse_extra_token)(char *c, void *private),
                               void *private);
@@ -208,9 +215,7 @@ extern void ceph_destroy_options(struct ceph_options *opt);
 extern int ceph_compare_options(struct ceph_options *new_opt,
                                 struct ceph_client *client);
 extern struct ceph_client *ceph_create_client(struct ceph_options *opt,
-                                              void *private,
-                                              unsigned supported_features,
-                                              unsigned required_features);
+                                              void *private);
 extern u64 ceph_client_id(struct ceph_client *client);
 extern void ceph_destroy_client(struct ceph_client *client);
 extern int __ceph_open_session(struct ceph_client *client,
diff --git a/include/linux/ceph/mdsmap.h b/include/linux/ceph/mdsmap.h
index cb15b5d867c..4c5cb0880bb 100644
--- a/include/linux/ceph/mdsmap.h
+++ b/include/linux/ceph/mdsmap.h
@@ -1,8 +1,7 @@
 #ifndef _FS_CEPH_MDSMAP_H
 #define _FS_CEPH_MDSMAP_H
 
-#include <linux/bug.h>
-#include <linux/ceph/types.h>
+#include "types.h"
 
 /*
  * mds map - describe servers in the mds cluster.
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h
index 14ba5ee738a..d7adf151d33 100644
--- a/include/linux/ceph/messenger.h
+++ b/include/linux/ceph/messenger.h
@@ -6,14 +6,17 @@
 #include <linux/net.h>
 #include <linux/radix-tree.h>
 #include <linux/uio.h>
+#include <linux/version.h>
 #include <linux/workqueue.h>
 
-#include <linux/ceph/types.h>
-#include <linux/ceph/buffer.h>
+#include "types.h"
+#include "buffer.h"
 
 struct ceph_msg;
 struct ceph_connection;
 
+extern struct workqueue_struct *ceph_msgr_wq;       /* receive work queue */
+
 /*
  * Ceph defines these callbacks for handling connection events.
  */
@@ -25,12 +28,15 @@ struct ceph_connection_operations {
         void (*dispatch) (struct ceph_connection *con, struct ceph_msg *m);
 
         /* authorize an outgoing connection */
-        struct ceph_auth_handshake *(*get_authorizer) (
-                                struct ceph_connection *con,
-                               int *proto, int force_new);
+        int (*get_authorizer) (struct ceph_connection *con,
+                               void **buf, int *len, int *proto,
+                               void **reply_buf, int *reply_len, int force_new);
         int (*verify_authorizer_reply) (struct ceph_connection *con, int len);
         int (*invalidate_authorizer)(struct ceph_connection *con);
 
+        /* protocol version mismatch */
+        void (*bad_proto) (struct ceph_connection *con);
+
         /* there was some error on the socket (disconnect, whatever) */
         void (*fault) (struct ceph_connection *con);
 
@@ -49,8 +55,8 @@ struct ceph_connection_operations {
 struct ceph_messenger {
         struct ceph_entity_inst inst;    /* my name+address */
         struct ceph_entity_addr my_enc_addr;
+        struct page *zero_page;          /* used in certain error cases */
 
-        atomic_t stopping;
         bool nocrc;
 
         /*
@@ -78,10 +84,7 @@ struct ceph_msg {
         unsigned nr_pages;              /* size of page array */
         unsigned page_alignment;        /* io offset in first page */
         struct ceph_pagelist *pagelist; /* instead of pages */
-
-        struct ceph_connection *con;
         struct list_head list_head;
-
         struct kref kref;
         struct bio  *bio;               /* instead of pages/pagelist */
         struct bio  *bio_iter;          /* bio iterator */
@@ -99,7 +102,7 @@ struct ceph_msg {
 struct ceph_msg_pos {
         int page, page_pos;  /* which page; offset in page */
         int data_pos;        /* offset in data payload */
-        bool did_page_crc;   /* true if we've calculated crc for current page */
+        int did_page_crc;    /* true if we've calculated crc for current page */
 };
 
 /* ceph connection fault delay defaults, for exponential backoff */
@@ -107,6 +110,23 @@ struct ceph_msg_pos {
 #define MAX_DELAY_INTERVAL      (5 * 60 * HZ)
 
 /*
+ * ceph_connection state bit flags
+ */
+#define LOSSYTX         0  /* we can close channel or drop messages on errors */
+#define CONNECTING      1
+#define NEGOTIATING     2
+#define KEEPALIVE_PENDING      3
+#define WRITE_PENDING   4  /* we have data ready to send */
+#define STANDBY         8  /* no outgoing messages, socket closed.  we keep
+                            * the ceph_connection around to maintain shared
+                            * state with the peer. */
+#define CLOSED          10 /* we've closed the connection */
+#define SOCK_CLOSED     11 /* socket state changed to closed */
+#define OPENING         13 /* open connection w/ (possibly new) peer */
+#define DEAD            14 /* dead, about to kfree */
+#define BACKOFF         15
+
+/*
  * A single connection with another host.
  *
  * We maintain a queue of outgoing messages, and some session state to
@@ -115,22 +135,18 @@ struct ceph_msg_pos {
  */
 struct ceph_connection {
         void *private;
+        atomic_t nref;
 
         const struct ceph_connection_operations *ops;
 
         struct ceph_messenger *msgr;
-
-        atomic_t sock_state;
         struct socket *sock;
-        struct ceph_entity_addr peer_addr; /* peer address */
-        struct ceph_entity_addr peer_addr_for_me;
-
-        unsigned long flags;
-        unsigned long state;
+        unsigned long state;    /* connection state (see flags above) */
         const char *error_msg;  /* error message, if any */
 
+        struct ceph_entity_addr peer_addr; /* peer address */
         struct ceph_entity_name peer_name; /* peer name */
-
+        struct ceph_entity_addr peer_addr_for_me;
         unsigned peer_features;
         u32 connect_seq;      /* identify the most recent connection
                                  attempt for this connection, client */
@@ -151,8 +167,16 @@ struct ceph_connection {
 
         /* connection negotiation temps */
         char in_banner[CEPH_BANNER_MAX_LEN];
-        struct ceph_msg_connect out_connect;
-        struct ceph_msg_connect_reply in_reply;
+        union {
+                struct {  /* outgoing connection */
+                        struct ceph_msg_connect out_connect;
+                        struct ceph_msg_connect_reply in_reply;
+                };
+                struct {  /* incoming */
+                        struct ceph_msg_connect in_connect;
+                        struct ceph_msg_connect_reply out_reply;
+                };
+        };
         struct ceph_entity_addr actual_peer_addr;
 
         /* message out temps */
@@ -195,29 +219,26 @@ extern int ceph_msgr_init(void);
 extern void ceph_msgr_exit(void);
 extern void ceph_msgr_flush(void);
 
-extern void ceph_messenger_init(struct ceph_messenger *msgr,
-                        struct ceph_entity_addr *myaddr,
-                        u32 supported_features,
-                        u32 required_features,
-                        bool nocrc);
+extern struct ceph_messenger *ceph_messenger_create(
+        struct ceph_entity_addr *myaddr,
+        u32 features, u32 required);
+extern void ceph_messenger_destroy(struct ceph_messenger *);
 
-extern void ceph_con_init(struct ceph_connection *con, void *private,
-                        const struct ceph_connection_operations *ops,
-                        struct ceph_messenger *msgr);
+extern void ceph_con_init(struct ceph_messenger *msgr,
+                          struct ceph_connection *con);
 extern void ceph_con_open(struct ceph_connection *con,
-                          __u8 entity_type, __u64 entity_num,
                           struct ceph_entity_addr *addr);
 extern bool ceph_con_opened(struct ceph_connection *con);
 extern void ceph_con_close(struct ceph_connection *con);
 extern void ceph_con_send(struct ceph_connection *con, struct ceph_msg *msg);
-
-extern void ceph_msg_revoke(struct ceph_msg *msg);
-extern void ceph_msg_revoke_incoming(struct ceph_msg *msg);
-
+extern void ceph_con_revoke(struct ceph_connection *con, struct ceph_msg *msg);
+extern void ceph_con_revoke_message(struct ceph_connection *con,
+                                  struct ceph_msg *msg);
 extern void ceph_con_keepalive(struct ceph_connection *con);
+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,
-                                     bool can_fail);
+extern struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags);
 extern void ceph_msg_kfree(struct ceph_msg *m);
 
 
diff --git a/include/linux/ceph/mon_client.h b/include/linux/ceph/mon_client.h
index a486f390dfb..545f8591778 100644
--- a/include/linux/ceph/mon_client.h
+++ b/include/linux/ceph/mon_client.h
@@ -5,7 +5,7 @@
 #include <linux/kref.h>
 #include <linux/rbtree.h>
 
-#include <linux/ceph/messenger.h>
+#include "messenger.h"
 
 struct ceph_client;
 struct ceph_mount_args;
@@ -70,7 +70,8 @@ struct ceph_mon_client {
         bool hunting;
         int cur_mon;                       /* last monitor i contacted */
         unsigned long sub_sent, sub_renew_after;
-        struct ceph_connection con;
+        struct ceph_connection *con;
+        bool have_fsid;
 
         /* pending generic requests */
         struct rb_root generic_request_tree;
diff --git a/include/linux/ceph/msgpool.h b/include/linux/ceph/msgpool.h
index 4b0d3896072..a362605f936 100644
--- a/include/linux/ceph/msgpool.h
+++ b/include/linux/ceph/msgpool.h
@@ -2,7 +2,7 @@
 #define _FS_CEPH_MSGPOOL
 
 #include <linux/mempool.h>
-#include <linux/ceph/messenger.h>
+#include "messenger.h"
 
 /*
  * we use memory pools for preallocating messages we may receive, to
@@ -11,11 +11,10 @@
 struct ceph_msgpool {
         const char *name;
         mempool_t *pool;
-        int type;               /* preallocated message type */
         int front_len;          /* preallocated payload size */
 };
 
-extern int ceph_msgpool_init(struct ceph_msgpool *pool, int type,
+extern int ceph_msgpool_init(struct ceph_msgpool *pool,
                              int front_len, int size, bool blocking,
                              const char *name);
 extern void ceph_msgpool_destroy(struct ceph_msgpool *pool);
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index d9b880e977e..f88eacb111d 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -6,16 +6,9 @@
 #include <linux/mempool.h>
 #include <linux/rbtree.h>
 
-#include <linux/ceph/types.h>
-#include <linux/ceph/osdmap.h>
-#include <linux/ceph/messenger.h>
-#include <linux/ceph/auth.h>
-
-/* 
- * Maximum object name size 
- * (must be at least as big as RBD_MAX_MD_NAME_LEN -- currently 100) 
- */
-#define MAX_OBJ_NAME_SIZE 100
+#include "types.h"
+#include "osdmap.h"
+#include "messenger.h"
 
 struct ceph_msg;
 struct ceph_snap_context;
@@ -41,7 +34,9 @@ struct ceph_osd {
         struct list_head o_requests;
         struct list_head o_linger_requests;
         struct list_head o_osd_lru;
-        struct ceph_auth_handshake o_auth;
+        struct ceph_authorizer *o_authorizer;
+        void *o_authorizer_buf, *o_authorizer_reply_buf;
+        size_t o_authorizer_buf_len, o_authorizer_reply_buf_len;
         unsigned long lru_ttl;
         int o_marked_for_keepalive;
         struct list_head o_keepalive_item;
@@ -80,7 +75,7 @@ struct ceph_osd_request {
         struct inode *r_inode;                /* for use by callbacks */
         void *r_priv;                         /* ditto */
 
-        char              r_oid[MAX_OBJ_NAME_SIZE];          /* object name */
+        char              r_oid[40];          /* object name */
         int               r_oid_len;
         unsigned long     r_stamp;            /* send OR check time */
 
@@ -207,7 +202,7 @@ extern void ceph_osdc_handle_reply(struct ceph_osd_client *osdc,
 extern void ceph_osdc_handle_map(struct ceph_osd_client *osdc,
                                  struct ceph_msg *msg);
 
-extern int ceph_calc_raw_layout(struct ceph_osd_client *osdc,
+extern void ceph_calc_raw_layout(struct ceph_osd_client *osdc,
                         struct ceph_file_layout *layout,
                         u64 snapid,
                         u64 off, u64 *plen, u64 *bno,
diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h
index 10a417f9f76..ba4c205cbb0 100644
--- a/include/linux/ceph/osdmap.h
+++ b/include/linux/ceph/osdmap.h
@@ -2,8 +2,8 @@
 #define _FS_CEPH_OSDMAP_H
 
 #include <linux/rbtree.h>
-#include <linux/ceph/types.h>
-#include <linux/ceph/ceph_fs.h>
+#include "types.h"
+#include "ceph_fs.h"
 #include <linux/crush/crush.h>
 
 /*
@@ -65,6 +65,8 @@ struct ceph_osdmap {
 #define ceph_file_layout_cas_hash(l) ((__s32)le32_to_cpu((l).fl_cas_hash))
 #define ceph_file_layout_object_su(l) \
         ((__s32)le32_to_cpu((l).fl_object_stripe_unit))
+#define ceph_file_layout_pg_preferred(l) \
+        ((__s32)le32_to_cpu((l).fl_pg_preferred))
 #define ceph_file_layout_pg_pool(l) \
         ((__s32)le32_to_cpu((l).fl_pg_pool))
 
@@ -109,9 +111,9 @@ extern struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
 extern void ceph_osdmap_destroy(struct ceph_osdmap *map);
 
 /* calculate mapping of a file extent to an object */
-extern int ceph_calc_file_object_mapping(struct ceph_file_layout *layout,
-                                         u64 off, u64 *plen,
-                                         u64 *bno, u64 *oxoff, u64 *oxlen);
+extern void ceph_calc_file_object_mapping(struct ceph_file_layout *layout,
+                                          u64 off, u64 *plen,
+                                          u64 *bno, u64 *oxoff, u64 *oxlen);
 
 /* calculate mapping of object to a placement group */
 extern int ceph_calc_object_layout(struct ceph_object_layout *ol,
@@ -123,7 +125,6 @@ extern int ceph_calc_pg_acting(struct ceph_osdmap *osdmap, struct ceph_pg pgid,
 extern int ceph_calc_pg_primary(struct ceph_osdmap *osdmap,
                                 struct ceph_pg pgid);
 
-extern const char *ceph_pg_pool_name_by_id(struct ceph_osdmap *map, u64 id);
 extern int ceph_pg_poolid_by_name(struct ceph_osdmap *map, const char *name);
 
 #endif
diff --git a/include/linux/ceph/rados.h b/include/linux/ceph/rados.h
index 2c04afeead1..0a99099801a 100644
--- a/include/linux/ceph/rados.h
+++ b/include/linux/ceph/rados.h
@@ -6,7 +6,7 @@
  * (Reliable Autonomic Distributed Object Store).
  */
 
-#include <linux/ceph/msgr.h>
+#include "msgr.h"
 
 /*
  * osdmap encoding versions
@@ -87,8 +87,6 @@ struct ceph_pg {
  *
  *  lpgp_num -- as above.
  */
-#define CEPH_NOPOOL  ((__u64) (-1))  /* pool id not defined */
-
 #define CEPH_PG_TYPE_REP     1
 #define CEPH_PG_TYPE_RAID4   2
 #define CEPH_PG_POOL_VERSION 2
diff --git a/include/linux/ceph/types.h b/include/linux/ceph/types.h
index d3ff1cf2d27..28b35a005ec 100644
--- a/include/linux/ceph/types.h
+++ b/include/linux/ceph/types.h
@@ -7,9 +7,9 @@
 #include <linux/fcntl.h>
 #include <linux/string.h>
 
-#include <linux/ceph/ceph_fs.h>
-#include <linux/ceph/ceph_frag.h>
-#include <linux/ceph/ceph_hash.h>
+#include "ceph_fs.h"
+#include "ceph_frag.h"
+#include "ceph_hash.h"
 
 /*
  * Identify inodes by both their ino AND snapshot id (a u64).