LU-3866 hsm: permission checks on HSM operations

[fs/lustre-release.git] / lustre / mdt / mdt_mds.c

diff --git a/lustre/mdt/mdt_mds.c b/lustre/mdt/mdt_mds.c
index 02f5643..8084dab 100644 (file)
--- a/lustre/mdt/mdt_mds.c
+++ b/lustre/mdt/mdt_mds.c
@@ -49,7 +49,6 @@
 /* lu2dt_dev() */
 #include <dt_object.h>
 #include <lustre_mds.h>
-#include <lustre_mdt.h>
 #include "mdt_internal.h"
 #include <lustre_quota.h>
 #include <lustre_acl.h>
@@ -140,18 +139,19 @@ DEF_MDT_HDL_VAR(0,                        MDS_SYNC,         mdt_sync),
 DEF_MDT_HDL(HABEO_CORPUS| HABEO_REFERO,        MDS_IS_SUBDIR,    mdt_is_subdir),
 DEF_MDT_HDL(0,                         MDS_QUOTACHECK,   mdt_quotacheck),
 DEF_MDT_HDL(0,                         MDS_QUOTACTL,     mdt_quotactl),
-DEF_MDT_HDL(HABEO_CORPUS| HABEO_REFERO, MDS_HSM_PROGRESS, mdt_hsm_progress),
-DEF_MDT_HDL(HABEO_CORPUS| HABEO_REFERO, MDS_HSM_CT_REGISTER,
-                                               mdt_hsm_ct_register),
-DEF_MDT_HDL(HABEO_CORPUS| HABEO_REFERO, MDS_HSM_CT_UNREGISTER,
-                                               mdt_hsm_ct_unregister),
-DEF_MDT_HDL(HABEO_CORPUS| HABEO_REFERO, MDS_HSM_STATE_GET,
-                                               mdt_hsm_state_get),
-DEF_MDT_HDL(HABEO_CORPUS| HABEO_REFERO, MDS_HSM_STATE_SET,
-                                               mdt_hsm_state_set),
-DEF_MDT_HDL(HABEO_CORPUS| HABEO_REFERO, MDS_HSM_ACTION, mdt_hsm_action),
-DEF_MDT_HDL(HABEO_CORPUS| HABEO_REFERO, MDS_HSM_REQUEST, mdt_hsm_request),
-DEF_MDT_HDL(HABEO_CORPUS|HABEO_REFERO, MDS_SWAP_LAYOUTS, mdt_swap_layouts)
+DEF_MDT_HDL(HABEO_CORPUS | HABEO_REFERO | MUTABOR, MDS_HSM_PROGRESS,
+           mdt_hsm_progress),
+DEF_MDT_HDL(HABEO_CORPUS | HABEO_REFERO | MUTABOR, MDS_HSM_CT_REGISTER,
+           mdt_hsm_ct_register),
+DEF_MDT_HDL(HABEO_CORPUS | HABEO_REFERO | MUTABOR, MDS_HSM_CT_UNREGISTER,
+           mdt_hsm_ct_unregister),
+DEF_MDT_HDL(HABEO_CORPUS | HABEO_REFERO, MDS_HSM_STATE_GET, mdt_hsm_state_get),
+DEF_MDT_HDL(HABEO_CORPUS | HABEO_REFERO | MUTABOR, MDS_HSM_STATE_SET,
+           mdt_hsm_state_set),
+DEF_MDT_HDL(HABEO_CORPUS | HABEO_REFERO, MDS_HSM_ACTION, mdt_hsm_action),
+DEF_MDT_HDL(HABEO_CORPUS | HABEO_REFERO, MDS_HSM_REQUEST, mdt_hsm_request),
+DEF_MDT_HDL(HABEO_CORPUS | HABEO_REFERO | MUTABOR, MDS_SWAP_LAYOUTS,
+           mdt_swap_layouts),
 };
 
 #define DEF_OBD_HDL(flags, name, fn)                                   \
@@ -269,44 +269,6 @@ static struct mdt_opc_slice mdt_readpage_handlers[] = {
        }
 };
 
