X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmds%2Fmds_open.c;h=0ed7c66787270ff0b69ba9ffc2a7d147eaa6ac1a;hb=c7e34b11887dc6bdf9b294925462469519ddf1a1;hp=6ddd8da9bcd7c1bf465c588bbf32e9ab6f8b0d4d;hpb=55bc4d0b900af9e9048c24c08ca558fc3d007b2f;p=fs%2Flustre-release.git diff --git a/lustre/mds/mds_open.c b/lustre/mds/mds_open.c index 6ddd8da..0ed7c66 100644 --- a/lustre/mds/mds_open.c +++ b/lustre/mds/mds_open.c @@ -28,8 +28,10 @@ #endif #define DEBUG_SUBSYSTEM S_MDS +#include #include #include +#include #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) # include # include @@ -53,7 +55,7 @@ * mds_mfd_close - for force closing files when a client dies */ -/* +/* * MDS file data handling: file data holds a handle for a file opened * by a client. */ @@ -131,7 +133,7 @@ static void mds_free_filterdata(struct inode *inode) iput(inode); } -/* Write access to a file: executors cause a negative count, +/* Write access to a file: executors cause a negative count, * writers a positive count. The semaphore is needed to perform * a check for the sign and then increment or decrement atomically. * @@ -242,7 +244,7 @@ static struct mds_file_data *mds_dentry_open(struct dentry *dentry, struct mds_body *body; int error; ENTRY; - + mfd = mds_mfd_new(); if (mfd == NULL) { CERROR("mds: out of memory\n"); @@ -302,13 +304,15 @@ static void mds_objids_from_lmm(obd_id *ids, struct lov_mds_md *lmm, static int mds_create_objects(struct ptlrpc_request *req, int offset, struct mds_update_record *rec, struct mds_obd *mds, struct obd_device *obd, - struct inode *inode, void **handle, obd_id **ids) + struct dentry *dchild, void **handle, + obd_id **ids) { struct obdo *oa; struct obd_trans_info oti = { 0 }; struct mds_body *body; struct lov_stripe_md *lsm = NULL; struct lov_mds_md *lmm = NULL; + struct inode *inode = dchild->d_inode; void *lmm_buf; int rc, lmm_bufsize, lmm_size; ENTRY; @@ -338,7 +342,8 @@ static int mds_create_objects(struct ptlrpc_request *req, int offset, } /* replay case */ - if (rec->ur_fid2->id) { + if(lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) { + LASSERT (rec->ur_fid2->id); body->valid |= OBD_MD_FLBLKSZ | OBD_MD_FLEASIZE; lmm_size = rec->ur_eadatalen; lmm = rec->ur_eadata; @@ -357,6 +362,10 @@ static int mds_create_objects(struct ptlrpc_request *req, int offset, RETURN(0); } + + if (OBD_FAIL_CHECK_ONCE(OBD_FAIL_MDS_ALLOC_OBDO)) + GOTO(out_ids, rc = -ENOMEM); + oa = obdo_alloc(); if (oa == NULL) GOTO(out_ids, rc = -ENOMEM); @@ -372,28 +381,53 @@ static int mds_create_objects(struct ptlrpc_request *req, int offset, obdo_from_inode(oa, inode, OBD_MD_FLTYPE|OBD_MD_FLATIME|OBD_MD_FLMTIME| OBD_MD_FLCTIME); - /* check if things like lstripe/lfs stripe are sending us the ea */ - if (rec->ur_flags & MDS_OPEN_HAS_EA) { - rc = obd_iocontrol(OBD_IOC_LOV_SETSTRIPE, mds->mds_osc_exp, + if (!(rec->ur_flags & MDS_OPEN_HAS_OBJS)) { + /* check if things like lstripe/lfs stripe are sending us the ea */ + if (rec->ur_flags & MDS_OPEN_HAS_EA) { + rc = obd_iocontrol(OBD_IOC_LOV_SETSTRIPE, + mds->mds_osc_exp, + 0, &lsm, rec->ur_eadata); + if (rc) + GOTO(out_oa, rc); + } else { + OBD_ALLOC(lmm, mds->mds_max_mdsize); + if (lmm == NULL) + GOTO(out_oa, rc = -ENOMEM); + + lmm_size = mds->mds_max_mdsize; + rc = mds_get_md(obd, dchild->d_parent->d_inode, + lmm, &lmm_size, 1); + if (rc > 0) + rc = obd_iocontrol(OBD_IOC_LOV_SETSTRIPE, + mds->mds_osc_exp, + 0, &lsm, lmm); + OBD_FREE(lmm, mds->mds_max_mdsize); + if (rc) + GOTO(out_oa, rc); + } + rc = obd_create(mds->mds_osc_exp, oa, &lsm, &oti); + if (rc) { + int level = D_ERROR; + if (rc == -ENOSPC) + level = D_INODE; + CDEBUG(level, "error creating objects for " + "inode %lu: rc = %d\n", + inode->i_ino, rc); + if (rc > 0) { + CERROR("obd_create returned invalid " + "rc %d\n", rc); + rc = -EIO; + } + GOTO(out_oa, rc); + } + } else { + rc = obd_iocontrol(OBD_IOC_LOV_SETEA, mds->mds_osc_exp, 0, &lsm, rec->ur_eadata); - if (rc) + if (rc) { GOTO(out_oa, rc); - } - - rc = obd_create(mds->mds_osc_exp, oa, &lsm, &oti); - if (rc) { - int level = D_ERROR; - if (rc == -ENOSPC) - level = D_INODE; - CDEBUG(level, "error creating objects for inode %lu: rc = %d\n", - inode->i_ino, rc); - if (rc > 0) { - CERROR("obd_create returned invalid rc %d\n", rc); - rc = -EIO; } - GOTO(out_oa, rc); + lsm->lsm_object_id = oa->o_id; } - if (inode->i_size) { oa->o_size = inode->i_size; obdo_from_inode(oa, inode, OBD_MD_FLTYPE|OBD_MD_FLATIME| @@ -444,7 +478,6 @@ static void reconstruct_open(struct mds_update_record *rec, int offset, struct ptlrpc_request *req, struct lustre_handle *child_lockh) { - struct ptlrpc_request *oldreq = req->rq_export->exp_outstanding_reply; struct mds_export_data *med = &req->rq_export->exp_mds_data; struct mds_client_data *mcd = med->med_mcd; struct mds_obd *mds = mds_req2mds(req); @@ -542,10 +575,11 @@ static void reconstruct_open(struct mds_update_record *rec, int offset, mfd = NULL; } - if (oldreq != NULL) { - /* if we're not recovering, it had better be found */ - LASSERT(mfd != NULL); - } else if (mfd == NULL) { + /* #warning "XXX fixme" bug 2991 */ + /* Here it used to LASSERT(mfd) if exp_outstanding_reply != NULL. + * Now that exp_outstanding_reply is a list, it's just using mfd != NULL + * to detect a re-open */ + if (mfd == NULL) { mntget(mds->mds_vfsmnt); CERROR("Re-opened file \n"); mfd = mds_dentry_open(child, mds->mds_vfsmnt, @@ -587,7 +621,7 @@ static int mds_finish_open(struct ptlrpc_request *req, struct dentry *dchild, struct obd_device *obd = req->rq_export->exp_obd; struct mds_file_data *mfd = NULL; obd_id *ids = NULL; /* object IDs created */ - int rc; + int rc = 0; ENTRY; /* atomically create objects if necessary */ @@ -604,7 +638,7 @@ static int mds_finish_open(struct ptlrpc_request *req, struct dentry *dchild, if (rec != NULL) { /* no EA: create objects */ rc = mds_create_objects(req, 2, rec, mds, obd, - dchild->d_inode, handle, &ids); + dchild, handle, &ids); if (rc) { CERROR("mds_create_objects: rc = %d\n", rc); up(&dchild->d_inode->i_sem); @@ -630,8 +664,8 @@ static int mds_finish_open(struct ptlrpc_request *req, struct dentry *dchild, mds_lov_update_objids(obd, ids); OBD_FREE(ids, sizeof(*ids) * mds->mds_lov_desc.ld_tgt_count); } - if (rc) - mds_mfd_destroy(mfd); + //if (rc) + // mds_mfd_destroy(mfd); RETURN(rc); } @@ -721,7 +755,7 @@ int mds_pin(struct ptlrpc_request *req) int mds_lock_new_child(struct obd_device *obd, struct inode *inode, struct lustre_handle *child_lockh) { - struct ldlm_res_id child_res_id = { .name = { inode->i_ino } }; + struct ldlm_res_id child_res_id = { .name = { inode->i_ino, 0, 1, 0 } }; struct lustre_handle lockh; int lock_flags = 0; int rc; @@ -729,16 +763,16 @@ int mds_lock_new_child(struct obd_device *obd, struct inode *inode, if (child_lockh == NULL) child_lockh = &lockh; - rc = ldlm_cli_enqueue(NULL, NULL, obd->obd_namespace, NULL, - child_res_id, LDLM_PLAIN, NULL, 0, - LCK_EX, &lock_flags, ldlm_completion_ast, - mds_blocking_ast, NULL, child_lockh); + rc = ldlm_cli_enqueue(NULL, NULL, obd->obd_namespace, child_res_id, + LDLM_PLAIN, NULL, LCK_EX, &lock_flags, + mds_blocking_ast, ldlm_completion_ast, NULL, NULL, + NULL, 0, NULL, child_lockh); if (rc != ELDLM_OK) CERROR("ldlm_cli_enqueue: %d\n", rc); else if (child_lockh == &lockh) ldlm_lock_decref(child_lockh, LCK_EX); - return rc; + RETURN(rc); } int mds_open(struct mds_update_record *rec, int offset, @@ -773,7 +807,12 @@ int mds_open(struct mds_update_record *rec, int offset, /* Step 0: If we are passed a fid, then we assume the client already * opened this file and is only replaying the RPC, so we open the * inode by fid (at some large expense in security). */ - if (rec->ur_fid2->id) { + if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) { + DEBUG_REQ(D_HA, req, "open replay, disp: "LPX64"\n", + rep->lock_policy_res1); + + LASSERT(rec->ur_fid2->id); + rc = mds_open_by_fid(req, rec->ur_fid2, body, rec->ur_flags, rec, rep); if (rc != -ENOENT) @@ -781,7 +820,10 @@ int mds_open(struct mds_update_record *rec, int offset, /* We didn't find the correct inode on disk either, so we * need to re-create it via a regular replay. */ LASSERT(rec->ur_flags & MDS_OPEN_CREAT); + } else { + LASSERT(!rec->ur_fid2->id); } + LASSERT(offset == 2); /* If we got here, we must be called via intent */ med = &req->rq_export->exp_mds_data; @@ -809,8 +851,11 @@ int mds_open(struct mds_update_record *rec, int offset, /* Step 2: Lookup the child */ dchild = ll_lookup_one_len(rec->ur_name, dparent, rec->ur_namelen - 1); - if (IS_ERR(dchild)) - GOTO(cleanup, rc = PTR_ERR(dchild)); + if (IS_ERR(dchild)) { + rc = PTR_ERR(dchild); + dchild = NULL; /* don't confuse mds_finish_transno() below */ + GOTO(cleanup, rc); + } cleanup_phase = 2; /* child dentry */ @@ -924,6 +969,16 @@ int mds_open(struct mds_update_record *rec, int offset, if ((rec->ur_flags & MDS_OPEN_DIRECTORY) && !S_ISDIR(dchild->d_inode->i_mode)) GOTO(cleanup, rc = -ENOTDIR); + + if (S_ISDIR(dchild->d_inode->i_mode)) { + if (rec->ur_flags & MDS_OPEN_CREAT || rec->ur_flags & FMODE_WRITE) { + /*we are tryying to create or write a exist dir*/ + GOTO(cleanup, rc = -EISDIR); + } + if (ll_permission(dchild->d_inode, acc_mode, NULL)) { + GOTO(cleanup, rc = -EACCES); + } + } /* Step 5: mds_open it */ rc = mds_finish_open(req, dchild, body, rec->ur_flags, &handle, rec, @@ -933,9 +988,6 @@ int mds_open(struct mds_update_record *rec, int offset, cleanup: rc = mds_finish_transno(mds, dchild ? dchild->d_inode : NULL, handle, req, rc, rep ? rep->lock_policy_res1 : 0); - /* XXX what do we do here if mds_finish_transno itself failed? */ - if (created) - mds_lock_new_child(obd, dchild->d_inode, NULL); switch (cleanup_phase) { case 2: @@ -946,6 +998,8 @@ int mds_open(struct mds_update_record *rec, int offset, dchild->d_name.len, dchild->d_name.name, err); } + } else if (created) { + mds_lock_new_child(obd, dchild->d_inode, NULL); } l_dput(dchild); case 1: @@ -956,7 +1010,7 @@ int mds_open(struct mds_update_record *rec, int offset, if (rc) ldlm_lock_decref(&parent_lockh, parent_mode); else - ldlm_put_lock_into_req(req, &parent_lockh, parent_mode); + ptlrpc_save_lock (req, &parent_lockh, parent_mode); } if (rc == 0) atomic_inc(&mds->mds_open_count); @@ -982,7 +1036,7 @@ int mds_mfd_close(struct ptlrpc_request *req, struct obd_device *obd, struct mds_obd *mds = &obd->u.mds; struct inode *pending_dir = mds->mds_pending_dir->d_inode; void *handle = NULL; - struct mds_body *request_body, *reply_body; + struct mds_body *request_body = NULL, *reply_body = NULL; struct dentry_params dp; ENTRY; @@ -1007,9 +1061,11 @@ int mds_mfd_close(struct ptlrpc_request *req, struct obd_device *obd, } if (last_orphan && unlink_orphan) { + int stripe_count = 0; + struct lov_mds_md *lmm = NULL; LASSERT(rc == 0); /* mds_put_write_access must have succeeded */ - CWARN("destroying orphan object %s\n", fidname); + CDEBUG(D_HA, "destroying orphan object %s\n", fidname); /* Sadly, there is no easy way to save pending_child from * mds_reint_unlink() into mfd, so we need to re-lookup, @@ -1024,22 +1080,27 @@ int mds_mfd_close(struct ptlrpc_request *req, struct obd_device *obd, LASSERT(pending_child->d_inode != NULL); cleanup_phase = 2; /* dput(pending_child) when finished */ - handle = fsfilt_start(obd, pending_dir, FSFILT_OP_UNLINK_LOG, - NULL); + if (req != NULL) { + lmm = lustre_msg_buf(req->rq_repmsg, 1, 0); + stripe_count = le32_to_cpu(lmm->lmm_stripe_count); + } + + handle = fsfilt_start_log(obd, pending_dir, FSFILT_OP_UNLINK, + NULL, stripe_count); if (IS_ERR(handle)) { rc = PTR_ERR(handle); handle = NULL; GOTO(cleanup, rc); } -#ifdef ENABLE_ORPHANS - if (req != NULL && - (reply_body->valid & OBD_MD_FLEASIZE) && - mds_log_op_unlink(obd, pending_child->d_inode, - req->rq_repmsg, 1) > 0) { + if (req != NULL && (reply_body->valid & OBD_MD_FLEASIZE) && + mds_log_op_unlink(obd, pending_child->d_inode, lmm, + req->rq_repmsg->buflens[1], + lustre_msg_buf(req->rq_repmsg, 2, 0), + req->rq_repmsg->buflens[2]) > 0) { reply_body->valid |= OBD_MD_FLCOOKIE; } -#endif + pending_child->d_fsdata = (void *) &dp; dp.p_inum = 0; dp.p_ptr = req; @@ -1075,6 +1136,9 @@ int mds_mfd_close(struct ptlrpc_request *req, struct obd_device *obd, CERROR("error in setattr(%s): rc %d\n", fidname, rc); #endif } + /* If other clients have this file open for write, rc will be > 0 */ + if (rc > 0) + rc = 0; l_dput(mfd->mfd_dentry); mds_mfd_destroy(mfd); @@ -1113,7 +1177,13 @@ int mds_close(struct ptlrpc_request *req) obd->u.mds.mds_max_cookiesize}; ENTRY; - MDS_CHECK_RESENT(req, mds_reconstruct_generic(req)); + rc = lustre_pack_reply(req, 3, repsize, NULL); + if (rc) { + CERROR("lustre_pack_reply: rc = %d\n", rc); + req->rq_status = rc; + } else { + MDS_CHECK_RESENT(req, mds_reconstruct_generic(req)); + } body = lustre_swab_reqbuf(req, 0, sizeof(*body), lustre_swab_mds_body); if (body == NULL) { @@ -1133,12 +1203,6 @@ int mds_close(struct ptlrpc_request *req) RETURN(-ESTALE); } - rc = lustre_pack_reply(req, 3, repsize, NULL); - if (rc) { - CERROR("lustre_pack_reply: rc = %d\n", rc); - req->rq_status = rc; - } - inode = mfd->mfd_dentry->d_inode; if (mds_inode_is_orphan(inode) && mds_open_orphan_count(inode) == 1) { body = lustre_msg_buf(req->rq_repmsg, 0, sizeof (*body));