rc = mdc_getattr_common(exp, req);
if (rc) {
- if (rc == -ERANGE &&
- acl_bufsize != imp->imp_connect_data.ocd_max_easize) {
- acl_bufsize = imp->imp_connect_data.ocd_max_easize;
+ if (rc == -ERANGE) {
+ acl_bufsize = MIN(imp->imp_connect_data.ocd_max_easize,
+ XATTR_SIZE_MAX);
mdc_reset_acl_req(req);
goto again;
}
rc = mdc_getattr_common(exp, req);
if (rc) {
- if (rc == -ERANGE &&
- acl_bufsize != imp->imp_connect_data.ocd_max_easize) {
- acl_bufsize = imp->imp_connect_data.ocd_max_easize;
+ if (rc == -ERANGE) {
+ acl_bufsize = MIN(imp->imp_connect_data.ocd_max_easize,
+ XATTR_SIZE_MAX);
mdc_reset_acl_req(req);
goto again;
}
u64 obd_md_valid, const char *name, size_t buf_size,
struct ptlrpc_request **req)
{
+ struct mdt_body *body;
+ int rc;
+
LASSERT(obd_md_valid == OBD_MD_FLXATTR ||
obd_md_valid == OBD_MD_FLXATTRLS);
- return mdc_xattr_common(exp, &RQF_MDS_GETXATTR, fid, MDS_GETXATTR,
- obd_md_valid, name, NULL, 0, buf_size, 0, -1,
- req);
+ rc = mdc_xattr_common(exp, &RQF_MDS_GETXATTR, fid, MDS_GETXATTR,
+ obd_md_valid, name, NULL, 0, buf_size, 0, -1,
+ req);
+ if (rc < 0)
+ GOTO(out, rc);
+
+ body = req_capsule_server_get(&(*req)->rq_pill, &RMF_MDT_BODY);
+ if (body == NULL)
+ GOTO(out, rc = -EPROTO);
+
+ /* only detect the xattr size */
+ if (buf_size == 0) {
+ /* LU-11109: Older MDTs do not distinguish
+ * between nonexistent xattrs and zero length
+ * values in this case. Newer MDTs will return
+ * -ENODATA or set OBD_MD_FLXATTR. */
+ GOTO(out, rc = body->mbo_eadatasize);
+ }
+
+ if (body->mbo_eadatasize == 0) {
+ /* LU-11109: Newer MDTs set OBD_MD_FLXATTR on
+ * success so that we can distinguish between
+ * zero length value and nonexistent xattr.
+ *
+ * If OBD_MD_FLXATTR is not set then we keep
+ * the old behavior and return -ENODATA for
+ * getxattr() when mbo_eadatasize is 0. But
+ * -ENODATA only makes sense for getxattr()
+ * and not for listxattr(). */
+ if (body->mbo_valid & OBD_MD_FLXATTR)
+ GOTO(out, rc = 0);
+ else if (obd_md_valid == OBD_MD_FLXATTR)
+ GOTO(out, rc = -ENODATA);
+ else
+ GOTO(out, rc = 0);
+ }
+
+ GOTO(out, rc = body->mbo_eadatasize);
+out:
+ if (rc < 0) {
+ ptlrpc_req_finished(*req);
+ *req = NULL;
+ }
+
+ return rc;
}
#ifdef CONFIG_FS_POSIX_ACL
void mdc_replay_open(struct ptlrpc_request *req)
{
- struct md_open_data *mod = req->rq_cb_data;
- struct ptlrpc_request *close_req;
- struct obd_client_handle *och;
- struct lustre_handle old;
- struct mdt_body *body;
- ENTRY;
+ struct md_open_data *mod = req->rq_cb_data;
+ struct ptlrpc_request *close_req;
+ struct obd_client_handle *och;
+ struct lustre_handle old_open_handle = { };
+ struct mdt_body *body;
+ ENTRY;
- if (mod == NULL) {
- DEBUG_REQ(D_ERROR, req,
- "Can't properly replay without open data.");
- EXIT;
- return;
- }
+ if (mod == NULL) {
+ DEBUG_REQ(D_ERROR, req,
+ "Can't properly replay without open data.");
+ EXIT;
+ return;
+ }
- body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
- LASSERT(body != NULL);
+ body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
+ LASSERT(body != NULL);
spin_lock(&req->rq_lock);
och = mod->mod_och;
- if (och && och->och_fh.cookie)
+ if (och && och->och_open_handle.cookie)
req->rq_early_free_repbuf = 1;
else
req->rq_early_free_repbuf = 0;
spin_unlock(&req->rq_lock);
if (req->rq_early_free_repbuf) {
- struct lustre_handle *file_fh;
+ struct lustre_handle *file_open_handle;
LASSERT(och->och_magic == OBD_CLIENT_HANDLE_MAGIC);
- file_fh = &och->och_fh;
+ file_open_handle = &och->och_open_handle;
CDEBUG(D_HA, "updating handle from %#llx to %#llx\n",
- file_fh->cookie, body->mbo_handle.cookie);
- old = *file_fh;
- *file_fh = body->mbo_handle;
+ file_open_handle->cookie, body->mbo_open_handle.cookie);
+ old_open_handle = *file_open_handle;
+ *file_open_handle = body->mbo_open_handle;
}
close_req = mod->mod_close_req;
LASSERT(epoch);
if (req->rq_early_free_repbuf)
- LASSERT(!memcmp(&old, &epoch->mio_handle, sizeof(old)));
+ LASSERT(old_open_handle.cookie ==
+ epoch->mio_open_handle.cookie);
DEBUG_REQ(D_HA, close_req, "updating close body with new fh");
- epoch->mio_handle = body->mbo_handle;
+ epoch->mio_open_handle = body->mbo_open_handle;
}
EXIT;
}
open_req->rq_commit_cb = mdc_commit_open;
open_req->rq_early_free_repbuf = 1;
spin_unlock(&open_req->rq_lock);
- }
+ }
rec->cr_fid2 = body->mbo_fid1;
- rec->cr_old_handle.cookie = body->mbo_handle.cookie;
+ rec->cr_open_handle_old = body->mbo_open_handle;
open_req->rq_replay_cb = mdc_replay_open;
if (!fid_is_sane(&body->mbo_fid1)) {
- DEBUG_REQ(D_ERROR, open_req, "Saving replay request with "
- "insane fid");
- LBUG();
- }
+ DEBUG_REQ(D_ERROR, open_req,
+ "saving replay request with insane FID " DFID,
+ PFID(&body->mbo_fid1));
+ LBUG();
+ }
- DEBUG_REQ(D_RPCTRACE, open_req, "Set up open replay data");
- RETURN(0);
+ DEBUG_REQ(D_RPCTRACE, open_req, "Set up open replay data");
+ RETURN(0);
}
static void mdc_free_open(struct md_open_data *mod)
spin_lock(&mod->mod_open_req->rq_lock);
if (mod->mod_och)
- mod->mod_och->och_fh.cookie = 0;
+ mod->mod_och->och_open_handle.cookie = 0;
mod->mod_open_req->rq_early_free_repbuf = 0;
spin_unlock(&mod->mod_open_req->rq_lock);
mdc_free_open(mod);
struct obd_export *exp, struct obd_statfs *osfs,
time64_t max_age, __u32 flags)
{
- struct obd_device *obd = class_exp2obd(exp);
- struct ptlrpc_request *req;
- struct obd_statfs *msfs;
- struct obd_import *imp = NULL;
- int rc;
- ENTRY;
+ struct obd_device *obd = class_exp2obd(exp);
+ struct req_format *fmt;
+ struct ptlrpc_request *req;
+ struct obd_statfs *msfs;
+ struct obd_import *imp = NULL;
+ int rc;
+ ENTRY;
/*
* Since the request might also come from lprocfs, so we need
* sync this with client_disconnect_export Bug15684
*/
down_read(&obd->u.cli.cl_sem);
- if (obd->u.cli.cl_import)
- imp = class_import_get(obd->u.cli.cl_import);
+ if (obd->u.cli.cl_import)
+ imp = class_import_get(obd->u.cli.cl_import);
up_read(&obd->u.cli.cl_sem);
- if (!imp)
- RETURN(-ENODEV);
+ if (!imp)
+ RETURN(-ENODEV);
+
+ fmt = &RQF_MDS_STATFS;
+ if ((exp_connect_flags2(exp) & OBD_CONNECT2_SUM_STATFS) &&
+ (flags & OBD_STATFS_SUM))
+ fmt = &RQF_MDS_STATFS_NEW;
+ req = ptlrpc_request_alloc_pack(imp, fmt, LUSTRE_MDS_VERSION,
+ MDS_STATFS);
+ if (req == NULL)
+ GOTO(output, rc = -ENOMEM);
- req = ptlrpc_request_alloc_pack(imp, &RQF_MDS_STATFS,
- LUSTRE_MDS_VERSION, MDS_STATFS);
- if (req == NULL)
- GOTO(output, rc = -ENOMEM);
+ if ((flags & OBD_STATFS_SUM) &&
+ (exp_connect_flags2(exp) & OBD_CONNECT2_SUM_STATFS)) {
+ /* request aggregated states */
+ struct mdt_body *body;
+
+ body = req_capsule_client_get(&req->rq_pill, &RMF_MDT_BODY);
+ if (body == NULL)
+ GOTO(out, rc = -EPROTO);
+ body->mbo_valid = OBD_MD_FLAGSTATFS;
+ }
ptlrpc_request_set_replen(req);
ptlrpc_req_finished(req);
return rc;
}
-
-static int mdc_ioc_hsm_ct_register(struct obd_import *imp, __u32 archives)
+/**
+ * Send hsm_ct_register to MDS
+ *
+ * \param[in] imp import
+ * \param[in] archive_count if in bitmap format, it is the bitmap,
+ * else it is the count of archive_ids
+ * \param[in] archives if in bitmap format, it is NULL,
+ * else it is archive_id lists
+ */
+static int mdc_ioc_hsm_ct_register(struct obd_import *imp, __u32 archive_count,
+ __u32 *archives)
{
- __u32 *archive_mask;
- struct ptlrpc_request *req;
- int rc;
+ struct ptlrpc_request *req;
+ __u32 *archive_array;
+ size_t archives_size;
+ int rc;
ENTRY;
- req = ptlrpc_request_alloc_pack(imp, &RQF_MDS_HSM_CT_REGISTER,
- LUSTRE_MDS_VERSION,
- MDS_HSM_CT_REGISTER);
+ req = ptlrpc_request_alloc(imp, &RQF_MDS_HSM_CT_REGISTER);
if (req == NULL)
- GOTO(out, rc = -ENOMEM);
+ RETURN(-ENOMEM);
+
+ if (archives != NULL)
+ archives_size = sizeof(*archive_array) * archive_count;
+ else
+ archives_size = sizeof(archive_count);
+
+ req_capsule_set_size(&req->rq_pill, &RMF_MDS_HSM_ARCHIVE,
+ RCL_CLIENT, archives_size);
+
+ rc = ptlrpc_request_pack(req, LUSTRE_MDS_VERSION, MDS_HSM_CT_REGISTER);
+ if (rc) {
+ ptlrpc_request_free(req);
+ RETURN(-ENOMEM);
+ }
mdc_pack_body(req, NULL, 0, 0, -1, 0);
- /* Copy hsm_progress struct */
- archive_mask = req_capsule_client_get(&req->rq_pill,
- &RMF_MDS_HSM_ARCHIVE);
- if (archive_mask == NULL)
+ archive_array = req_capsule_client_get(&req->rq_pill,
+ &RMF_MDS_HSM_ARCHIVE);
+ if (archive_array == NULL)
GOTO(out, rc = -EPROTO);
- *archive_mask = archives;
+ if (archives != NULL)
+ memcpy(archive_array, archives, archives_size);
+ else
+ *archive_array = archive_count;
ptlrpc_request_set_replen(req);
static int mdc_ioc_hsm_ct_start(struct obd_export *exp,
struct lustre_kernelcomm *lk)
{
- struct obd_import *imp = class_exp2cliimp(exp);
- __u32 archive = lk->lk_data;
- int rc = 0;
+ struct obd_import *imp = class_exp2cliimp(exp);
+ int rc = 0;
if (lk->lk_group != KUC_GRP_HSM) {
CERROR("Bad copytool group %d\n", lk->lk_group);
/* Unregister with the coordinator */
rc = mdc_ioc_hsm_ct_unregister(imp);
} else {
- rc = mdc_ioc_hsm_ct_register(imp, archive);
+ __u32 *archives = NULL;
+
+ if ((lk->lk_flags & LK_FLG_DATANR) && lk->lk_data_count > 0)
+ archives = lk->lk_data;
+
+ rc = mdc_ioc_hsm_ct_register(imp, lk->lk_data_count, archives);
}
return rc;
*/
static int mdc_hsm_ct_reregister(void *data, void *cb_arg)
{
- struct kkuc_ct_data *kcd = data;
- struct obd_import *imp = (struct obd_import *)cb_arg;
- int rc;
+ struct obd_import *imp = (struct obd_import *)cb_arg;
+ struct kkuc_ct_data *kcd = data;
+ __u32 *archives = NULL;
+ int rc;
- if (kcd == NULL || kcd->kcd_magic != KKUC_CT_DATA_MAGIC)
+ if (kcd == NULL ||
+ (kcd->kcd_magic != KKUC_CT_DATA_ARRAY_MAGIC &&
+ kcd->kcd_magic != KKUC_CT_DATA_BITMAP_MAGIC))
return -EPROTO;
- CDEBUG(D_HA, "%s: recover copytool registration to MDT (archive=%#x)\n",
- imp->imp_obd->obd_name, kcd->kcd_archive);
- rc = mdc_ioc_hsm_ct_register(imp, kcd->kcd_archive);
+ if (kcd->kcd_magic == KKUC_CT_DATA_BITMAP_MAGIC) {
+ CDEBUG(D_HA, "%s: recover copytool registration to MDT "
+ "(archive=%#x)\n", imp->imp_obd->obd_name,
+ kcd->kcd_nr_archives);
+ } else {
+ CDEBUG(D_HA, "%s: recover copytool registration to MDT "
+ "(archive nr = %u)\n",
+ imp->imp_obd->obd_name, kcd->kcd_nr_archives);
+ if (kcd->kcd_nr_archives != 0)
+ archives = kcd->kcd_archives;
+ }
+ rc = mdc_ioc_hsm_ct_register(imp, kcd->kcd_nr_archives, archives);
/* ignore error if the copytool is already registered */
return (rc == -EEXIST) ? 0 : rc;
}
if (lock->l_policy_data.l_inodebits.bits & MDS_INODELOCK_OPEN)
RETURN(0);
+ /* Special case for DoM locks, cancel only unused and granted locks */
+ if (ldlm_has_dom(lock) &&
+ (lock->l_granted_mode != lock->l_req_mode ||
+ osc_ldlm_weigh_ast(lock) != 0))
+ RETURN(0);
+
RETURN(1);
}
if (rc)
GOTO(err_osc_cleanup, rc);
+ obd->u.cli.cl_dom_min_inline_repsize = MDC_DOM_DEF_INLINE_REPSIZE;
+
ns_register_cancel(obd->obd_namespace, mdc_cancel_weight);
obd->obd_namespace->ns_lvbo = &inode_lvbo;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff