X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_open.c;h=d581b82e796b67009acd3211926a4d14bb99759f;hb=999a8f1f0f9ab1a47843b4fa24ff88e5afd894b2;hp=741e19bba4355c62464da6aade0342a7f28e97dc;hpb=a47e2ad3d2191482a87f1f864de4fd5a3328b062;p=fs%2Flustre-release.git diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c index 741e19b..d581b82 100644 --- a/lustre/mdt/mdt_open.c +++ b/lustre/mdt/mdt_open.c @@ -26,7 +26,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -85,10 +85,9 @@ struct mdt_file_data *mdt_handle2mfd(struct mdt_thread_info *info, LASSERT(handle != NULL); mfd = class_handle2object(handle->cookie); /* during dw/setattr replay the mfd can be found by old handle */ - if (mfd == NULL && - lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) { + if (mfd == NULL && req_is_replay(req)) { struct mdt_export_data *med = &req->rq_export->exp_mdt_data; - list_for_each_entry(mfd, &med->med_open_head, mfd_list) { + cfs_list_for_each_entry(mfd, &med->med_open_head, mfd_list) { if (mfd->mfd_old_handle.cookie == handle->cookie) RETURN (mfd); } @@ -100,7 +99,7 @@ struct mdt_file_data *mdt_handle2mfd(struct mdt_thread_info *info, /* free mfd */ void mdt_mfd_free(struct mdt_file_data *mfd) { - LASSERT(list_empty(&mfd->mfd_list)); + LASSERT(cfs_list_empty(&mfd->mfd_list)); OBD_FREE_RCU(mfd, sizeof *mfd, &mfd->mfd_handle); } @@ -162,14 +161,14 @@ int mdt_ioepoch_open(struct mdt_thread_info *info, struct mdt_object *o, !S_ISREG(lu_object_attr(&o->mot_obj.mo_lu))) RETURN(0); - down(&o->mot_ioepoch_sem); + cfs_down(&o->mot_ioepoch_sem); 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); + cfs_spin_lock(&mdt->mdt_ioepoch_lock); if (mdt->mdt_ioepoch < info->mti_replayepoch) mdt->mdt_ioepoch = info->mti_replayepoch; @@ -180,7 +179,7 @@ int mdt_ioepoch_open(struct mdt_thread_info *info, struct mdt_object *o, else o->mot_ioepoch = mdt->mdt_ioepoch; - spin_unlock(&mdt->mdt_ioepoch_lock); + cfs_spin_unlock(&mdt->mdt_ioepoch_lock); CDEBUG(D_INODE, "starting epoch "LPU64" for "DFID"\n", o->mot_ioepoch, PFID(mdt_object_fid(o))); @@ -189,7 +188,7 @@ int mdt_ioepoch_open(struct mdt_thread_info *info, struct mdt_object *o, cancel = 1; } o->mot_ioepoch_count++; - up(&o->mot_ioepoch_sem); + cfs_up(&o->mot_ioepoch_sem); /* Cancel Size-on-MDS attributes cached on clients for the open case. * In the truncate case, see mdt_reint_setattr(). */ @@ -231,7 +230,7 @@ static int mdt_som_attr_set(struct mdt_thread_info *info, ma->ma_som->msd_size = la->la_valid & LA_SIZE ? la->la_size : 0; ma->ma_som->msd_blocks = la->la_valid & LA_BLOCKS ? la->la_blocks : 0; - ma->ma_som->msd_mountid = mdt->mdt_mount_count; + ma->ma_som->msd_mountid = mdt->mdt_lut.lut_obd->u.obt.obt_mount_count; ma->ma_attr.la_valid &= LA_ATIME | LA_MTIME | LA_CTIME; } else { ma->ma_som->msd_ioepoch = IOEPOCH_INVAL; @@ -255,7 +254,7 @@ static inline int mdt_ioepoch_close_on_eviction(struct mdt_thread_info *info, { int rc = 0; - down(&o->mot_ioepoch_sem); + cfs_down(&o->mot_ioepoch_sem); CDEBUG(D_INODE, "Eviction. Closing IOepoch "LPU64" on "DFID". " "Count %d\n", o->mot_ioepoch, PFID(mdt_object_fid(o)), o->mot_ioepoch_count); @@ -268,7 +267,7 @@ static inline int mdt_ioepoch_close_on_eviction(struct mdt_thread_info *info, rc = mdt_som_attr_set(info, o, o->mot_ioepoch, MDT_SOM_DISABLE); mdt_object_som_enable(o, o->mot_ioepoch); } - up(&o->mot_ioepoch_sem); + cfs_up(&o->mot_ioepoch_sem); RETURN(rc); } @@ -280,24 +279,32 @@ static inline int mdt_ioepoch_close_on_eviction(struct mdt_thread_info *info, static inline int mdt_ioepoch_close_on_replay(struct mdt_thread_info *info, struct mdt_object *o) { + int rc = MDT_IOEPOCH_CLOSED; ENTRY; - down(&o->mot_ioepoch_sem); + cfs_down(&o->mot_ioepoch_sem); 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); - up(&o->mot_ioepoch_sem); + cfs_up(&o->mot_ioepoch_sem); - RETURN(0); + 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. + * 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. @@ -316,7 +323,7 @@ static inline int mdt_ioepoch_close_reg(struct mdt_thread_info *info, la = &info->mti_attr.ma_attr; achange = (info->mti_ioepoch->flags & MF_SOM_CHANGE); - down(&o->mot_ioepoch_sem); + cfs_down(&o->mot_ioepoch_sem); o->mot_ioepoch_count--; tmp_ma = &info->mti_u.som.attr; @@ -383,10 +390,20 @@ static inline int mdt_ioepoch_close_reg(struct mdt_thread_info *info, mdt_object_som_enable(o, o->mot_ioepoch); } - EXIT; + cfs_up(&o->mot_ioepoch_sem); + /* 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: - up(&o->mot_ioepoch_sem); - return rc ? : ret; + cfs_up(&o->mot_ioepoch_sem); + return rc; } /** @@ -454,7 +471,7 @@ int mdt_som_au_close(struct mdt_thread_info *info, struct mdt_object *o) !(info->mti_attr.ma_attr.la_valid & LA_SIZE))) act = MDT_SOM_DISABLE; - down(&o->mot_ioepoch_sem); + cfs_down(&o->mot_ioepoch_sem); /* Mark the object it is the recovery state if we failed to obtain * SOM attributes. */ if (act == MDT_SOM_DISABLE) @@ -468,7 +485,7 @@ int mdt_som_au_close(struct mdt_thread_info *info, struct mdt_object *o) rc = mdt_som_attr_set(info, o, ioepoch, act); mdt_object_som_enable(o, ioepoch); } - up(&o->mot_ioepoch_sem); + cfs_up(&o->mot_ioepoch_sem); RETURN(rc); } @@ -476,9 +493,9 @@ int mdt_write_read(struct mdt_object *o) { int rc = 0; ENTRY; - down(&o->mot_ioepoch_sem); + cfs_down(&o->mot_ioepoch_sem); rc = o->mot_writecount; - up(&o->mot_ioepoch_sem); + cfs_up(&o->mot_ioepoch_sem); RETURN(rc); } @@ -486,21 +503,21 @@ int mdt_write_get(struct mdt_object *o) { int rc = 0; ENTRY; - down(&o->mot_ioepoch_sem); + cfs_down(&o->mot_ioepoch_sem); if (o->mot_writecount < 0) rc = -ETXTBSY; else o->mot_writecount++; - up(&o->mot_ioepoch_sem); + cfs_up(&o->mot_ioepoch_sem); RETURN(rc); } void mdt_write_put(struct mdt_object *o) { ENTRY; - down(&o->mot_ioepoch_sem); + cfs_down(&o->mot_ioepoch_sem); o->mot_writecount--; - up(&o->mot_ioepoch_sem); + cfs_up(&o->mot_ioepoch_sem); EXIT; } @@ -508,21 +525,21 @@ static int mdt_write_deny(struct mdt_object *o) { int rc = 0; ENTRY; - down(&o->mot_ioepoch_sem); + cfs_down(&o->mot_ioepoch_sem); if (o->mot_writecount > 0) rc = -ETXTBSY; else o->mot_writecount--; - up(&o->mot_ioepoch_sem); + cfs_up(&o->mot_ioepoch_sem); RETURN(rc); } static void mdt_write_allow(struct mdt_object *o) { ENTRY; - down(&o->mot_ioepoch_sem); + cfs_down(&o->mot_ioepoch_sem); o->mot_writecount++; - up(&o->mot_ioepoch_sem); + cfs_up(&o->mot_ioepoch_sem); EXIT; } @@ -539,17 +556,17 @@ static void mdt_empty_transno(struct mdt_thread_info* info) return; } - spin_lock(&mdt->mdt_transno_lock); + cfs_spin_lock(&mdt->mdt_lut.lut_translock); if (info->mti_transno == 0) { - info->mti_transno = ++ mdt->mdt_last_transno; + info->mti_transno = ++ mdt->mdt_lut.lut_last_transno; } else { /* should be replay */ - if (info->mti_transno > mdt->mdt_last_transno) - mdt->mdt_last_transno = info->mti_transno; + if (info->mti_transno > mdt->mdt_lut.lut_last_transno) + mdt->mdt_lut.lut_last_transno = info->mti_transno; } - spin_unlock(&mdt->mdt_transno_lock); + cfs_spin_unlock(&mdt->mdt_lut.lut_translock); - CDEBUG(D_INODE, "transno = %llu, last_committed = %llu\n", + CDEBUG(D_INODE, "transno = "LPU64", last_committed = "LPU64"\n", info->mti_transno, req->rq_export->exp_obd->obd_last_committed); @@ -569,7 +586,7 @@ void mdt_mfd_set_mode(struct mdt_file_data *mfd, int mode) } static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p, - struct mdt_object *o, int flags, int created) + struct mdt_object *o, __u64 flags, int created) { struct ptlrpc_request *req = mdt_info_req(info); struct mdt_export_data *med = &req->rq_export->exp_mdt_data; @@ -649,7 +666,7 @@ static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p, mfd->mfd_xid = req->rq_xid; /* replay handle */ - if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) { + if (req_is_replay(req)) { struct mdt_file_data *old_mfd; /* Check wheather old cookie already exist in * the list, becasue when do recovery, client @@ -660,14 +677,13 @@ static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p, old_mfd = mdt_handle2mfd(info, info->mti_rr.rr_handle); if (old_mfd) { CDEBUG(D_HA, "del orph mfd %p fid=("DFID") " - "cookie=" LPX64"\n", - mfd, + "cookie=" LPX64"\n", mfd, PFID(mdt_object_fid(mfd->mfd_object)), info->mti_rr.rr_handle->cookie); - spin_lock(&med->med_open_lock); + cfs_spin_lock(&med->med_open_lock); class_handle_unhash(&old_mfd->mfd_handle); - list_del_init(&old_mfd->mfd_list); - spin_unlock(&med->med_open_lock); + cfs_list_del_init(&old_mfd->mfd_list); + cfs_spin_unlock(&med->med_open_lock); mdt_mfd_close(info, old_mfd); } CDEBUG(D_HA, "Store old cookie "LPX64" in new mfd\n", @@ -678,15 +694,15 @@ static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p, repbody->handle.cookie = mfd->mfd_handle.h_cookie; if (req->rq_export->exp_disconnected) { - spin_lock(&med->med_open_lock); + cfs_spin_lock(&med->med_open_lock); class_handle_unhash(&mfd->mfd_handle); - list_del_init(&mfd->mfd_list); - spin_unlock(&med->med_open_lock); + cfs_list_del_init(&mfd->mfd_list); + cfs_spin_unlock(&med->med_open_lock); mdt_mfd_close(info, mfd); } else { - spin_lock(&med->med_open_lock); - list_add(&mfd->mfd_list, &med->med_open_head); - spin_unlock(&med->med_open_lock); + cfs_spin_lock(&med->med_open_lock); + cfs_list_add(&mfd->mfd_list, &med->med_open_head); + cfs_spin_unlock(&med->med_open_lock); } mdt_empty_transno(info); @@ -699,7 +715,7 @@ static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p, static int mdt_finish_open(struct mdt_thread_info *info, struct mdt_object *p, struct mdt_object *o, - int flags, int created, struct ldlm_reply *rep) + __u64 flags, int created, struct ldlm_reply *rep) { struct ptlrpc_request *req = mdt_info_req(info); struct obd_export *exp = req->rq_export; @@ -710,7 +726,7 @@ static int mdt_finish_open(struct mdt_thread_info *info, struct mdt_body *repbody; int rc = 0; int isreg, isdir, islnk; - struct list_head *t; + cfs_list_t *t; ENTRY; LASSERT(ma->ma_valid & MA_INODE); @@ -826,15 +842,15 @@ static int mdt_finish_open(struct mdt_thread_info *info, mfd = NULL; if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_RESENT) { - spin_lock(&med->med_open_lock); - list_for_each(t, &med->med_open_head) { - mfd = list_entry(t, struct mdt_file_data, mfd_list); + cfs_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); if (mfd->mfd_xid == req->rq_xid) { break; } mfd = NULL; } - spin_unlock(&med->med_open_lock); + cfs_spin_unlock(&med->med_open_lock); if (mfd != NULL) { repbody->handle.cookie = mfd->mfd_handle.h_cookie; @@ -865,8 +881,8 @@ void mdt_reconstruct_open(struct mdt_thread_info *info, struct mdt_device *mdt = info->mti_mdt; struct req_capsule *pill = info->mti_pill; struct ptlrpc_request *req = mdt_info_req(info); - struct mdt_export_data *med = &req->rq_export->exp_mdt_data; - struct lsd_client_data *lcd = med->med_lcd; + struct tg_export_data *ted = &req->rq_export->exp_target_data; + 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; @@ -890,7 +906,7 @@ void mdt_reconstruct_open(struct mdt_thread_info *info, ma->ma_valid = 0; - mdt_req_from_lcd(req, med->med_lcd); + mdt_req_from_lcd(req, lcd); mdt_set_disposition(info, ldlm_rep, lcd->lcd_last_data); CERROR("This is reconstruct open: disp="LPX64", result=%d\n", @@ -1061,7 +1077,7 @@ static int mdt_open_anon_by_fid(struct mdt_thread_info* info, mdt_set_disposition(info, rep, DISP_OPEN_LOCK); rc = mdt_finish_open(info, NULL, o, flags, 0, rep); - if (!(flags & MDS_OPEN_LOCK)) + if (!(flags & MDS_OPEN_LOCK) || rc) mdt_object_unlock(info, o, lhc, 1); GOTO(out, rc); @@ -1135,7 +1151,7 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) struct mdt_body *repbody; struct lu_fid *child_fid = &info->mti_tmp_fid1; struct md_attr *ma = &info->mti_attr; - __u32 create_flags = info->mti_spec.sp_cr_flags; + __u64 create_flags = info->mti_spec.sp_cr_flags; struct mdt_reint_record *rr = &info->mti_rr; struct lu_name *lname; int result, rc; @@ -1146,6 +1162,7 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) OBD_FAIL_TIMEOUT_ORSET(OBD_FAIL_MDS_PAUSE_OPEN, OBD_FAIL_ONCE, (obd_timeout + 1) / 4); + mdt_counter_incr(req->rq_export, 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); @@ -1171,12 +1188,12 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) GOTO(out, result = err_serious(-EINVAL)); CDEBUG(D_INODE, "I am going to open "DFID"/(%s->"DFID") " - "cr_flag=0%o mode=0%06o msg_flag=0x%x\n", + "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); - if (msg_flags & MSG_REPLAY || + if (req_is_replay(req) || (req->rq_export->exp_libclient && create_flags&MDS_OPEN_HAS_EA)) { /* This is a replay request or from liblustre with ea. */ result = mdt_open_by_fid(info, ldlm_rep); @@ -1192,15 +1209,16 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) * via a regular replay. */ if (!(create_flags & MDS_OPEN_CREAT)) { - DEBUG_REQ(D_ERROR, req,"OPEN & CREAT not in open replay."); + DEBUG_REQ(D_ERROR, req, + "OPEN & CREAT not in open replay."); GOTO(out, result = -EFAULT); } CDEBUG(D_INFO, "Open replay did find object, continue as " "regular open\n"); - } else if (rr->rr_namelen == 0 && !info->mti_cross_ref) { + } else if (rr->rr_namelen == 0 && !info->mti_cross_ref && + create_flags & MDS_OPEN_LOCK) { result = mdt_open_anon_by_fid(info, ldlm_rep, lhc); - if (result != -ENOENT) - GOTO(out, result); + GOTO(out, result); } if (OBD_FAIL_CHECK(OBD_FAIL_MDS_OPEN_PACK)) @@ -1226,10 +1244,14 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) if (IS_ERR(parent)) GOTO(out, result = PTR_ERR(parent)); + /* get and check version of parent */ + result = mdt_version_get_check(info, parent, 0); + if (result) + GOTO(out_parent, result); + 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)), @@ -1266,17 +1288,23 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) if (IS_ERR(child)) GOTO(out_parent, result = PTR_ERR(child)); + /** check version of child */ + rc = mdt_version_get_check(info, child, 1); + if (rc) + GOTO(out_child, result = rc); + mdt_set_capainfo(info, 1, child_fid, BYPASS_CAPA); if (result == -ENOENT) { + /* 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; + /* Not found and with MDS_OPEN_CREAT: let's create it. */ mdt_set_disposition(info, ldlm_rep, DISP_OPEN_CREATE); - info->mti_mos[0] = parent; - info->mti_mos[1] = child; - result = mdt_version_get_check(info, 0); - if (result) - GOTO(out_child, result); - /* Let lower layers know what is lock mode on directory. */ info->mti_spec.sp_cr_mode = mdt_dlm_mode2mdl_mode(lh->mlh_pdo_mode); @@ -1351,10 +1379,9 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) LASSERT(!lustre_handle_is_used(&lhc->mlh_reg_lh)); /* get openlock if this is not replay and if a client requested it */ - if (!(msg_flags & MSG_REPLAY) && create_flags & MDS_OPEN_LOCK) { + if (!req_is_replay(req) && create_flags & MDS_OPEN_LOCK) { ldlm_mode_t lm; - LASSERT(!created); if (create_flags & FMODE_WRITE) lm = LCK_CW; else if (create_flags & MDS_FMODE_EXEC) @@ -1402,7 +1429,7 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) out_child: mdt_object_put(info->mti_env, child); out_parent: - mdt_object_unlock_put(info, parent, lh, result); + mdt_object_unlock_put(info, parent, lh, result || !created); out: if (result && result != -EREMOTE) lustre_msg_set_transno(req->rq_repmsg, 0); @@ -1444,6 +1471,7 @@ int mdt_mfd_close(struct mdt_thread_info *info, struct mdt_file_data *mfd) if ((mode & MDS_FMODE_EXEC || mode & FMODE_READ || mode & FMODE_WRITE) && (ma->ma_valid & MA_INODE) && (ma->ma_attr.la_valid & LA_ATIME)) { /* Set the atime only. */ + ma->ma_valid = MA_INODE; ma->ma_attr.la_valid = LA_ATIME; rc = mo_attr_set(info->mti_env, next, ma); } @@ -1465,10 +1493,10 @@ int mdt_mfd_close(struct mdt_thread_info *info, struct mdt_file_data *mfd) LASSERT(mdt_info_req(info)); med = &mdt_info_req(info)->rq_export->exp_mdt_data; - spin_lock(&med->med_open_lock); - list_add(&mfd->mfd_list, &med->med_open_head); + cfs_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); + cfs_spin_unlock(&med->med_open_lock); if (ret == MDT_IOEPOCH_OPENED) { ret = 0; @@ -1496,6 +1524,7 @@ int mdt_close(struct mdt_thread_info *info) int rc, ret = 0; ENTRY; + mdt_counter_incr(req->rq_export, LPROC_MDT_CLOSE); /* Close may come with the Size-on-MDS update. Unpack it. */ rc = mdt_close_unpack(info); if (rc) @@ -1536,10 +1565,10 @@ int mdt_close(struct mdt_thread_info *info) } med = &req->rq_export->exp_mdt_data; - spin_lock(&med->med_open_lock); + cfs_spin_lock(&med->med_open_lock); mfd = mdt_handle2mfd(info, &info->mti_ioepoch->handle); if (mdt_mfd_closed(mfd)) { - spin_unlock(&med->med_open_lock); + cfs_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); @@ -1547,8 +1576,8 @@ int mdt_close(struct mdt_thread_info *info) rc = -ESTALE; } else { class_handle_unhash(&mfd->mfd_handle); - list_del_init(&mfd->mfd_list); - spin_unlock(&med->med_open_lock); + cfs_list_del_init(&mfd->mfd_list); + cfs_spin_unlock(&med->med_open_lock); /* Do not lose object before last unlink. */ o = mfd->mfd_object; @@ -1606,10 +1635,10 @@ int mdt_done_writing(struct mdt_thread_info *info) RETURN(lustre_msg_get_status(req->rq_repmsg)); med = &info->mti_exp->exp_mdt_data; - spin_lock(&med->med_open_lock); + cfs_spin_lock(&med->med_open_lock); mfd = mdt_handle2mfd(info, &info->mti_ioepoch->handle); if (mfd == NULL) { - spin_unlock(&med->med_open_lock); + cfs_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), @@ -1618,7 +1647,8 @@ int mdt_done_writing(struct mdt_thread_info *info) /* If this is a replay, reconstruct the transno. */ if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) { mdt_empty_transno(info); - RETURN(0); + RETURN(info->mti_ioepoch->flags & MF_SOM_AU ? + -EAGAIN : 0); } RETURN(-ESTALE); } @@ -1626,21 +1656,21 @@ int mdt_done_writing(struct mdt_thread_info *info) LASSERT(mfd->mfd_mode == FMODE_EPOCH || mfd->mfd_mode == FMODE_TRUNC); class_handle_unhash(&mfd->mfd_handle); - list_del_init(&mfd->mfd_list); - spin_unlock(&med->med_open_lock); + cfs_list_del_init(&mfd->mfd_list); + cfs_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(info->mti_attr.ma_lmm, info->mti_attr.ma_lmm_size); + OBD_ALLOC(info->mti_attr.ma_lmm, info->mti_mdt->mdt_max_mdsize); if (info->mti_attr.ma_lmm == NULL) RETURN(-ENOMEM); rc = mdt_mfd_close(info, mfd); - OBD_FREE(info->mti_attr.ma_lmm, info->mti_attr.ma_lmm_size); + OBD_FREE(info->mti_attr.ma_lmm, info->mti_mdt->mdt_max_mdsize); mdt_empty_transno(info); RETURN(rc); }