LU-3137 kerberos: GSSAPI broken due to library confusion

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

diff --git a/lustre/mdt/mdt_mds.c b/lustre/mdt/mdt_mds.c
index 4e5e7c5..4ec8a51 100644 (file)
--- a/lustre/mdt/mdt_mds.c
+++ b/lustre/mdt/mdt_mds.c
@@ -141,17 +141,17 @@ 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(0          | HABEO_REFERO, MDS_HSM_PROGRESS, mdt_hsm_progress),
-DEF_MDT_HDL(0          | HABEO_REFERO, MDS_HSM_CT_REGISTER,
+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(0          | HABEO_REFERO, MDS_HSM_CT_UNREGISTER,
+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(0          | HABEO_REFERO, MDS_HSM_REQUEST, mdt_hsm_request),
+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)
 };
 
@@ -429,9 +429,9 @@ static int mds_start_ptlrpc_service(struct mds_device *m)
                .psc_watchdog_factor    = MDT_SERVICE_WATCHDOG_FACTOR,
                .psc_buf                = {
                        .bc_nbufs               = MDS_NBUFS,
-                       .bc_buf_size            = MDS_BUFSIZE,
-                       .bc_req_max_size        = MDS_MAXREQSIZE,
-                       .bc_rep_max_size        = MDS_MAXREPSIZE,
+                       .bc_buf_size            = MDS_REG_BUFSIZE,
+                       .bc_req_max_size        = MDS_REG_MAXREQSIZE,
+                       .bc_rep_max_size        = MDS_REG_MAXREPSIZE,
                        .bc_req_portal          = MDS_REQUEST_PORTAL,
                        .bc_rep_portal          = MDC_REPLY_PORTAL,
                },
@@ -525,7 +525,7 @@ static int mds_start_ptlrpc_service(struct mds_device *m)
                        .bc_nbufs               = MDS_NBUFS,
                        .bc_buf_size            = MDS_BUFSIZE,
                        .bc_req_max_size        = MDS_MAXREQSIZE,
-                       .bc_rep_max_size        = MDS_MAXREPSIZE,
+                       .bc_rep_max_size        = MDS_LOV_MAXREPSIZE,
                        .bc_req_portal          = MDS_SETATTR_PORTAL,
                        .bc_rep_portal          = MDC_REPLY_PORTAL,
                },
@@ -563,9 +563,9 @@ static int mds_start_ptlrpc_service(struct mds_device *m)
                .psc_watchdog_factor    = MDT_SERVICE_WATCHDOG_FACTOR,
                .psc_buf                = {
                        .bc_nbufs               = MDS_NBUFS,
-                       .bc_buf_size            = MDS_BUFSIZE,
-                       .bc_req_max_size        = MDS_MAXREQSIZE,
-                       .bc_rep_max_size        = MDS_MAXREPSIZE,
+                       .bc_buf_size            = MDS_OUT_BUFSIZE,
+                       .bc_req_max_size        = MDS_OUT_MAXREQSIZE,
+                       .bc_rep_max_size        = MDS_OUT_MAXREPSIZE,
                        .bc_req_portal          = MDS_MDS_PORTAL,
                        .bc_rep_portal          = MDC_REPLY_PORTAL,
                },
@@ -609,7 +609,7 @@ static int mds_start_ptlrpc_service(struct mds_device *m)
                .psc_watchdog_factor    = MDT_SERVICE_WATCHDOG_FACTOR,
                .psc_buf                = {
                        .bc_nbufs               = MDS_NBUFS,
-                       .bc_buf_size            = MDS_BUFSIZE,
+                       .bc_buf_size            = SEQ_BUFSIZE,
                        .bc_req_max_size        = SEQ_MAXREQSIZE,
                        .bc_rep_max_size        = SEQ_MAXREPSIZE,
                        .bc_req_portal          = SEQ_CONTROLLER_PORTAL,
@@ -645,7 +645,7 @@ static int mds_start_ptlrpc_service(struct mds_device *m)
                .psc_watchdog_factor    = MDT_SERVICE_WATCHDOG_FACTOR,
                .psc_buf                = {
                        .bc_nbufs               = MDS_NBUFS,
-                       .bc_buf_size            = MDS_BUFSIZE,
+                       .bc_buf_size            = SEQ_BUFSIZE,
                        .bc_req_max_size        = SEQ_MAXREQSIZE,
                        .bc_rep_max_size        = SEQ_MAXREPSIZE,
                        .bc_req_portal          = SEQ_METADATA_PORTAL,
@@ -679,7 +679,7 @@ static int mds_start_ptlrpc_service(struct mds_device *m)
                .psc_watchdog_factor = MDT_SERVICE_WATCHDOG_FACTOR,
                .psc_buf                = {
                        .bc_nbufs               = MDS_NBUFS,
-                       .bc_buf_size            = MDS_BUFSIZE,
+                       .bc_buf_size            = FLD_BUFSIZE,
                        .bc_req_max_size        = FLD_MAXREQSIZE,
                        .bc_rep_max_size        = FLD_MAXREPSIZE,
                        .bc_req_portal          = FLD_REQUEST_PORTAL,