X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_open.c;h=bdda659ab2d1932ffda073ef6a87aa561618205a;hp=9ced5bbd4f30d9fdce994590f48eeb19ab7060cf;hb=f625f670afbe954030ff81f0f8522137d6cdd335;hpb=29c75754814f391682a96c44715cfa4b1f21354c diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c index 9ced5bb..bdda659 100644 --- a/lustre/mdt/mdt_open.c +++ b/lustre/mdt/mdt_open.c @@ -27,7 +27,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2013, Intel Corporation. + * Copyright (c) 2011, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -45,6 +45,7 @@ #include #include #include "mdt_internal.h" +#include /* we do nothing because we do not have refcount now */ static void mdt_mfd_get(void *mfdp) @@ -65,9 +66,9 @@ struct mdt_file_data *mdt_mfd_new(const struct mdt_export_data *med) OBD_ALLOC_PTR(mfd); if (mfd != NULL) { - CFS_INIT_LIST_HEAD(&mfd->mfd_handle.h_link); + INIT_LIST_HEAD(&mfd->mfd_handle.h_link); mfd->mfd_handle.h_owner = med; - CFS_INIT_LIST_HEAD(&mfd->mfd_list); + INIT_LIST_HEAD(&mfd->mfd_list); class_handle_hash(&mfd->mfd_handle, &mfd_handle_ops); } @@ -77,7 +78,8 @@ struct mdt_file_data *mdt_mfd_new(const struct mdt_export_data *med) /* * Find the mfd pointed to by handle in global hash table. * In case of replay the handle is obsoleted - * but mfd can be found in mfd list by that handle + * but mfd can be found in mfd list by that handle. + * Callers need to be holding med_open_lock. */ struct mdt_file_data *mdt_handle2mfd(struct mdt_export_data *med, const struct lustre_handle *handle, @@ -90,7 +92,7 @@ struct mdt_file_data *mdt_handle2mfd(struct mdt_export_data *med, mfd = class_handle2object(handle->cookie, med); /* during dw/setattr replay the mfd can be found by old handle */ if (mfd == NULL && is_replay_or_resent) { - cfs_list_for_each_entry(mfd, &med->med_open_head, mfd_list) { + list_for_each_entry(mfd, &med->med_open_head, mfd_list) { if (mfd->mfd_old_handle.cookie == handle->cookie) RETURN(mfd); } @@ -103,8 +105,8 @@ struct mdt_file_data *mdt_handle2mfd(struct mdt_export_data *med, /* free mfd */ void mdt_mfd_free(struct mdt_file_data *mfd) { - LASSERT(cfs_list_empty(&mfd->mfd_list)); - OBD_FREE_RCU(mfd, sizeof *mfd, &mfd->mfd_handle); + LASSERT(list_empty(&mfd->mfd_list)); + OBD_FREE_RCU(mfd, sizeof *mfd, &mfd->mfd_handle); } static int mdt_create_data(struct mdt_thread_info *info, @@ -122,10 +124,6 @@ static int mdt_create_data(struct mdt_thread_info *info, ma->ma_valid = 0; mutex_lock(&o->mot_lov_mutex); if (!(o->mot_flags & MOF_LOV_CREATED)) { - if (p != NULL && (fid_is_obf(mdt_object_fid(p)) || - fid_is_dot_lustre(mdt_object_fid(p)))) - GOTO(unlock, rc = -EPERM); - rc = mdo_create_data(info->mti_env, p ? mdt_object_child(p) : NULL, mdt_object_child(o), spec, ma); @@ -135,434 +133,64 @@ static int mdt_create_data(struct mdt_thread_info *info, if (rc == 0 && ma->ma_valid & MA_LOV) o->mot_flags |= MOF_LOV_CREATED; } -unlock: + mutex_unlock(&o->mot_lov_mutex); RETURN(rc); } -static int mdt_ioepoch_opened(struct mdt_object *mo) -{ - return mo->mot_ioepoch_count; -} - -int mdt_object_is_som_enabled(struct mdt_object *mo) -{ - return !mo->mot_ioepoch; -} - -/** - * Re-enable Size-on-MDS. - * Call under ->mot_ioepoch_mutex. - */ -static void mdt_object_som_enable(struct mdt_object *mo, __u64 ioepoch) -{ - if (ioepoch == mo->mot_ioepoch) { - LASSERT(!mdt_ioepoch_opened(mo)); - mo->mot_ioepoch = 0; - mo->mot_flags = 0; - } -} - -/** - * Open the IOEpoch. It is allowed if @writecount is not negative. - * The epoch and writecount handling is performed under the mot_ioepoch_mutex. - */ -int mdt_ioepoch_open(struct mdt_thread_info *info, struct mdt_object *o, - int created) -{ - struct mdt_device *mdt = info->mti_mdt; - int cancel = 0; - int rc = 0; - ENTRY; - - if (!(mdt_conn_flags(info) & OBD_CONNECT_SOM) || - !S_ISREG(lu_object_attr(&o->mot_obj))) - RETURN(0); - - mutex_lock(&o->mot_ioepoch_mutex); - if (mdt_ioepoch_opened(o)) { - /* Epoch continues even if there is no writers yet. */ - CDEBUG(D_INODE, "continue epoch "LPU64" for "DFID"\n", - o->mot_ioepoch, PFID(mdt_object_fid(o))); - } else { - /* XXX: ->mdt_ioepoch is not initialized at the mount */ - spin_lock(&mdt->mdt_ioepoch_lock); - if (mdt->mdt_ioepoch < info->mti_replayepoch) - mdt->mdt_ioepoch = info->mti_replayepoch; - - if (info->mti_replayepoch) - o->mot_ioepoch = info->mti_replayepoch; - else if (++mdt->mdt_ioepoch == IOEPOCH_INVAL) - o->mot_ioepoch = ++mdt->mdt_ioepoch; - else - o->mot_ioepoch = mdt->mdt_ioepoch; - - spin_unlock(&mdt->mdt_ioepoch_lock); - - CDEBUG(D_INODE, "starting epoch "LPU64" for "DFID"\n", - o->mot_ioepoch, PFID(mdt_object_fid(o))); - if (created) - o->mot_flags |= MOF_SOM_CREATED; - cancel = 1; - } - o->mot_ioepoch_count++; - mutex_unlock(&o->mot_ioepoch_mutex); - - /* Cancel Size-on-MDS attributes cached on clients for the open case. - * In the truncate case, see mdt_reint_setattr(). */ - if (cancel && (info->mti_rr.rr_fid1 != NULL)) { - struct mdt_lock_handle *lh = &info->mti_lh[MDT_LH_CHILD]; - mdt_lock_reg_init(lh, LCK_EX); - rc = mdt_object_lock(info, o, lh, MDS_INODELOCK_UPDATE, - MDT_LOCAL_LOCK); - if (rc == 0) - mdt_object_unlock(info, o, lh, 1); - } - RETURN(rc); -} - -/** - * Update SOM on-disk attributes. - * If enabling, write update inodes and lustre-ea with the proper IOEpoch, - * mountid and attributes. If disabling, clean SOM xattr. - * Call under ->mot_ioepoch_mutex. - */ -static int mdt_som_attr_set(struct mdt_thread_info *info, - struct mdt_object *obj, __u64 ioepoch, bool enable) -{ - struct md_object *next = mdt_object_child(obj); - int rc; - ENTRY; - - CDEBUG(D_INODE, "Size-on-MDS attribute %s for epoch "LPU64 - " on "DFID".\n", enable ? "update" : "disabling", - ioepoch, PFID(mdt_object_fid(obj))); - - if (enable) { - struct lu_buf *buf = &info->mti_buf; - struct som_attrs *attrs; - struct md_attr *ma = &info->mti_attr; - struct lu_attr *la = &ma->ma_attr; - struct obd_device *obd = info->mti_mdt->mdt_lut.lut_obd; - - attrs = (struct som_attrs *)info->mti_xattr_buf; - CLASSERT(sizeof(info->mti_xattr_buf) >= sizeof(*attrs)); - - /* pack SOM attributes */ - memset(attrs, 0, sizeof(*attrs)); - attrs->som_ioepoch = ioepoch; - attrs->som_mountid = obd->u.obt.obt_mount_count; - if ((la->la_valid & LA_SIZE) != 0) - attrs->som_size = la->la_size; - if ((la->la_valid & LA_BLOCKS) != 0) - attrs->som_blocks = la->la_blocks; - lustre_som_swab(attrs); - - /* update SOM attributes */ - buf->lb_buf = attrs; - buf->lb_len = sizeof(*attrs); - rc = mo_xattr_set(info->mti_env, next, buf, XATTR_NAME_SOM, 0); - } else { - /* delete SOM attributes */ - rc = mo_xattr_del(info->mti_env, next, XATTR_NAME_SOM); - } - - RETURN(rc); -} - -/** Perform the eviction specific actions on ioepoch close. */ -static inline int mdt_ioepoch_close_on_eviction(struct mdt_thread_info *info, - struct mdt_object *o) -{ - int rc = 0; - - mutex_lock(&o->mot_ioepoch_mutex); - CDEBUG(D_INODE, "Eviction. Closing IOepoch "LPU64" on "DFID". " - "Count %d\n", o->mot_ioepoch, PFID(mdt_object_fid(o)), - o->mot_ioepoch_count); - o->mot_ioepoch_count--; - - /* If eviction occured set MOF_SOM_RECOV, - * if no other epoch holders, disable SOM on disk. */ - o->mot_flags |= MOF_SOM_CHANGE | MOF_SOM_RECOV; - if (!mdt_ioepoch_opened(o)) { - rc = mdt_som_attr_set(info, o, o->mot_ioepoch, MDT_SOM_DISABLE); - mdt_object_som_enable(o, o->mot_ioepoch); - } - mutex_unlock(&o->mot_ioepoch_mutex); - RETURN(rc); -} - -/** - * Perform the replay specific actions on ioepoch close. - * Skip SOM attribute update if obtained and just forget about the inode state - * for the last ioepoch holder. The SOM cache is invalidated on MDS failure. - */ -static inline int mdt_ioepoch_close_on_replay(struct mdt_thread_info *info, - struct mdt_object *o) -{ - int rc = MDT_IOEPOCH_CLOSED; - ENTRY; - - mutex_lock(&o->mot_ioepoch_mutex); - CDEBUG(D_INODE, "Replay. Closing epoch "LPU64" on "DFID". Count %d\n", - o->mot_ioepoch, PFID(mdt_object_fid(o)), o->mot_ioepoch_count); - o->mot_ioepoch_count--; - - /* Get an info from the replayed request if client is supposed - * to send an Attibute Update, reconstruct @rc if so */ - if (info->mti_ioepoch->flags & MF_SOM_AU) - rc = MDT_IOEPOCH_GETATTR; - - if (!mdt_ioepoch_opened(o)) - mdt_object_som_enable(o, info->mti_ioepoch->ioepoch); - mutex_unlock(&o->mot_ioepoch_mutex); - - RETURN(rc); -} - -/** - * Regular file IOepoch close. - * Closes the ioepoch, checks the object state, apply obtained attributes and - * re-enable SOM on the object, if possible. Also checks if the recovery is - * needed and packs OBD_MD_FLGETATTRLOCK flag into the reply to force the client - * to obtain SOM attributes under the server-side OST locks. - * - * Return value: - * MDT_IOEPOCH_CLOSED if ioepoch is closed. - * MDT_IOEPOCH_GETATTR if ioepoch is closed but another SOM update is needed. - */ -static inline int mdt_ioepoch_close_reg(struct mdt_thread_info *info, - struct mdt_object *o) -{ - struct md_attr *tmp_ma; - struct lu_attr *la; - int achange, opened; - int recovery = 0; - int rc = 0, ret = MDT_IOEPOCH_CLOSED; - ENTRY; - - la = &info->mti_attr.ma_attr; - achange = (info->mti_ioepoch->flags & MF_SOM_CHANGE); - - mutex_lock(&o->mot_ioepoch_mutex); - o->mot_ioepoch_count--; - - tmp_ma = &info->mti_u.som.attr; - tmp_ma->ma_lmm = info->mti_attr.ma_lmm; - tmp_ma->ma_lmm_size = info->mti_attr.ma_lmm_size; - tmp_ma->ma_som = &info->mti_u.som.data; - tmp_ma->ma_need = MA_INODE | MA_LOV | MA_SOM; - tmp_ma->ma_valid = 0; - rc = mdt_attr_get_complex(info, o, tmp_ma); - if (rc) - GOTO(error_up, rc); - - /* Check the on-disk SOM state. */ - if (o->mot_flags & MOF_SOM_RECOV) - recovery = 1; - else if (!(o->mot_flags & MOF_SOM_CREATED) && - !(tmp_ma->ma_valid & MA_SOM)) - recovery = 1; - - CDEBUG(D_INODE, "Closing epoch "LPU64" on "DFID". Count %d\n", - o->mot_ioepoch, PFID(mdt_object_fid(o)), o->mot_ioepoch_count); - - opened = mdt_ioepoch_opened(o); - /** - * If IOEpoch is not opened, check if a Size-on-MDS update is needed. - * Skip the check for file with no LOV or for unlink files. - */ - if (!opened && tmp_ma->ma_valid & MA_LOV && - !(tmp_ma->ma_valid & MA_INODE && tmp_ma->ma_attr.la_nlink == 0)) { - if (recovery) - /* If some previous writer was evicted, re-ask the - * client for attributes. Even if attributes are - * provided, we cannot believe in them. - * Another use case is that there is no SOM cache on - * disk -- first access with SOM or there was an MDS - * failure. */ - ret = MDT_IOEPOCH_GETATTR; - else if (o->mot_flags & MOF_SOM_CHANGE) - /* Some previous writer changed the attribute. - * Do not believe to the current Size-on-MDS - * update, re-ask client. */ - ret = MDT_IOEPOCH_GETATTR; - else if (!(la->la_valid & LA_SIZE) && achange) - /* Attributes were changed by the last writer - * only but no Size-on-MDS update is received.*/ - ret = MDT_IOEPOCH_GETATTR; - } - - if (achange || ret == MDT_IOEPOCH_GETATTR) - o->mot_flags |= MOF_SOM_CHANGE; - - /* If epoch ends and relable SOM attributes are obtained, update them. - * Create SOM ea for new files even if there is no attributes obtained - * (0-length file). */ - if (ret == MDT_IOEPOCH_CLOSED && !opened) { - if (achange || o->mot_flags & MOF_SOM_CREATED) { - LASSERT(achange || !(la->la_valid & LA_SIZE)); - rc = mdt_som_attr_set(info, o, o->mot_ioepoch, - MDT_SOM_ENABLE); - /* Avoid the following setattrs of these attributes, - * e.g. for atime update. */ - info->mti_attr.ma_valid = 0; - } - mdt_object_som_enable(o, o->mot_ioepoch); - } - - mutex_unlock(&o->mot_ioepoch_mutex); - /* If recovery is needed, tell the client to perform GETATTR under - * the lock. */ - if (ret == MDT_IOEPOCH_GETATTR && recovery) { - struct mdt_body *rep; - rep = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY); - rep->valid |= OBD_MD_FLGETATTRLOCK; - } - - RETURN(rc ? : ret); - -error_up: - mutex_unlock(&o->mot_ioepoch_mutex); - return rc; -} - -/** - * Close IOEpoch (opened file or MDS_FMODE_EPOCH state). It happens if: - * - a client closes the IOEpoch; - * - a client eviction occured. - * Return values: - * MDT_IOEPOCH_OPENED if the client does not close IOEpoch. - * MDT_IOEPOCH_CLOSED if the client closes IOEpoch. - * MDT_IOEPOCH_GETATTR if the client closes IOEpoch but another SOM attribute - * update is needed. - */ -static int mdt_ioepoch_close(struct mdt_thread_info *info, struct mdt_object *o) +int mdt_write_read(struct mdt_object *o) { - struct ptlrpc_request *req = mdt_info_req(info); + int rc = 0; ENTRY; - - if (!(mdt_conn_flags(info) & OBD_CONNECT_SOM) || - !S_ISREG(lu_object_attr(&o->mot_obj))) - RETURN(0); - - LASSERT(o->mot_ioepoch_count); - LASSERT(info->mti_ioepoch == NULL || - info->mti_ioepoch->ioepoch == o->mot_ioepoch); - - /* IOEpoch is closed only if client tells about it or eviction occures. - * In the replay case, always close the epoch. */ - if (req == NULL) - RETURN(mdt_ioepoch_close_on_eviction(info, o)); - if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) - RETURN(mdt_ioepoch_close_on_replay(info, o)); - if (info->mti_ioepoch->flags & MF_EPOCH_CLOSE) - RETURN(mdt_ioepoch_close_reg(info, o)); - /* IO epoch is not closed. */ - RETURN(MDT_IOEPOCH_OPENED); + spin_lock(&o->mot_write_lock); + rc = o->mot_write_count; + spin_unlock(&o->mot_write_lock); + RETURN(rc); } -/** - * Close MDS_FMODE_SOM state, when IOEpoch is already closed and we are waiting - * for attribute update. It happens if: - * - SOM Attribute Update is obtained; - * - the client failed to obtain it and informs MDS about it; - * - a client eviction occured. - * Apply obtained attributes for the 1st case, wipe out the on-disk SOM - * cache otherwise. - */ -int mdt_som_au_close(struct mdt_thread_info *info, struct mdt_object *o) +int mdt_write_get(struct mdt_object *o) { - struct ptlrpc_request *req = mdt_info_req(info); - __u64 ioepoch = 0; - int act = MDT_SOM_ENABLE; - int rc = 0; + int rc = 0; ENTRY; + spin_lock(&o->mot_write_lock); + if (o->mot_write_count < 0) + rc = -ETXTBSY; + else + o->mot_write_count++; + spin_unlock(&o->mot_write_lock); - LASSERT(!req || info->mti_ioepoch); - if (!(mdt_conn_flags(info) & OBD_CONNECT_SOM) || - !S_ISREG(lu_object_attr(&o->mot_obj))) - RETURN(0); - - /* No size whereas MF_SOM_CHANGE is set means client failed to - * obtain ost attributes, drop the SOM cache on disk if so. */ - if (!req || - (info->mti_ioepoch && - info->mti_ioepoch->flags & MF_SOM_CHANGE && - !(info->mti_attr.ma_attr.la_valid & LA_SIZE))) - act = MDT_SOM_DISABLE; - - mutex_lock(&o->mot_ioepoch_mutex); - /* Mark the object it is the recovery state if we failed to obtain - * SOM attributes. */ - if (act == MDT_SOM_DISABLE) - o->mot_flags |= MOF_SOM_RECOV; - - if (!mdt_ioepoch_opened(o)) { - ioepoch = info->mti_ioepoch ? - info->mti_ioepoch->ioepoch : o->mot_ioepoch; - - if (!(lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY)) - rc = mdt_som_attr_set(info, o, ioepoch, act); - mdt_object_som_enable(o, ioepoch); - } - mutex_unlock(&o->mot_ioepoch_mutex); - RETURN(rc); -} - -int mdt_write_read(struct mdt_object *o) -{ - int rc = 0; - ENTRY; - mutex_lock(&o->mot_ioepoch_mutex); - rc = o->mot_writecount; - mutex_unlock(&o->mot_ioepoch_mutex); - RETURN(rc); -} - -int mdt_write_get(struct mdt_object *o) -{ - int rc = 0; - ENTRY; - mutex_lock(&o->mot_ioepoch_mutex); - if (o->mot_writecount < 0) - rc = -ETXTBSY; - else - o->mot_writecount++; - mutex_unlock(&o->mot_ioepoch_mutex); - RETURN(rc); + RETURN(rc); } void mdt_write_put(struct mdt_object *o) { - ENTRY; - mutex_lock(&o->mot_ioepoch_mutex); - o->mot_writecount--; - mutex_unlock(&o->mot_ioepoch_mutex); - EXIT; + ENTRY; + spin_lock(&o->mot_write_lock); + o->mot_write_count--; + spin_unlock(&o->mot_write_lock); + EXIT; } static int mdt_write_deny(struct mdt_object *o) { - int rc = 0; - ENTRY; - mutex_lock(&o->mot_ioepoch_mutex); - if (o->mot_writecount > 0) - rc = -ETXTBSY; - else - o->mot_writecount--; - mutex_unlock(&o->mot_ioepoch_mutex); - RETURN(rc); + int rc = 0; + ENTRY; + spin_lock(&o->mot_write_lock); + if (o->mot_write_count > 0) + rc = -ETXTBSY; + else + o->mot_write_count--; + spin_unlock(&o->mot_write_lock); + RETURN(rc); } static void mdt_write_allow(struct mdt_object *o) { - ENTRY; - mutex_lock(&o->mot_ioepoch_mutex); - o->mot_writecount++; - mutex_unlock(&o->mot_ioepoch_mutex); - EXIT; + ENTRY; + spin_lock(&o->mot_write_lock); + o->mot_write_count++; + spin_unlock(&o->mot_write_lock); + EXIT; } /* there can be no real transaction so prepare the fake one */ @@ -624,8 +252,7 @@ static void mdt_empty_transno(struct mdt_thread_info *info, int rc) RETURN_EXIT; } - if (lustre_msg_get_opc(req->rq_reqmsg) == MDS_CLOSE || - lustre_msg_get_opc(req->rq_reqmsg) == MDS_DONE_WRITING) { + if (lustre_msg_get_opc(req->rq_reqmsg) == MDS_CLOSE) { if (info->mti_transno != 0) lcd->lcd_last_close_transno = info->mti_transno; lcd->lcd_last_close_xid = req->rq_xid; @@ -661,8 +288,36 @@ void mdt_mfd_set_mode(struct mdt_file_data *mfd, __u64 mode) mfd->mfd_mode = mode; } +/** + * prep ma_lmm/ma_lmv for md_attr from reply + */ +static void mdt_prep_ma_buf_from_rep(struct mdt_thread_info *info, + struct mdt_object *obj, + struct md_attr *ma) +{ + LASSERT(ma->ma_lmv == NULL && ma->ma_lmm == NULL); + if (S_ISDIR(obj->mot_header.loh_attr)) { + ma->ma_lmv = req_capsule_server_get(info->mti_pill, + &RMF_MDT_MD); + ma->ma_lmv_size = req_capsule_get_size(info->mti_pill, + &RMF_MDT_MD, + RCL_SERVER); + if (ma->ma_lmv_size > 0) + ma->ma_need |= MA_LMV; + } else { + ma->ma_lmm = req_capsule_server_get(info->mti_pill, + &RMF_MDT_MD); + ma->ma_lmm_size = req_capsule_get_size(info->mti_pill, + &RMF_MDT_MD, + RCL_SERVER); + if (ma->ma_lmm_size > 0) + ma->ma_need |= MA_LOV; + } +} + static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p, - struct mdt_object *o, __u64 flags, int created) + struct mdt_object *o, __u64 flags, int created, + struct ldlm_reply *rep) { struct ptlrpc_request *req = mdt_info_req(info); struct mdt_export_data *med = &req->rq_export->exp_mdt_data; @@ -690,6 +345,9 @@ static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p, rc = mdt_create_data(info, p, o); if (rc) RETURN(rc); + + if (exp_connect_flags(req->rq_export) & OBD_CONNECT_DISP_STRIPE) + mdt_set_disposition(info, rep, DISP_OPEN_STRIPE); } CDEBUG(D_INODE, "after open, ma_valid bit = "LPX64" lmm_size = %d\n", @@ -697,35 +355,42 @@ static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p, if (ma->ma_valid & MA_LOV) { LASSERT(ma->ma_lmm_size != 0); - repbody->eadatasize = ma->ma_lmm_size; - if (isdir) - repbody->valid |= OBD_MD_FLDIREA; - else - repbody->valid |= OBD_MD_FLEASIZE; - } - - if (flags & FMODE_WRITE) { - rc = mdt_write_get(o); - if (rc == 0) { - mdt_ioepoch_open(info, o, created); - repbody->ioepoch = o->mot_ioepoch; - } - } else if (flags & MDS_FMODE_EXEC) { - /* if file is released, we can't deny write because we must - * restore (write) it to access it.*/ - if ((ma->ma_valid & MA_HSM) && - (ma->ma_hsm.mh_flags & HS_RELEASED)) - rc = 0; + repbody->mbo_eadatasize = ma->ma_lmm_size; + if (isdir) + repbody->mbo_valid |= OBD_MD_FLDIREA; else - rc = mdt_write_deny(o); - } + repbody->mbo_valid |= OBD_MD_FLEASIZE; + } + + if (ma->ma_valid & MA_LMV) { + LASSERT(ma->ma_lmv_size != 0); + repbody->mbo_eadatasize = ma->ma_lmv_size; + LASSERT(isdir); + repbody->mbo_valid |= OBD_MD_FLDIREA | OBD_MD_MEA; + } + + if (flags & FMODE_WRITE) + rc = mdt_write_get(o); + else if (flags & MDS_FMODE_EXEC) + rc = mdt_write_deny(o); + if (rc) RETURN(rc); rc = mo_open(info->mti_env, mdt_object_child(o), created ? flags | MDS_OPEN_CREATED : flags); - if (rc) - GOTO(err_out, rc); + if (rc != 0) { + /* If we allow the client to chgrp (CFS_SETGRP_PERM), but the + * client does not know which suppgid should be sent to the MDS, + * or some other(s) changed the target file's GID after this RPC + * sent to the MDS with the suppgid as the original GID, then we + * give the client another chance to send the right suppgid. */ + if (rc == -EACCES && + allow_client_chgrp(info, lu_ucred(info->mti_env))) + mdt_set_disposition(info, rep, DISP_OPEN_DENY); + + GOTO(err_out, rc); + } mfd = mdt_mfd_new(med); if (mfd == NULL) @@ -761,15 +426,15 @@ static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p, * restart replay, so there maybe some orphan * mfd here, we should remove them */ LASSERT(info->mti_rr.rr_handle != NULL); + spin_lock(&med->med_open_lock); old_mfd = mdt_handle2mfd(med, info->mti_rr.rr_handle, true); if (old_mfd != NULL) { CDEBUG(D_HA, "delete orphan mfd = %p, fid = "DFID", " "cookie = "LPX64"\n", mfd, PFID(mdt_object_fid(mfd->mfd_object)), info->mti_rr.rr_handle->cookie); - spin_lock(&med->med_open_lock); class_handle_unhash(&old_mfd->mfd_handle); - cfs_list_del_init(&old_mfd->mfd_list); + list_del_init(&old_mfd->mfd_list); spin_unlock(&med->med_open_lock); /* no attr update for that close */ la->la_valid = 0; @@ -778,6 +443,12 @@ static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p, mdt_mfd_close(info, old_mfd); ma->ma_attr_flags &= ~MDS_RECOV_OPEN; ma->ma_valid &= ~MA_FLAGS; + } else { + spin_unlock(&med->med_open_lock); + CDEBUG(D_HA, "orphan mfd not found, fid = "DFID", " + "cookie = "LPX64"\n", + PFID(mdt_object_fid(mfd->mfd_object)), + info->mti_rr.rr_handle->cookie); } CDEBUG(D_HA, "Store old cookie "LPX64" in new mfd\n", @@ -786,17 +457,17 @@ static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p, mfd->mfd_old_handle.cookie = info->mti_rr.rr_handle->cookie; } - repbody->handle.cookie = mfd->mfd_handle.h_cookie; + repbody->mbo_handle.cookie = mfd->mfd_handle.h_cookie; if (req->rq_export->exp_disconnected) { spin_lock(&med->med_open_lock); class_handle_unhash(&mfd->mfd_handle); - cfs_list_del_init(&mfd->mfd_list); + list_del_init(&mfd->mfd_list); spin_unlock(&med->med_open_lock); mdt_mfd_close(info, mfd); } else { spin_lock(&med->med_open_lock); - cfs_list_add(&mfd->mfd_list, &med->med_open_head); + list_add(&mfd->mfd_list, &med->med_open_head); spin_unlock(&med->med_open_lock); } @@ -805,30 +476,29 @@ static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p, RETURN(rc); err_out: - if (flags & FMODE_WRITE) - /* XXX We also need to close io epoch here. - * See LU-1220 - green */ - mdt_write_put(o); - else if (flags & FMODE_EXEC) - mdt_write_allow(o); - return rc; + if (flags & FMODE_WRITE) + mdt_write_put(o); + else if (flags & MDS_FMODE_EXEC) + mdt_write_allow(o); + + return rc; } -int mdt_finish_open(struct mdt_thread_info *info, - struct mdt_object *p, struct mdt_object *o, - __u64 flags, int created, struct ldlm_reply *rep) +static int mdt_finish_open(struct mdt_thread_info *info, + struct mdt_object *p, struct mdt_object *o, + __u64 flags, int created, struct ldlm_reply *rep) { - struct ptlrpc_request *req = mdt_info_req(info); - struct obd_export *exp = req->rq_export; - struct mdt_export_data *med = &req->rq_export->exp_mdt_data; - struct md_attr *ma = &info->mti_attr; - struct lu_attr *la = &ma->ma_attr; - struct mdt_file_data *mfd; - struct mdt_body *repbody; - int rc = 0; - int isreg, isdir, islnk; - cfs_list_t *t; - ENTRY; + struct ptlrpc_request *req = mdt_info_req(info); + struct obd_export *exp = req->rq_export; + struct mdt_export_data *med = &req->rq_export->exp_mdt_data; + struct md_attr *ma = &info->mti_attr; + struct lu_attr *la = &ma->ma_attr; + struct mdt_file_data *mfd; + struct mdt_body *repbody; + int rc = 0; + int isreg, isdir, islnk; + struct list_head *t; + ENTRY; LASSERT(ma->ma_valid & MA_INODE); @@ -841,8 +511,8 @@ int mdt_finish_open(struct mdt_thread_info *info, /* LU-2275, simulate broken behaviour (esp. prevalent in * pre-2.4 servers where a very strange reply is sent on error - * that looks like it was actually almost succesful and a failure at the - * same time */ + * that looks like it was actually almost successful and a + * failure at the same time.) */ if (OBD_FAIL_CHECK(OBD_FAIL_MDS_NEGATIVE_POSITIVE)) { mdt_set_disposition(info, rep, DISP_OPEN_OPEN | DISP_LOOKUP_NEG | @@ -859,71 +529,19 @@ int mdt_finish_open(struct mdt_thread_info *info, rc = mdt_pack_remote_perm(info, o, buf); if (rc) { - repbody->valid &= ~OBD_MD_FLRMTPERM; - repbody->aclsize = 0; - } else { - repbody->valid |= OBD_MD_FLRMTPERM; - repbody->aclsize = sizeof(struct mdt_remote_perm); + repbody->mbo_valid &= ~OBD_MD_FLRMTPERM; + repbody->mbo_aclsize = 0; + } else { + repbody->mbo_valid |= OBD_MD_FLRMTPERM; + repbody->mbo_aclsize = sizeof(struct mdt_remote_perm); } } #ifdef CONFIG_FS_POSIX_ACL - else if (exp_connect_flags(exp) & OBD_CONNECT_ACL) { - const struct lu_env *env = info->mti_env; - struct md_object *next = mdt_object_child(o); - struct lu_buf *buf = &info->mti_buf; - - buf->lb_buf = req_capsule_server_get(info->mti_pill, &RMF_ACL); - buf->lb_len = req_capsule_get_size(info->mti_pill, &RMF_ACL, - RCL_SERVER); - if (buf->lb_len > 0) { - rc = mo_xattr_get(env, next, buf, - XATTR_NAME_ACL_ACCESS); - if (rc < 0) { - if (rc == -ENODATA) { - repbody->aclsize = 0; - repbody->valid |= OBD_MD_FLACL; - rc = 0; - } else if (rc == -EOPNOTSUPP) { - rc = 0; - } else { - CERROR("got acl size: %d\n", rc); - } - } else { - repbody->aclsize = rc; - repbody->valid |= OBD_MD_FLACL; - rc = 0; - } - } - } + else if (exp_connect_flags(exp) & OBD_CONNECT_ACL) + rc = mdt_pack_acl2body(info, repbody, o, + exp->exp_target_data.ted_nodemap); #endif - if (info->mti_mdt->mdt_opts.mo_mds_capa && - exp_connect_flags(exp) & OBD_CONNECT_MDS_CAPA) { - struct lustre_capa *capa; - - capa = req_capsule_server_get(info->mti_pill, &RMF_CAPA1); - LASSERT(capa); - capa->lc_opc = CAPA_OPC_MDS_DEFAULT; - rc = mo_capa_get(info->mti_env, mdt_object_child(o), capa, 0); - if (rc) - RETURN(rc); - repbody->valid |= OBD_MD_FLMDSCAPA; - } - - if (info->mti_mdt->mdt_opts.mo_oss_capa && - exp_connect_flags(exp) & OBD_CONNECT_OSS_CAPA && - S_ISREG(lu_object_attr(&o->mot_obj))) { - struct lustre_capa *capa; - - capa = req_capsule_server_get(info->mti_pill, &RMF_CAPA2); - LASSERT(capa); - capa->lc_opc = CAPA_OPC_OSS_DEFAULT | capa_open_opc(flags); - rc = mo_capa_get(info->mti_env, mdt_object_child(o), capa, 0); - if (rc) - RETURN(rc); - repbody->valid |= OBD_MD_FLOSSCAPA; - } - /* * If we are following a symlink, don't open; and do not return open * handle for special nodes as client required. @@ -955,11 +573,11 @@ int mdt_finish_open(struct mdt_thread_info *info, RETURN(-EAGAIN); } - mfd = NULL; - if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_RESENT) { + mfd = NULL; + if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_RESENT) { spin_lock(&med->med_open_lock); - cfs_list_for_each(t, &med->med_open_head) { - mfd = cfs_list_entry(t, struct mdt_file_data, mfd_list); + list_for_each(t, &med->med_open_head) { + mfd = list_entry(t, struct mdt_file_data, mfd_list); if (mfd->mfd_xid == req->rq_xid) break; mfd = NULL; @@ -967,31 +585,28 @@ int mdt_finish_open(struct mdt_thread_info *info, spin_unlock(&med->med_open_lock); if (mfd != NULL) { - repbody->handle.cookie = mfd->mfd_handle.h_cookie; - /*set repbody->ea_size for resent case*/ - if (ma->ma_valid & MA_LOV) { - LASSERT(ma->ma_lmm_size != 0); - repbody->eadatasize = ma->ma_lmm_size; - if (isdir) - repbody->valid |= OBD_MD_FLDIREA; - else - repbody->valid |= OBD_MD_FLEASIZE; + repbody->mbo_handle.cookie = mfd->mfd_handle.h_cookie; + /* set repbody->ea_size for resent case */ + if (ma->ma_valid & MA_LOV) { + LASSERT(ma->ma_lmm_size != 0); + repbody->mbo_eadatasize = ma->ma_lmm_size; + if (isdir) + repbody->mbo_valid |= OBD_MD_FLDIREA; + else + repbody->mbo_valid |= OBD_MD_FLEASIZE; } mdt_set_disposition(info, rep, DISP_OPEN_OPEN); - RETURN(0); - } - } + RETURN(0); + } + } - rc = mdt_mfd_open(info, p, o, flags, created); + rc = mdt_mfd_open(info, p, o, flags, created, rep); if (!rc) mdt_set_disposition(info, rep, DISP_OPEN_OPEN); - RETURN(rc); + RETURN(rc); } -extern void mdt_req_from_lcd(struct ptlrpc_request *req, - struct lsd_client_data *lcd); - void mdt_reconstruct_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) { @@ -1003,7 +618,7 @@ void mdt_reconstruct_open(struct mdt_thread_info *info, struct lsd_client_data *lcd = ted->ted_lcd; struct md_attr *ma = &info->mti_attr; struct mdt_reint_record *rr = &info->mti_rr; - __u32 flags = info->mti_spec.sp_cr_flags; + __u64 flags = info->mti_spec.sp_cr_flags; struct ldlm_reply *ldlm_rep; struct mdt_object *parent; struct mdt_object *child; @@ -1015,13 +630,7 @@ void mdt_reconstruct_open(struct mdt_thread_info *info, ldlm_rep = req_capsule_server_get(pill, &RMF_DLM_REP); repbody = req_capsule_server_get(pill, &RMF_MDT_BODY); - ma->ma_lmm = req_capsule_server_get(pill, &RMF_MDT_MD); - ma->ma_lmm_size = req_capsule_get_size(pill, &RMF_MDT_MD, - RCL_SERVER); ma->ma_need = MA_INODE | MA_HSM; - if (ma->ma_lmm_size > 0) - ma->ma_need |= MA_LOV; - ma->ma_valid = 0; mdt_req_from_lcd(req, lcd); @@ -1052,18 +661,19 @@ void mdt_reconstruct_open(struct mdt_thread_info *info, mdt_export_evict(exp); RETURN_EXIT; } - child = mdt_object_find(env, mdt, rr->rr_fid2); - if (IS_ERR(child)) { - rc = PTR_ERR(child); - LCONSOLE_WARN("Child "DFID" lookup error %d." - " Evicting client %s with export %s.\n", - PFID(mdt_object_fid(child)), rc, - obd_uuid2str(&exp->exp_client_uuid), - obd_export_nid2str(exp)); - mdt_object_put(env, parent); - mdt_export_evict(exp); - RETURN_EXIT; - } + + child = mdt_object_find(env, mdt, rr->rr_fid2); + if (IS_ERR(child)) { + rc = PTR_ERR(child); + LCONSOLE_WARN("cannot lookup child "DFID": rc = %d; " + "evicting client %s with export %s\n", + PFID(rr->rr_fid2), rc, + obd_uuid2str(&exp->exp_client_uuid), + obd_export_nid2str(exp)); + mdt_object_put(env, parent); + mdt_export_evict(exp); + RETURN_EXIT; + } if (unlikely(mdt_object_remote(child))) { /* the child object was created on remote server */ @@ -1073,13 +683,12 @@ void mdt_reconstruct_open(struct mdt_thread_info *info, mdt_object_put(env, child); GOTO(out, rc = -EIO); } - repbody->fid1 = *rr->rr_fid2; - repbody->valid |= (OBD_MD_FLID | OBD_MD_MDS); + repbody->mbo_fid1 = *rr->rr_fid2; + repbody->mbo_valid |= (OBD_MD_FLID | OBD_MD_MDS); rc = 0; } else { if (mdt_object_exists(child)) { - mdt_set_capainfo(info, 1, rr->rr_fid2, - BYPASS_CAPA); + mdt_prep_ma_buf_from_rep(info, child, ma); rc = mdt_attr_get_complex(info, child, ma); if (rc == 0) rc = mdt_finish_open(info, parent, @@ -1109,10 +718,9 @@ out: LASSERT(ergo(rc < 0, lustre_msg_get_transno(req->rq_repmsg) == 0)); } -int mdt_open_by_fid(struct mdt_thread_info* info, - struct ldlm_reply *rep) +static int mdt_open_by_fid(struct mdt_thread_info *info, struct ldlm_reply *rep) { - __u32 flags = info->mti_spec.sp_cr_flags; + __u64 flags = info->mti_spec.sp_cr_flags; struct mdt_reint_record *rr = &info->mti_rr; struct md_attr *ma = &info->mti_attr; struct mdt_object *o; @@ -1131,15 +739,15 @@ int mdt_open_by_fid(struct mdt_thread_info* info, DISP_LOOKUP_EXECD | DISP_LOOKUP_POS)); repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY); - repbody->fid1 = *rr->rr_fid2; - repbody->valid |= (OBD_MD_FLID | OBD_MD_MDS); + repbody->mbo_fid1 = *rr->rr_fid2; + repbody->mbo_valid |= (OBD_MD_FLID | OBD_MD_MDS); rc = 0; } else { if (mdt_object_exists(o)) { mdt_set_disposition(info, rep, (DISP_IT_EXECD | DISP_LOOKUP_EXECD | DISP_LOOKUP_POS)); - + mdt_prep_ma_buf_from_rep(info, o, ma); rc = mdt_attr_get_complex(info, o, ma); if (rc == 0) rc = mdt_finish_open(info, NULL, o, flags, 0, @@ -1215,11 +823,7 @@ static int mdt_object_open_lock(struct mdt_thread_info *info, if (open_flags & MDS_OPEN_LOCK) { if (open_flags & FMODE_WRITE) lm = LCK_CW; - /* if file is released, we can't deny write because we must - * restore (write) it to access it. */ - else if ((open_flags & MDS_FMODE_EXEC) && - !((ma->ma_valid & MA_HSM) && - (ma->ma_hsm.mh_flags & HS_RELEASED))) + else if (open_flags & MDS_FMODE_EXEC) lm = LCK_PR; else lm = LCK_CR; @@ -1276,6 +880,15 @@ static int mdt_object_open_lock(struct mdt_thread_info *info, ", open_flags = "LPO64"\n", PFID(mdt_object_fid(obj)), open_flags); + /* We cannot enqueue another lock for the same resource we + * already have a lock for, due to mechanics of waiting list + * iterating in ldlm, see LU-3601. + * As such we'll drop the open lock we just got above here, + * it's ok not to have this open lock as it's main purpose is to + * flush unused cached client open handles. */ + if (lustre_handle_is_used(&lhc->mlh_reg_lh)) + mdt_object_unlock(info, obj, lhc, 1); + LASSERT(!try_layout); mdt_lock_handle_init(ll); mdt_lock_reg_init(ll, LCK_EX); @@ -1356,7 +969,7 @@ static void mdt_object_open_unlock(struct mdt_thread_info *info, up_read(&obj->mot_open_sem); /* Cross-ref case, the lock should be returned to the client */ - if (ibits == 0 || rc == -EREMOTE) + if (ibits == 0 || rc == -MDT_EREMOTE_OPEN) RETURN_EXIT; if (!(open_flags & MDS_OPEN_LOCK) && !(ibits & MDS_INODELOCK_LAYOUT)) { @@ -1365,12 +978,13 @@ static void mdt_object_open_unlock(struct mdt_thread_info *info, rc = 1; } - if (rc != 0) { + if (rc != 0 || !lustre_handle_is_used(&lhc->mlh_reg_lh)) { struct ldlm_reply *ldlm_rep; ldlm_rep = req_capsule_server_get(info->mti_pill, &RMF_DLM_REP); mdt_clear_disposition(info, ldlm_rep, DISP_OPEN_LOCK); - mdt_object_unlock(info, obj, lhc, 1); + if (lustre_handle_is_used(&lhc->mlh_reg_lh)) + mdt_object_unlock(info, obj, lhc, 1); } RETURN_EXIT; } @@ -1378,7 +992,7 @@ static void mdt_object_open_unlock(struct mdt_thread_info *info, /** * Check release is permitted for the current HSM flags. */ -static bool mdt_hsm_release_allow(struct md_attr *ma) +static bool mdt_hsm_release_allow(const struct md_attr *ma) { if (!(ma->ma_valid & MA_HSM)) return false; @@ -1392,8 +1006,9 @@ static bool mdt_hsm_release_allow(struct md_attr *ma) return true; } -int mdt_open_by_fid_lock(struct mdt_thread_info *info, struct ldlm_reply *rep, - struct mdt_lock_handle *lhc) +static int mdt_open_by_fid_lock(struct mdt_thread_info *info, + struct ldlm_reply *rep, + struct mdt_lock_handle *lhc) { const struct lu_env *env = info->mti_env; struct mdt_device *mdt = info->mti_mdt; @@ -1403,6 +1018,7 @@ int mdt_open_by_fid_lock(struct mdt_thread_info *info, struct ldlm_reply *rep, struct mdt_object *parent= NULL; struct mdt_object *o; int rc; + int object_locked = 0; __u64 ibits = 0; ENTRY; @@ -1421,9 +1037,9 @@ int mdt_open_by_fid_lock(struct mdt_thread_info *info, struct ldlm_reply *rep, ma->ma_need |= MA_PFID; } - o = mdt_object_find(env, mdt, rr->rr_fid2); - if (IS_ERR(o)) - RETURN(rc = PTR_ERR(o)); + o = mdt_object_find(env, mdt, rr->rr_fid2); + if (IS_ERR(o)) + GOTO(out_parent_put, rc = PTR_ERR(o)); if (mdt_object_remote(o)) { CDEBUG(D_INFO, "%s: "DFID" is on remote MDT.\n", @@ -1440,20 +1056,32 @@ int mdt_open_by_fid_lock(struct mdt_thread_info *info, struct ldlm_reply *rep, mdt_set_disposition(info, rep, (DISP_IT_EXECD | DISP_LOOKUP_EXECD)); + mdt_prep_ma_buf_from_rep(info, o, ma); if (flags & MDS_OPEN_RELEASE) ma->ma_need |= MA_HSM; rc = mdt_attr_get_complex(info, o, ma); if (rc) GOTO(out, rc); + /* We should not change file's existing LOV EA */ + if (S_ISREG(lu_object_attr(&o->mot_obj)) && + flags & MDS_OPEN_HAS_EA && ma->ma_valid & MA_LOV) + GOTO(out, rc = -EEXIST); + /* If a release request, check file flags are fine and ask for an * exclusive open access. */ if (flags & MDS_OPEN_RELEASE && !mdt_hsm_release_allow(ma)) GOTO(out, rc = -EPERM); - rc = mdt_object_open_lock(info, o, lhc, &ibits); - if (rc) - GOTO(out_unlock, rc); + rc = mdt_check_resent_lock(info, o, lhc); + if (rc < 0) { + GOTO(out, rc); + } else if (rc > 0) { + rc = mdt_object_open_lock(info, o, lhc, &ibits); + object_locked = 1; + if (rc) + GOTO(out_unlock, rc); + } if (ma->ma_valid & MA_PFID) { parent = mdt_object_find(env, mdt, &ma->ma_pfid); @@ -1477,20 +1105,16 @@ int mdt_open_by_fid_lock(struct mdt_thread_info *info, struct ldlm_reply *rep, GOTO(out_unlock, rc); out_unlock: - mdt_object_open_unlock(info, o, lhc, ibits, rc); + if (object_locked) + mdt_object_open_unlock(info, o, lhc, ibits, rc); out: mdt_object_put(env, o); +out_parent_put: if (parent != NULL) mdt_object_put(env, parent); return rc; } -int mdt_pin(struct mdt_thread_info* info) -{ - ENTRY; - RETURN(err_serious(-EOPNOTSUPP)); -} - /* Cross-ref request. Currently it can only be a pure open (w/o create) */ static int mdt_cross_open(struct mdt_thread_info *info, const struct lu_fid *parent_fid, @@ -1523,18 +1147,11 @@ static int mdt_cross_open(struct mdt_thread_info *info, if (rc) goto out; - mdt_set_capainfo(info, 0, fid, BYPASS_CAPA); + mdt_prep_ma_buf_from_rep(info, o, ma); rc = mdt_attr_get_complex(info, o, ma); if (rc != 0) GOTO(out, rc); - /* Do not create lov object if the fid is opened - * under OBF */ - if (S_ISREG(ma->ma_attr.la_mode) && - !(ma->ma_valid & MA_LOV) && (flags & FMODE_WRITE) && - fid_is_obf(parent_fid)) - GOTO(out, rc = -EPERM); - rc = mdt_finish_open(info, NULL, o, flags, 0, rep); } else { /* @@ -1563,11 +1180,11 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) struct lu_fid *child_fid = &info->mti_tmp_fid1; struct md_attr *ma = &info->mti_attr; __u64 create_flags = info->mti_spec.sp_cr_flags; - __u64 ibits; + __u64 ibits = 0; struct mdt_reint_record *rr = &info->mti_rr; - struct lu_name *lname; int result, rc; int created = 0; + int object_locked = 0; __u32 msg_flags; ENTRY; @@ -1577,13 +1194,7 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) mdt_counter_incr(req, LPROC_MDT_OPEN); repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY); - ma->ma_lmm = req_capsule_server_get(info->mti_pill, &RMF_MDT_MD); - ma->ma_lmm_size = req_capsule_get_size(info->mti_pill, &RMF_MDT_MD, - RCL_SERVER); ma->ma_need = MA_INODE; - if (ma->ma_lmm_size > 0) - ma->ma_need |= MA_LOV; - ma->ma_valid = 0; LASSERT(info->mti_pill->rc_fmt == &RQF_LDLM_INTENT_OPEN); @@ -1599,11 +1210,12 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) info->mti_spec.u.sp_ea.eadata == NULL) GOTO(out, result = err_serious(-EINVAL)); - CDEBUG(D_INODE, "I am going to open "DFID"/(%s->"DFID") " - "cr_flag="LPO64" mode=0%06o msg_flag=0x%x\n", - PFID(rr->rr_fid1), rr->rr_name, - PFID(rr->rr_fid2), create_flags, - ma->ma_attr.la_mode, msg_flags); + CDEBUG(D_INODE, "I am going to open "DFID"/("DNAME"->"DFID") " + "cr_flag="LPO64" mode=0%06o msg_flag=0x%x\n", + PFID(rr->rr_fid1), PNAME(&rr->rr_name), + PFID(rr->rr_fid2), create_flags, + ma->ma_attr.la_mode, msg_flags); + if (info->mti_cross_ref) { /* This is cross-ref open */ mdt_set_disposition(info, ldlm_rep, @@ -1631,25 +1243,16 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) GOTO(out, result = -EFAULT); } CDEBUG(D_INFO, "No object(1), continue as regular open.\n"); - } else if ((rr->rr_namelen == 0 && create_flags & MDS_OPEN_LOCK) || - (create_flags & MDS_OPEN_BY_FID)) { + } else if (create_flags & (MDS_OPEN_BY_FID | MDS_OPEN_LOCK)) { + /* + * MDS_OPEN_LOCK is checked for backward compatibility with 2.1 + * client. + */ result = mdt_open_by_fid_lock(info, ldlm_rep, lhc); - /* If result is 0 then open by FID has found the file - * and there is nothing left for us to do here. More - * generally if it is anything other than -ENOENT or - * -EREMOTE then we return that now. If -ENOENT and - * MDS_OPEN_CREAT is set then we must create the file - * below. If -EREMOTE then we need to return a LOOKUP - * lock to the client, which we do below. Hence this - * odd looking condition. See LU-2523. */ - if (!(result == -ENOENT && (create_flags & MDS_OPEN_CREAT)) && - result != -EREMOTE) - GOTO(out, result); - - if (unlikely(rr->rr_namelen == 0)) - GOTO(out, result = -EINVAL); - - CDEBUG(D_INFO, "No object(2), continue as regular open.\n"); + if (result < 0) + CDEBUG(D_INFO, "no object for "DFID": %d\n", + PFID(rr->rr_fid2), result); + GOTO(out, result); } if (OBD_FAIL_CHECK(OBD_FAIL_MDS_OPEN_PACK)) @@ -1658,9 +1261,13 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) mdt_set_disposition(info, ldlm_rep, (DISP_IT_EXECD | DISP_LOOKUP_EXECD)); + if (!lu_name_is_valid(&rr->rr_name)) + GOTO(out, result = -EPROTO); + lh = &info->mti_lh[MDT_LH_PARENT]; - mdt_lock_pdo_init(lh, (create_flags & MDS_OPEN_CREAT) ? - LCK_PW : LCK_PR, rr->rr_name, rr->rr_namelen); + mdt_lock_pdo_init(lh, + (create_flags & MDS_OPEN_CREAT) ? LCK_PW : LCK_PR, + &rr->rr_name); parent = mdt_object_find_lock(info, rr->rr_fid1, lh, MDS_INODELOCK_UPDATE); @@ -1674,12 +1281,13 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) fid_zero(child_fid); - lname = mdt_name(info->mti_env, (char *)rr->rr_name, rr->rr_namelen); - result = mdo_lookup(info->mti_env, mdt_object_child(parent), - lname, child_fid, &info->mti_spec); - LASSERTF(ergo(result == 0, fid_is_sane(child_fid)), - "looking for "DFID"/%s, result fid="DFID"\n", - PFID(mdt_object_fid(parent)), rr->rr_name, PFID(child_fid)); + result = mdo_lookup(info->mti_env, mdt_object_child(parent), + &rr->rr_name, child_fid, &info->mti_spec); + + LASSERTF(ergo(result == 0, fid_is_sane(child_fid)), + "looking for "DFID"/"DNAME", found FID = "DFID"\n", + PFID(mdt_object_fid(parent)), PNAME(&rr->rr_name), + PFID(child_fid)); if (result != 0 && result != -ENOENT && result != -ESTALE) GOTO(out_parent, result); @@ -1721,18 +1329,17 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) if (rc) GOTO(out_child, result = rc); - mdt_set_capainfo(info, 1, child_fid, BYPASS_CAPA); if (result == -ENOENT) { /* Create under OBF and .lustre is not permitted */ - if (fid_is_obf(rr->rr_fid1) || fid_is_dot_lustre(rr->rr_fid1)) + if (!fid_is_md_operative(rr->rr_fid1)) GOTO(out_child, result = -EPERM); - /* save versions in reply */ - mdt_version_get_save(info, parent, 0); - mdt_version_get_save(info, child, 1); + /* save versions in reply */ + mdt_version_get_save(info, parent, 0); + mdt_version_get_save(info, child, 1); - /* version of child will be changed */ - info->mti_mos = child; + /* version of child will be changed */ + tgt_vbr_obj_set(info->mti_env, mdt_obj2dt(child)); /* Not found and with MDS_OPEN_CREAT: let's create it. */ mdt_set_disposition(info, ldlm_rep, DISP_OPEN_CREATE); @@ -1748,17 +1355,17 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) info->mti_spec.sp_cr_lookup = 0; info->mti_spec.sp_feat = &dt_directory_features; - result = mdo_create(info->mti_env, - mdt_object_child(parent), - lname, - mdt_object_child(child), - &info->mti_spec, - &info->mti_attr); + result = mdo_create(info->mti_env, + mdt_object_child(parent), + &rr->rr_name, + mdt_object_child(child), + &info->mti_spec, + &info->mti_attr); if (result == -ERESTART) { mdt_clear_disposition(info, ldlm_rep, DISP_OPEN_CREATE); GOTO(out_child, result); } else { - + mdt_prep_ma_buf_from_rep(info, child, ma); /* XXX: we should call this once, see few lines below */ if (result == 0) result = mdt_attr_get_complex(info, child, ma); @@ -1779,22 +1386,10 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) */ LASSERT(lhc != NULL); - if (lustre_handle_is_used(&lhc->mlh_reg_lh)) { - struct ldlm_lock *lock; - - LASSERT(msg_flags & MSG_RESENT); - - lock = ldlm_handle2lock(&lhc->mlh_reg_lh); - if (!lock) { - CERROR("Invalid lock handle "LPX64"\n", - lhc->mlh_reg_lh.cookie); - LBUG(); - } - LASSERT(fid_res_name_eq(mdt_object_fid(child), - &lock->l_resource->lr_name)); - LDLM_LOCK_PUT(lock); - rc = 0; - } else { + rc = mdt_check_resent_lock(info, child, lhc); + if (rc < 0) { + GOTO(out_child, result = rc); + } else if (rc > 0) { mdt_lock_handle_init(lhc); mdt_lock_reg_init(lhc, LCK_PR); @@ -1802,37 +1397,51 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) MDS_INODELOCK_LOOKUP, MDT_CROSS_LOCK); } - repbody->fid1 = *mdt_object_fid(child); - repbody->valid |= (OBD_MD_FLID | OBD_MD_MDS); + repbody->mbo_fid1 = *mdt_object_fid(child); + repbody->mbo_valid |= (OBD_MD_FLID | OBD_MD_MDS); if (rc != 0) result = rc; else - result = -EREMOTE; + result = -MDT_EREMOTE_OPEN; GOTO(out_child, result); + } else if (mdt_object_exists(child)) { + /* We have to get attr & LOV EA & HSM for this + * object. */ + mdt_prep_ma_buf_from_rep(info, child, ma); + ma->ma_need |= MA_HSM; + result = mdt_attr_get_complex(info, child, ma); + if (result != 0) + GOTO(out_child, result); } else { - if (mdt_object_exists(child)) { - /* We have to get attr & LOV EA & HSM for this - * object */ - ma->ma_need |= MA_HSM; - result = mdt_attr_get_complex(info, child, ma); - } else { - /*object non-exist!!!*/ - LBUG(); - } + /* Object does not exist. Likely FS corruption. */ + CERROR("%s: name '"DNAME"' present, but FID " + DFID" is invalid\n", mdt_obd_name(info->mti_mdt), + PNAME(&rr->rr_name), PFID(child_fid)); + GOTO(out_child, result = -EIO); } } - LASSERT(!lustre_handle_is_used(&lhc->mlh_reg_lh)); - - /* get openlock if this is not replay and if a client requested it */ - if (!req_is_replay(req)) { - rc = mdt_object_open_lock(info, child, lhc, &ibits); - if (rc != 0) - GOTO(out_child_unlock, result = rc); - else if (create_flags & MDS_OPEN_LOCK) + rc = mdt_check_resent_lock(info, child, lhc); + if (rc < 0) { + GOTO(out_child, result = rc); + } else if (rc == 0) { + /* the open lock might already be gotten in + * ldlm_handle_enqueue() */ + LASSERT(lustre_msg_get_flags(req->rq_reqmsg) & MSG_RESENT); + if (create_flags & MDS_OPEN_LOCK) mdt_set_disposition(info, ldlm_rep, DISP_OPEN_LOCK); + } else { + /* get openlock if this isn't replay and client requested it */ + if (!req_is_replay(req)) { + rc = mdt_object_open_lock(info, child, lhc, &ibits); + object_locked = 1; + if (rc != 0) + GOTO(out_child_unlock, result = rc); + else if (create_flags & MDS_OPEN_LOCK) + mdt_set_disposition(info, ldlm_rep, + DISP_OPEN_LOCK); + } } - /* Try to open it now. */ rc = mdt_finish_open(info, parent, child, create_flags, created, ldlm_rep); @@ -1852,11 +1461,10 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) if (created) { ma->ma_need = 0; ma->ma_valid = 0; - ma->ma_cookie_size = 0; rc = mdo_unlink(info->mti_env, mdt_object_child(parent), mdt_object_child(child), - lname, + &rr->rr_name, &info->mti_attr, 0); if (rc != 0) CERROR("%s: "DFID" cleanup of open: rc = %d\n", @@ -1867,7 +1475,8 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) } EXIT; out_child_unlock: - mdt_object_open_unlock(info, child, lhc, ibits, result); + if (object_locked) + mdt_object_open_unlock(info, child, lhc, ibits, result); out_child: mdt_object_put(info->mti_env, child); out_parent: @@ -1888,19 +1497,23 @@ static struct mdt_object *mdt_orphan_open(struct mdt_thread_info *info, { const struct lu_env *env = info->mti_env; struct md_op_spec *spec = &info->mti_spec; - struct lu_fid *rootfid = &info->mti_tmp_fid1; + struct lu_fid *local_root_fid = &info->mti_tmp_fid1; struct mdt_object *obj = NULL; struct mdt_object *local_root; - static const char name[] = "i_am_nobody"; - struct lu_name *lname; + static const struct lu_name lname = { + .ln_name = "i_am_nobody", + .ln_namelen = sizeof("i_am_nobody") - 1, + }; + struct lu_ucred *uc; + cfs_cap_t uc_cap_save; int rc; ENTRY; - rc = dt_root_get(env, mdt->mdt_bottom, rootfid); + rc = dt_root_get(env, mdt->mdt_bottom, local_root_fid); if (rc != 0) RETURN(ERR_PTR(rc)); - local_root = mdt_object_find(env, mdt, rootfid); + local_root = mdt_object_find(env, mdt, local_root_fid); if (IS_ERR(local_root)) RETURN(local_root); @@ -1920,18 +1533,25 @@ static struct mdt_object *mdt_orphan_open(struct mdt_thread_info *info, spec->sp_cr_flags |= MDS_OPEN_DELAY_CREATE; } - lname = mdt_name(env, (char *)name, sizeof(name) - 1); - rc = mdo_create(env, mdt_object_child(local_root), lname, + uc = lu_ucred(env); + uc_cap_save = uc->uc_cap; + uc->uc_cap |= 1 << CFS_CAP_DAC_OVERRIDE; + rc = mdo_create(env, mdt_object_child(local_root), &lname, mdt_object_child(obj), spec, attr); - if (rc == 0) { - rc = mo_open(env, mdt_object_child(obj), MDS_OPEN_CREATED); - if (rc < 0) - CERROR("%s: cannot open volatile file "DFID", orphan " - "file will be left in PENDING directory until " - "next reboot, rc = %d\n", mdt_obd_name(mdt), - PFID(fid), rc); + uc->uc_cap = uc_cap_save; + if (rc < 0) { + CERROR("%s: cannot create volatile file "DFID": rc = %d\n", + mdt_obd_name(mdt), PFID(fid), rc); + GOTO(out, rc); } - EXIT; + + rc = mo_open(env, mdt_object_child(obj), MDS_OPEN_CREATED); + if (rc < 0) + CERROR("%s: cannot open volatile file "DFID", orphan " + "file will be left in PENDING directory until " + "next reboot, rc = %d\n", mdt_obd_name(mdt), + PFID(fid), rc); + GOTO(out, rc); out: if (rc < 0) { @@ -1957,6 +1577,9 @@ static int mdt_hsm_release(struct mdt_thread_info *info, struct mdt_object *o, int rc2; ENTRY; + if (exp_connect_flags(info->mti_exp) & OBD_CONNECT_RDONLY) + RETURN(-EROFS); + data = req_capsule_client_get(info->mti_pill, &RMF_CLOSE_DATA); if (data == NULL) RETURN(-EPROTO); @@ -1968,8 +1591,7 @@ static int mdt_hsm_release(struct mdt_thread_info *info, struct mdt_object *o, /* try to hold open_sem so that nobody else can open the file */ if (!down_write_trylock(&o->mot_open_sem)) { ldlm_lock_cancel(lease); - LDLM_LOCK_PUT(lease); - RETURN(-EBUSY); + GOTO(out_reprocess, rc = -EBUSY); } /* Check if the lease open lease has already canceled */ @@ -1984,7 +1606,6 @@ static int mdt_hsm_release(struct mdt_thread_info *info, struct mdt_object *o, * have been cancelled. It's okay to cancel it now as we've * held mot_open_sem. */ ldlm_lock_cancel(lease); - LDLM_LOCK_PUT(lease); if (lease_broken) /* don't perform release task */ GOTO(out_unlock, rc = -ESTALE); @@ -1994,7 +1615,7 @@ static int mdt_hsm_release(struct mdt_thread_info *info, struct mdt_object *o, /* ma_need was set before but it seems fine to change it in order to * avoid modifying the one from RPC */ - ma->ma_need = MA_HSM | MA_LOV; + ma->ma_need = MA_HSM; rc = mdt_attr_get_complex(info, o, ma); if (rc != 0) GOTO(out_unlock, rc); @@ -2015,18 +1636,23 @@ static int mdt_hsm_release(struct mdt_thread_info *info, struct mdt_object *o, } ma->ma_valid = MA_INODE; - ma->ma_attr.la_valid &= LA_SIZE | LA_MTIME | LA_ATIME; + ma->ma_attr.la_valid &= LA_ATIME | LA_MTIME | LA_CTIME | LA_SIZE; rc = mo_attr_set(info->mti_env, mdt_object_child(o), ma); if (rc < 0) GOTO(out_unlock, rc); + ma->ma_need = MA_INODE | MA_LOV; + rc = mdt_attr_get_complex(info, o, ma); + if (rc < 0) + GOTO(out_unlock, rc); + if (!(ma->ma_valid & MA_LOV)) { /* Even empty file are released */ memset(ma->ma_lmm, 0, sizeof(*ma->ma_lmm)); ma->ma_lmm->lmm_magic = cpu_to_le32(LOV_MAGIC_V1_DEF); ma->ma_lmm->lmm_pattern = cpu_to_le32(LOV_PATTERN_RAID0); ma->ma_lmm->lmm_stripe_size = cpu_to_le32(LOV_MIN_STRIPE_SIZE); - ma->ma_valid |= MA_LOV; + ma->ma_lmm_size = sizeof(*ma->ma_lmm); } else { /* Magic must be LOV_MAGIC_Vx_DEF otherwise LOD will interpret * ma_lmm as lov_user_md, then it will be confused by union of @@ -2042,13 +1668,14 @@ static int mdt_hsm_release(struct mdt_thread_info *info, struct mdt_object *o, /* Set file as released */ ma->ma_lmm->lmm_pattern |= cpu_to_le32(LOV_PATTERN_F_RELEASED); - /* Hopefully it's not used in this call path */ - orp_ma = &info->mti_u.som.attr; - orp_ma->ma_valid = MA_INODE | MA_LOV; - orp_ma->ma_attr.la_mode = S_IFREG; - orp_ma->ma_attr.la_valid = LA_MODE; + orp_ma = &info->mti_u.hsm.attr; + orp_ma->ma_attr.la_mode = S_IFREG | S_IWUSR; + orp_ma->ma_attr.la_uid = ma->ma_attr.la_uid; + orp_ma->ma_attr.la_gid = ma->ma_attr.la_gid; + orp_ma->ma_attr.la_valid = LA_MODE | LA_UID | LA_GID; orp_ma->ma_lmm = ma->ma_lmm; orp_ma->ma_lmm_size = ma->ma_lmm_size; + orp_ma->ma_valid = MA_INODE | MA_LOV; orphan = mdt_orphan_open(info, info->mti_mdt, &data->cd_fid, orp_ma, FMODE_WRITE); if (IS_ERR(orphan)) { @@ -2066,22 +1693,25 @@ static int mdt_hsm_release(struct mdt_thread_info *info, struct mdt_object *o, ma->ma_hsm.mh_flags |= HS_RELEASED; lustre_hsm2buf(buf->lb_buf, &ma->ma_hsm); ma->ma_hsm.mh_flags &= ~HS_RELEASED; + + mdt_lock_reg_init(lh, LCK_EX); + rc = mdt_object_lock(info, o, lh, MDS_INODELOCK_LAYOUT | + MDS_INODELOCK_XATTR, MDT_LOCAL_LOCK); + if (rc != 0) + GOTO(out_close, rc); + rc = mo_xattr_set(info->mti_env, mdt_object_child(orphan), buf, XATTR_NAME_HSM, 0); - if (rc < 0) - GOTO(out_close, rc); - mdt_lock_reg_init(lh, LCK_EX); - rc = mdt_object_lock(info, o, lh, MDS_INODELOCK_LAYOUT, MDT_LOCAL_LOCK); - if (rc == 0) { + if (rc == 0) /* Swap layout with orphan object */ rc = mo_swap_layouts(info->mti_env, mdt_object_child(o), mdt_object_child(orphan), SWAP_LAYOUTS_MDS_HSM); - /* Release exclusive LL */ - mdt_object_unlock(info, o, lh, 1); - } + /* Release exclusive LL */ + mdt_object_unlock(info, o, lh, 1); + EXIT; out_close: @@ -2102,16 +1732,20 @@ out_unlock: struct mdt_body *repbody; repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY); LASSERT(repbody != NULL); - repbody->valid |= OBD_MD_FLRELEASED; + repbody->mbo_valid |= OBD_MD_FLRELEASED; } +out_reprocess: + ldlm_reprocess_all(lease->l_resource); + LDLM_LOCK_PUT(lease); + ma->ma_valid = 0; ma->ma_need = 0; + return rc; } -#define MFD_CLOSED(mode) (((mode) & ~(MDS_FMODE_EPOCH | MDS_FMODE_SOM | \ - MDS_FMODE_TRUNC)) == MDS_FMODE_CLOSED) +#define MFD_CLOSED(mode) ((mode) == MDS_FMODE_CLOSED) static int mdt_mfd_closed(struct mdt_file_data *mfd) { @@ -2123,7 +1757,6 @@ int mdt_mfd_close(struct mdt_thread_info *info, struct mdt_file_data *mfd) struct mdt_object *o = mfd->mfd_object; struct md_object *next = mdt_object_child(o); struct md_attr *ma = &info->mti_attr; - int ret = MDT_IOEPOCH_CLOSED; int rc = 0; __u64 mode; ENTRY; @@ -2140,16 +1773,10 @@ int mdt_mfd_close(struct mdt_thread_info *info, struct mdt_file_data *mfd) } } - if ((mode & FMODE_WRITE) || (mode & MDS_FMODE_TRUNC)) { - mdt_write_put(o); - ret = mdt_ioepoch_close(info, o); - } else if (mode & MDS_FMODE_EXEC) { - mdt_write_allow(o); - } else if (mode & MDS_FMODE_EPOCH) { - ret = mdt_ioepoch_close(info, o); - } else if (mode & MDS_FMODE_SOM) { - ret = mdt_som_au_close(info, o); - } + if (mode & FMODE_WRITE) + mdt_write_put(o); + else if (mode & MDS_FMODE_EXEC) + mdt_write_allow(o); /* Update atime on close only. */ if ((mode & MDS_FMODE_EXEC || mode & FMODE_READ || mode & FMODE_WRITE) @@ -2170,75 +1797,51 @@ int mdt_mfd_close(struct mdt_thread_info *info, struct mdt_file_data *mfd) if (!MFD_CLOSED(mode)) rc = mo_close(info->mti_env, next, ma, mode); - if (ret == MDT_IOEPOCH_GETATTR || ret == MDT_IOEPOCH_OPENED) { - struct mdt_export_data *med; - - /* The IOepoch is still opened or SOM update is needed. - * Put mfd back into the list. */ - LASSERT(mdt_conn_flags(info) & OBD_CONNECT_SOM); - mdt_mfd_set_mode(mfd, ret == MDT_IOEPOCH_OPENED ? - MDS_FMODE_EPOCH : MDS_FMODE_SOM); - - LASSERT(mdt_info_req(info)); - med = &mdt_info_req(info)->rq_export->exp_mdt_data; - spin_lock(&med->med_open_lock); - cfs_list_add(&mfd->mfd_list, &med->med_open_head); - class_handle_hash_back(&mfd->mfd_handle); - spin_unlock(&med->med_open_lock); - - if (ret == MDT_IOEPOCH_OPENED) { - ret = 0; - } else { - ret = -EAGAIN; - CDEBUG(D_INODE, "Size-on-MDS attribute update is " - "needed on "DFID"\n", PFID(mdt_object_fid(o))); - } - } else { - /* adjust open and lease count */ - if (mode & MDS_OPEN_LEASE) { - LASSERT(atomic_read(&o->mot_lease_count) > 0); - atomic_dec(&o->mot_lease_count); - } - LASSERT(atomic_read(&o->mot_open_count) > 0); - atomic_dec(&o->mot_open_count); - - mdt_mfd_free(mfd); - mdt_object_put(info->mti_env, o); + /* adjust open and lease count */ + if (mode & MDS_OPEN_LEASE) { + LASSERT(atomic_read(&o->mot_lease_count) > 0); + atomic_dec(&o->mot_lease_count); } - RETURN(rc ? rc : ret); + LASSERT(atomic_read(&o->mot_open_count) > 0); + atomic_dec(&o->mot_open_count); + mdt_mfd_free(mfd); + mdt_object_put(info->mti_env, o); + + RETURN(rc); } -int mdt_close(struct mdt_thread_info *info) +int mdt_close(struct tgt_session_info *tsi) { + struct mdt_thread_info *info = tsi2mdt_info(tsi); + struct ptlrpc_request *req = tgt_ses_req(tsi); struct mdt_export_data *med; struct mdt_file_data *mfd; struct mdt_object *o; struct md_attr *ma = &info->mti_attr; struct mdt_body *repbody = NULL; - struct ptlrpc_request *req = mdt_info_req(info); int rc, ret = 0; ENTRY; mdt_counter_incr(req, LPROC_MDT_CLOSE); - /* Close may come with the Size-on-MDS update. Unpack it. */ - rc = mdt_close_unpack(info); - if (rc) - RETURN(err_serious(rc)); - - LASSERT(info->mti_ioepoch); + /* Close may come with the Size-on-MDS update. Unpack it. */ + rc = mdt_close_unpack(info); + if (rc) + GOTO(out, rc = err_serious(rc)); + /* These fields are no longer used and are left for compatibility. + * size is always zero */ req_capsule_set_size(info->mti_pill, &RMF_MDT_MD, RCL_SERVER, - info->mti_mdt->mdt_max_mdsize); + 0); req_capsule_set_size(info->mti_pill, &RMF_LOGCOOKIES, RCL_SERVER, - info->mti_mdt->mdt_max_cookiesize); + 0); rc = req_capsule_server_pack(info->mti_pill); if (mdt_check_resent(info, mdt_reconstruct_generic, NULL)) { mdt_client_compatibility(info); if (rc == 0) mdt_fix_reply(info); mdt_exit_ucred(info); - RETURN(lustre_msg_get_status(req->rq_repmsg)); + GOTO(out, rc = lustre_msg_get_status(req->rq_repmsg)); } /* Continue to close handle even if we can not pack reply */ @@ -2250,32 +1853,26 @@ int mdt_close(struct mdt_thread_info *info) ma->ma_lmm_size = req_capsule_get_size(info->mti_pill, &RMF_MDT_MD, RCL_SERVER); - ma->ma_cookie = req_capsule_server_get(info->mti_pill, - &RMF_LOGCOOKIES); - ma->ma_cookie_size = req_capsule_get_size(info->mti_pill, - &RMF_LOGCOOKIES, - RCL_SERVER); ma->ma_need = MA_INODE | MA_LOV | MA_COOKIE; - repbody->eadatasize = 0; - repbody->aclsize = 0; + repbody->mbo_eadatasize = 0; + repbody->mbo_aclsize = 0; } else { rc = err_serious(rc); } med = &req->rq_export->exp_mdt_data; spin_lock(&med->med_open_lock); - mfd = mdt_handle2mfd(med, &info->mti_ioepoch->handle, - req_is_replay(req)); + mfd = mdt_handle2mfd(med, &info->mti_close_handle, req_is_replay(req)); if (mdt_mfd_closed(mfd)) { spin_unlock(&med->med_open_lock); CDEBUG(D_INODE, "no handle for file close: fid = "DFID ": cookie = "LPX64"\n", PFID(info->mti_rr.rr_fid1), - info->mti_ioepoch->handle.cookie); + info->mti_close_handle.cookie); /** not serious error since bug 3633 */ rc = -ESTALE; } else { class_handle_unhash(&mfd->mfd_handle); - cfs_list_del_init(&mfd->mfd_list); + list_del_init(&mfd->mfd_list); spin_unlock(&med->med_open_lock); /* Do not lose object before last unlink. */ @@ -2293,92 +1890,13 @@ int mdt_close(struct mdt_thread_info *info) } mdt_exit_ucred(info); - if (OBD_FAIL_CHECK(OBD_FAIL_MDS_CLOSE_PACK)) - RETURN(err_serious(-ENOMEM)); - - if (OBD_FAIL_CHECK_RESET(OBD_FAIL_MDS_CLOSE_NET_REP, - OBD_FAIL_MDS_CLOSE_NET_REP)) - info->mti_fail_id = OBD_FAIL_MDS_CLOSE_NET_REP; - RETURN(rc ? rc : ret); -} - -/** - * DONE_WRITING rpc handler. - * - * As mfd is not kept after replayed CLOSE (see mdt_ioepoch_close_on_replay()), - * only those DONE_WRITING rpc will be replayed which really wrote smth on disk, - * and got a trasid. Waiting for such DONE_WRITING is not reliable, so just - * skip attributes and reconstruct the reply here. - */ -int mdt_done_writing(struct mdt_thread_info *info) -{ - struct ptlrpc_request *req = mdt_info_req(info); - struct mdt_body *repbody = NULL; - struct mdt_export_data *med; - struct mdt_file_data *mfd; - int rc; - ENTRY; - - rc = req_capsule_server_pack(info->mti_pill); - if (rc) - RETURN(err_serious(rc)); - - repbody = req_capsule_server_get(info->mti_pill, - &RMF_MDT_BODY); - repbody->eadatasize = 0; - repbody->aclsize = 0; - - /* Done Writing may come with the Size-on-MDS update. Unpack it. */ - rc = mdt_close_unpack(info); - if (rc) - RETURN(err_serious(rc)); - - if (mdt_check_resent(info, mdt_reconstruct_generic, NULL)) { - mdt_exit_ucred(info); - RETURN(lustre_msg_get_status(req->rq_repmsg)); - } + if (OBD_FAIL_CHECK(OBD_FAIL_MDS_CLOSE_PACK)) + GOTO(out, rc = err_serious(-ENOMEM)); - med = &info->mti_exp->exp_mdt_data; - spin_lock(&med->med_open_lock); - mfd = mdt_handle2mfd(med, &info->mti_ioepoch->handle, - req_is_replay(req)); - if (mfd == NULL) { - spin_unlock(&med->med_open_lock); - CDEBUG(D_INODE, "no handle for done write: fid = "DFID - ": cookie = "LPX64" ioepoch = "LPU64"\n", - PFID(info->mti_rr.rr_fid1), - info->mti_ioepoch->handle.cookie, - info->mti_ioepoch->ioepoch); - /* If this is a replay, reconstruct the transno. */ - if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) { - rc = info->mti_ioepoch->flags & MF_SOM_AU ? - -EAGAIN : 0; - mdt_empty_transno(info, rc); - } else - rc = -ESTALE; - GOTO(error_ucred, rc); - } - - LASSERT(mfd->mfd_mode == MDS_FMODE_EPOCH || - mfd->mfd_mode == MDS_FMODE_TRUNC); - class_handle_unhash(&mfd->mfd_handle); - cfs_list_del_init(&mfd->mfd_list); - spin_unlock(&med->med_open_lock); - - /* Set EPOCH CLOSE flag if not set by client. */ - info->mti_ioepoch->flags |= MF_EPOCH_CLOSE; - info->mti_attr.ma_valid = 0; - - info->mti_attr.ma_lmm_size = info->mti_mdt->mdt_max_mdsize; - OBD_ALLOC_LARGE(info->mti_attr.ma_lmm, info->mti_mdt->mdt_max_mdsize); - if (info->mti_attr.ma_lmm == NULL) - GOTO(error_ucred, rc = -ENOMEM); - - rc = mdt_mfd_close(info, mfd); - - OBD_FREE_LARGE(info->mti_attr.ma_lmm, info->mti_mdt->mdt_max_mdsize); - mdt_empty_transno(info, rc); -error_ucred: - mdt_exit_ucred(info); - RETURN(rc); + if (OBD_FAIL_CHECK_RESET(OBD_FAIL_MDS_CLOSE_NET_REP, + OBD_FAIL_MDS_CLOSE_NET_REP)) + tsi->tsi_reply_fail_id = OBD_FAIL_MDS_CLOSE_NET_REP; +out: + mdt_thread_info_fini(info); + RETURN(rc ? rc : ret); }