Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-5092 nodemap: save nodemaps to targets for caching
[fs/lustre-release.git]
/
lustre
/
include
/
lustre_nodemap.h
diff --git
a/lustre/include/lustre_nodemap.h
b/lustre/include/lustre_nodemap.h
index
685e1d8
..
44527a0
100644
(file)
--- a/
lustre/include/lustre_nodemap.h
+++ b/
lustre/include/lustre_nodemap.h
@@
-28,7
+28,6
@@
#define _LUSTRE_NODEMAP_H
#include <lustre/lustre_idl.h>
#define _LUSTRE_NODEMAP_H
#include <lustre/lustre_idl.h>
-#include <lustre/lustre_user.h>
#define LUSTRE_NODEMAP_NAME "nodemap"
#define LUSTRE_NODEMAP_NAME "nodemap"
@@
-65,6
+64,7
@@
struct lu_nodemap {
char nm_name[LUSTRE_NODEMAP_NAME_LENGTH + 1];
/* flags to govern nodemap behavior */
bool nmf_trust_client_ids:1,
char nm_name[LUSTRE_NODEMAP_NAME_LENGTH + 1];
/* flags to govern nodemap behavior */
bool nmf_trust_client_ids:1,
+ nmf_deny_unknown:1,
nmf_allow_root_access:1;
/* unique ID set by MGS */
unsigned int nm_id;
nmf_allow_root_access:1;
/* unique ID set by MGS */
unsigned int nm_id;
@@
-104,8
+104,9
@@
struct lu_nodemap {
* not be needed.
*/
struct nm_config_file {
* not be needed.
*/
struct nm_config_file {
- struct dt_object *ncf_obj;
- struct list_head ncf_list;
+ struct local_oid_storage *ncf_los;
+ struct dt_object *ncf_obj;
+ struct list_head ncf_list;
};
void nodemap_activate(const bool value);
};
void nodemap_activate(const bool value);
@@
-119,6
+120,7
@@
int nodemap_add_range(const char *name, const lnet_nid_t nid[2]);
int nodemap_del_range(const char *name, const lnet_nid_t nid[2]);
int nodemap_set_allow_root(const char *name, bool allow_root);
int nodemap_set_trust_client_ids(const char *name, bool trust_client_ids);
int nodemap_del_range(const char *name, const lnet_nid_t nid[2]);
int nodemap_set_allow_root(const char *name, bool allow_root);
int nodemap_set_trust_client_ids(const char *name, bool trust_client_ids);
+int nodemap_set_deny_unknown(const char *name, bool deny_unknown);
int nodemap_set_squash_uid(const char *name, uid_t uid);
int nodemap_set_squash_gid(const char *name, gid_t gid);
bool nodemap_can_setquota(const struct lu_nodemap *nodemap);
int nodemap_set_squash_uid(const char *name, uid_t uid);
int nodemap_set_squash_gid(const char *name, gid_t gid);
bool nodemap_can_setquota(const struct lu_nodemap *nodemap);
@@
-138,12
+140,20
@@
void nodemap_test_nid(lnet_nid_t nid, char *name_buf, size_t name_len);
#else
#define nodemap_test_nid(nid, name_buf, name_len) do {} while(0)
#endif
#else
#define nodemap_test_nid(nid, name_buf, name_len) do {} while(0)
#endif
-__u32 nodemap_test_id(lnet_nid_t nid, enum nodemap_id_type idtype,
- __u32 client_id);
+int nodemap_test_id(lnet_nid_t nid, enum nodemap_id_type idtype,
+ __u32 client_id, __u32 *fs_id);
+
+enum nm_config_file_type {
+ NCFT_MGS,
+ NCFT_TGT,
+};
struct nm_config_file *nm_config_file_register(const struct lu_env *env,
struct nm_config_file *nm_config_file_register(const struct lu_env *env,
- struct dt_object *obj);
+ struct dt_object *obj,
+ struct local_oid_storage *los,
+ enum nm_config_file_type ncf_type);
void nm_config_file_deregister(const struct lu_env *env,
void nm_config_file_deregister(const struct lu_env *env,
- struct nm_config_file *ncf);
+ struct nm_config_file *ncf,
+ enum nm_config_file_type ncf_type);
struct lu_nodemap *nodemap_get_from_exp(struct obd_export *exp);
void nodemap_putref(struct lu_nodemap *nodemap);
struct lu_nodemap *nodemap_get_from_exp(struct obd_export *exp);
void nodemap_putref(struct lu_nodemap *nodemap);
@@
-178,10
+188,15
@@
struct nodemap_config {
struct nodemap_config *nodemap_config_alloc(void);
void nodemap_config_dealloc(struct nodemap_config *config);
struct nodemap_config *nodemap_config_alloc(void);
void nodemap_config_dealloc(struct nodemap_config *config);
-void nodemap_config_set_active(struct nodemap_config *config);
+void nodemap_config_set_active
_mgc
(struct nodemap_config *config);
int nodemap_process_idx_pages(struct nodemap_config *config, union lu_page *lip,
struct lu_nodemap **recent_nodemap);
int nodemap_process_idx_pages(struct nodemap_config *config, union lu_page *lip,
struct lu_nodemap **recent_nodemap);
+
+struct dt_device;
+int nodemap_fs_init(const struct lu_env *env, struct dt_device *dev,
+ struct obd_device *obd, struct local_oid_storage *los);
+void nodemap_fs_fini(const struct lu_env *env, struct obd_device *obd);
#else /* disable nodemap processing in MGC of non-servers */
static inline int nodemap_process_idx_pages(void *config,
union lu_page *lip,
#else /* disable nodemap processing in MGC of non-servers */
static inline int nodemap_process_idx_pages(void *config,
union lu_page *lip,