X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_open.c;h=81d606947784573c294569a3ae8b64e6a8e38bdd;hb=06a67987e06f7fa9c0bfde549d54e2bed0a78ade;hp=e98a567fe2c7040462a183cb33a803acbddd2d33;hpb=33b4bafea13bd2cfe90dba3a8651a175683f3999;p=fs%2Flustre-release.git diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c index e98a567..81d6069 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,8 +85,7 @@ 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; cfs_list_for_each_entry(mfd, &med->med_open_head, mfd_list) { if (mfd->mfd_old_handle.cookie == handle->cookie) @@ -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_lut.lut_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; @@ -667,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 @@ -1079,7 +1078,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); @@ -1164,6 +1163,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); @@ -1194,7 +1194,7 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) 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); @@ -1244,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)), @@ -1284,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); @@ -1369,7 +1379,7 @@ 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; if (create_flags & FMODE_WRITE) @@ -1513,6 +1523,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)