-/* Sequence service handlers */
-#define DEF_SEQ_HDL(flags, name, fn)                                   \
-       DEFINE_RPC_HANDLER(SEQ_QUERY, flags, name, fn, &RQF_ ## name)
-
-static struct mdt_handler mdt_seq_ops[] = {
-DEF_SEQ_HDL(0,                         SEQ_QUERY,        (void *)seq_query),
-};
-
-struct mdt_opc_slice mdt_seq_handlers[] = {
-       {
-               .mos_opc_start = SEQ_QUERY,
-               .mos_opc_end   = SEQ_LAST_OPC,
-               .mos_hs = mdt_seq_ops
-       },
-       {
-               .mos_hs = NULL
-       }
-};
-
-/* FID Location Database handlers */
-#define DEF_FLD_HDL(flags, name, fn)                                   \
-       DEFINE_RPC_HANDLER(FLD_QUERY, flags, name, fn, &RQF_ ## name)
-
-static struct mdt_handler mdt_fld_ops[] = {
-DEF_FLD_HDL(0,                         FLD_QUERY,        (void *)fld_query),
-};
-
-struct mdt_opc_slice mdt_fld_handlers[] = {
-       {
-               .mos_opc_start = FLD_QUERY,
-               .mos_opc_end   = FLD_LAST_OPC,
-               .mos_hs = mdt_fld_ops
-       },
-       {
-               .mos_hs = NULL
-       }
-};
-
 static int mds_regular_handle(struct ptlrpc_request *req)
 {
        return mdt_handle_common(req, mdt_regular_handlers);
@@ -317,21 +279,6 @@ static int mds_readpage_handle(struct ptlrpc_request *req)
        return mdt_handle_common(req, mdt_readpage_handlers);
 }
 
-static int mds_mdsc_handle(struct ptlrpc_request *req)
-{
-       return mdt_handle_common(req, mdt_seq_handlers);
-}
-
-static int mds_mdss_handle(struct ptlrpc_request *req)
-{
-       return mdt_handle_common(req, mdt_seq_handlers);
-}
-
-static int mds_fld_handle(struct ptlrpc_request *req)
-{
-       return mdt_handle_common(req, mdt_fld_handlers);
-}
-
 /* device init/fini methods */
 static void mds_stop_ptlrpc_service(struct mds_device *m)
 {
@@ -576,7 +523,7 @@ static int mds_start_ptlrpc_service(struct mds_device *m)
                        .tc_ctx_tags            = LCT_MD_THREAD,
                },
                .psc_ops                = {
-                       .so_req_handler         = mds_mdsc_handle,
+                       .so_req_handler         = tgt_request_handle,
                        .so_req_printer         = target_print_req,
                        .so_hpreq_handler       = NULL,
                },
@@ -612,7 +559,7 @@ static int mds_start_ptlrpc_service(struct mds_device *m)
                        .tc_ctx_tags            = LCT_MD_THREAD | LCT_DT_THREAD
                },
                .psc_ops                = {
-                       .so_req_handler         = mds_mdss_handle,
+                       .so_req_handler         = tgt_request_handle,
                        .so_req_printer         = target_print_req,
                        .so_hpreq_handler       = NULL,
                },
@@ -643,10 +590,10 @@ static int mds_start_ptlrpc_service(struct mds_device *m)
                        .tc_thr_name            = LUSTRE_MDT_NAME "_fld",
                        .tc_nthrs_init          = MDS_OTHR_NTHRS_INIT,
                        .tc_nthrs_max           = MDS_OTHR_NTHRS_MAX,
-                       .tc_ctx_tags            = LCT_DT_THREAD | LCT_MD_THREAD
+                       .tc_ctx_tags            = LCT_DT_THREAD | LCT_MD_THREAD,
                },
                .psc_ops                = {
-                       .so_req_handler         = mds_fld_handle,
+                       .so_req_handler         = tgt_request_handle,
                        .so_req_printer         = target_print_req,
                        .so_hpreq_handler       = NULL,
                },