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:
  rbd: fix cleanup when trying to mount inexistent image
  net/ceph: make ceph_msgr_wq non-reentrant
  ceph: fsc->*_wq's aren't used in memory reclaim path
  ceph: Always free allocated memory in osdmap_decode()
  ceph: Makefile: Remove unnessary code
  ceph: associate requests with opening sessions
  ceph: drop redundant r_mds field
  ceph: implement DIRLAYOUTHASH feature to get dir layout from MDS
  ceph: add dir_layout to inode

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
index aabe563b54db..4e3a9cc0bba6 100644
--- a/fs/ceph/mds_client.h
+++ b/fs/ceph/mds_client.h
@@ -35,6 +35,7 @@ struct ceph_cap;
  */
 struct ceph_mds_reply_info_in {
         struct ceph_mds_reply_inode *in;
+        struct ceph_dir_layout dir_layout;
         u32 symlink_len;
         char *symlink;
         u32 xattr_len;
@@ -165,7 +166,6 @@ struct ceph_mds_request {
         struct ceph_mds_client *r_mdsc;
 
         int r_op;                    /* mds op code */
-        int r_mds;
 
         /* operation on what? */
         struct inode *r_inode;              /* arg1 */