projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ceph: fix uid/gid on resent mds requests
[firefly-linux-kernel-4.4.55.git]
/
fs
/
ceph
/
mds_client.h
diff --git
a/fs/ceph/mds_client.h
b/fs/ceph/mds_client.h
index c98267ce6d2ad97e1d9c86bc0660e2d82d39366c..9341fd4f14320060a395c37f81b4a67b01c020d7 100644
(file)
--- a/
fs/ceph/mds_client.h
+++ b/
fs/ceph/mds_client.h
@@
-8,9
+8,9
@@
#include <linux/rbtree.h>
#include <linux/spinlock.h>
#include <linux/rbtree.h>
#include <linux/spinlock.h>
-#include
"types.h"
-#include
"messenger.h"
-#include
"mdsmap.h"
+#include
<linux/ceph/types.h>
+#include
<linux/ceph/messenger.h>
+#include
<linux/ceph/mdsmap.h>
/*
* Some lock dependencies:
/*
* Some lock dependencies:
@@
-26,7
+26,7
@@
*
*/
*
*/
-struct ceph_client;
+struct ceph_
fs_
client;
struct ceph_cap;
/*
struct ceph_cap;
/*
@@
-170,6
+170,8
@@
struct ceph_mds_request {
union ceph_mds_request_args r_args;
int r_fmode; /* file mode, if expecting cap */
union ceph_mds_request_args r_args;
int r_fmode; /* file mode, if expecting cap */
+ uid_t r_uid;
+ gid_t r_gid;
/* for choosing which mds to send this request to */
int r_direct_mode;
/* for choosing which mds to send this request to */
int r_direct_mode;
@@
-230,7
+232,7
@@
struct ceph_mds_request {
* mds client state
*/
struct ceph_mds_client {
* mds client state
*/
struct ceph_mds_client {
- struct ceph_
client *client
;
+ struct ceph_
fs_client *fsc
;
struct mutex mutex; /* all nested structures */
struct ceph_mdsmap *mdsmap;
struct mutex mutex; /* all nested structures */
struct ceph_mdsmap *mdsmap;
@@
-289,11
+291,6
@@
struct ceph_mds_client {
int caps_avail_count; /* unused, unreserved */
int caps_min_count; /* keep at least this many
(unreserved) */
int caps_avail_count; /* unused, unreserved */
int caps_min_count; /* keep at least this many
(unreserved) */
-
-#ifdef CONFIG_DEBUG_FS
- struct dentry *debugfs_file;
-#endif
-
spinlock_t dentry_lru_lock;
struct list_head dentry_lru;
int num_dentry;
spinlock_t dentry_lru_lock;
struct list_head dentry_lru;
int num_dentry;
@@
-316,10
+313,9
@@
extern void ceph_put_mds_session(struct ceph_mds_session *s);
extern int ceph_send_msg_mds(struct ceph_mds_client *mdsc,
struct ceph_msg *msg, int mds);
extern int ceph_send_msg_mds(struct ceph_mds_client *mdsc,
struct ceph_msg *msg, int mds);
-extern int ceph_mdsc_init(struct ceph_mds_client *mdsc,
- struct ceph_client *client);
+extern int ceph_mdsc_init(struct ceph_fs_client *fsc);
extern void ceph_mdsc_close_sessions(struct ceph_mds_client *mdsc);
extern void ceph_mdsc_close_sessions(struct ceph_mds_client *mdsc);
-extern void ceph_mdsc_
stop(struct ceph_mds_client *md
sc);
+extern void ceph_mdsc_
destroy(struct ceph_fs_client *f
sc);
extern void ceph_mdsc_sync(struct ceph_mds_client *mdsc);
extern void ceph_mdsc_sync(struct ceph_mds_client *mdsc);