Merge remote-tracking branch 'regulator/fix/core' into regulator-linus

[karo-tx-linux.git] / fs / ceph / mds_client.h

diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
index e00737cf523c0ae237121fe0fdcef0d147b2d9f2..3288359353e9b84783a0d5ef65c06141398e625c 100644 (file)
--- a/fs/ceph/mds_client.h
+++ b/fs/ceph/mds_client.h
@@ -202,9 +202,7 @@ struct ceph_mds_request {
        bool r_direct_is_hash;  /* true if r_direct_hash is valid */
 
        /* data payload is used for xattr ops */
-       struct page **r_pages;
-       int r_num_pages;
-       int r_data_len;
+       struct ceph_pagelist *r_pagelist;
 
        /* what caps shall we drop? */
        int r_inode_drop, r_inode_unless;
@@ -332,6 +330,8 @@ ceph_get_mds_session(struct ceph_mds_session *s)
        return s;
 }
 
+extern const char *ceph_session_state_name(int s);
+
 extern void ceph_put_mds_session(struct ceph_mds_session *s);
 
 extern int ceph_send_msg_mds(struct ceph_mds_client *mdsc,