1 files changed, 21 insertions, 10 deletions
diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
index 9341fd4f1432..aabe563b54db 100644
--- a/fs/ceph/mds_client.h
+++ b/fs/ceph/mds_client.h
@@ -42,26 +42,37 @@ struct ceph_mds_reply_info_in {
 };
 /*
- * parsed info about an mds reply, including information about the
+ * parsed info about an mds reply, including information about
- * target inode and/or its parent directory and dentry, and directory
+ * either: 1) the target inode and/or its parent directory and dentry,
- * contents (for readdir results).
+ * and directory contents (for readdir results), or
+ * 2) the file range lock info (for fcntl F_GETLK results).
 */
 struct ceph_mds_reply_info_parsed {
        struct ceph_mds_reply_head    *head;
+        /* trace */
        struct ceph_mds_reply_info_in diri, targeti;
        struct ceph_mds_reply_dirfrag *dirfrag;
        char                          *dname;
        u32                           dname_len;
        struct ceph_mds_reply_lease   *dlease;
-        struct ceph_mds_reply_dirfrag *dir_dir;
+        /* extra */
-        int                           dir_nr;
+        union {
-        char                          **dir_dname;
+                /* for fcntl F_GETLK results */
-        u32                           *dir_dname_len;
+                struct ceph_filelock *filelock_reply;
-        struct ceph_mds_reply_lease   **dir_dlease;
-        struct ceph_mds_reply_info_in *dir_in;
+                /* for readdir results */
-        u8                            dir_complete, dir_end;
+                struct {
+                        struct ceph_mds_reply_dirfrag *dir_dir;
+                        int                           dir_nr;
+                        char                          **dir_dname;
+                        u32                           *dir_dname_len;
+                        struct ceph_mds_reply_lease   **dir_dlease;
+                        struct ceph_mds_reply_info_in *dir_in;
+                        u8                            dir_complete, dir_end;
+                };
+        };
        /* encoded blob describing snapshot contexts for certain
           operations (e.g., open) */

diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h index 9341fd4f1432..aabe563b54db 100644 --- a/fs/ceph/mds_client.h +++ b/fs/ceph/mds_client.h
@@ -42,26 +42,37 @@ struct ceph_mds_reply_info_in {
42	};	42	};
43		43
44	/*	44	/*
45	* parsed info about an mds reply, including information about the	45	* parsed info about an mds reply, including information about
46	* target inode and/or its parent directory and dentry, and directory	46	* either: 1) the target inode and/or its parent directory and dentry,
47	* contents (for readdir results).	47	* and directory contents (for readdir results), or
		48	* 2) the file range lock info (for fcntl F_GETLK results).
48	*/	49	*/
49	struct ceph_mds_reply_info_parsed {	50	struct ceph_mds_reply_info_parsed {
50	struct ceph_mds_reply_head *head;	51	struct ceph_mds_reply_head *head;
51		52
		53	/* trace */
52	struct ceph_mds_reply_info_in diri, targeti;	54	struct ceph_mds_reply_info_in diri, targeti;
53	struct ceph_mds_reply_dirfrag *dirfrag;	55	struct ceph_mds_reply_dirfrag *dirfrag;
54	char *dname;	56	char *dname;
55	u32 dname_len;	57	u32 dname_len;
56	struct ceph_mds_reply_lease *dlease;	58	struct ceph_mds_reply_lease *dlease;
57		59
58	struct ceph_mds_reply_dirfrag *dir_dir;	60	/* extra */
59	int dir_nr;	61	union {
60	char **dir_dname;	62	/* for fcntl F_GETLK results */
61	u32 *dir_dname_len;	63	struct ceph_filelock *filelock_reply;
62	struct ceph_mds_reply_lease **dir_dlease;	64
63	struct ceph_mds_reply_info_in *dir_in;	65	/* for readdir results */
64	u8 dir_complete, dir_end;	66	struct {
		67	struct ceph_mds_reply_dirfrag *dir_dir;
		68	int dir_nr;
		69	char **dir_dname;
		70	u32 *dir_dname_len;
		71	struct ceph_mds_reply_lease **dir_dlease;
		72	struct ceph_mds_reply_info_in *dir_in;
		73	u8 dir_complete, dir_end;
		74	};
		75	};
65		76
66	/* encoded blob describing snapshot contexts for certain	77	/* encoded blob describing snapshot contexts for certain
67	operations (e.g., open) */	78	operations (e.g., open) */