X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fmds%2Fmds_open.c;h=2d96fe9f95828a2b041010e3fe2fcfda3e550f2a;hb=7a3bf9e15dd53db6b4564a1e660e0d7584b487fc;hp=3112bc0d7cd3e811108b9028ceefcba794852872;hpb=b5b6224b227ca816fc40739741f0c37364db6677;p=fs%2Flustre-release.git diff --git a/lustre/mds/mds_open.c b/lustre/mds/mds_open.c index 3112bc0..9b613a1 100644 --- a/lustre/mds/mds_open.c +++ b/lustre/mds/mds_open.c @@ -7,20 +7,23 @@ * Author: Phil Schwan * Author: Mike Shaver * - * This file is part of Lustre, http://www.lustre.org. + * This file is part of the Lustre file system, http://www.lustre.org + * Lustre is a trademark of Cluster File Systems, Inc. * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * You may have signed or agreed to another license before downloading + * this software. If so, you are bound by the terms and conditions + * of that agreement, and the following does not apply to you. See the + * LICENSE file included with this distribution for more information. * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * If you did not agree to a different license, then this copy of Lustre + * is open source software; you can redistribute it and/or modify it + * under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * In either case, Lustre is distributed in the hope that it will be + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license text for more details. */ #ifndef EXPORT_SYMTAB @@ -32,18 +35,13 @@ #include #include #include -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) -# include -# include -#else -# include -#endif +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include #include "mds_internal.h" @@ -69,6 +67,9 @@ static void mds_mfd_addref(void *mfdp) atomic_read(&mfd->mfd_refcount)); } +/* Create a new mds_file_data struct. + * One reference for handle+med_open_head list and dropped by mds_mfd_unlink(), + * one reference for the caller of this function. */ struct mds_file_data *mds_mfd_new(void) { struct mds_file_data *mfd; @@ -82,11 +83,14 @@ struct mds_file_data *mds_mfd_new(void) atomic_set(&mfd->mfd_refcount, 2); INIT_LIST_HEAD(&mfd->mfd_handle.h_link); + INIT_LIST_HEAD(&mfd->mfd_list); class_handle_hash(&mfd->mfd_handle, mds_mfd_addref); return mfd; } +/* Get a new reference on the mfd pointed to by handle, if handle is still + * valid. Caller must drop reference with mds_mfd_put(). */ static struct mds_file_data *mds_handle2mfd(struct lustre_handle *handle) { ENTRY; @@ -94,6 +98,7 @@ static struct mds_file_data *mds_handle2mfd(struct lustre_handle *handle) RETURN(class_handle2object(handle->cookie)); } +/* Drop mfd reference, freeing struct if this is the last one. */ static void mds_mfd_put(struct mds_file_data *mfd) { CDEBUG(D_INFO, "PUTting mfd %p : new refcount %d\n", mfd, @@ -101,18 +106,20 @@ static void mds_mfd_put(struct mds_file_data *mfd) LASSERT(atomic_read(&mfd->mfd_refcount) > 0 && atomic_read(&mfd->mfd_refcount) < 0x5a5a); if (atomic_dec_and_test(&mfd->mfd_refcount)) { - LASSERT(list_empty(&mfd->mfd_handle.h_link)); - OBD_FREE(mfd, sizeof *mfd); + OBD_FREE_RCU(mfd, sizeof *mfd, &mfd->mfd_handle); } } -static void mds_mfd_destroy(struct mds_file_data *mfd) +/* Remove the mfd handle so that it cannot be found by open/close again. + * Caller must hold med_open_lock for mfd_list manipulation. */ +void mds_mfd_unlink(struct mds_file_data *mfd, int decref) { class_handle_unhash(&mfd->mfd_handle); - mds_mfd_put(mfd); + list_del_init(&mfd->mfd_list); + if (decref) + mds_mfd_put(mfd); } - /* Caller must hold mds->mds_epoch_sem */ static int mds_alloc_filterdata(struct inode *inode) { @@ -233,7 +240,7 @@ int mds_query_write_access(struct inode *inode) RETURN(atomic_read(&inode->i_writecount)); } -/* This replaces the VFS mds_dentry_open, it manages mfd and writecount */ +/* This replaces the VFS dentry_open, it manages mfd and writecount */ static struct mds_file_data *mds_dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags, struct ptlrpc_request *req) @@ -251,7 +258,7 @@ static struct mds_file_data *mds_dentry_open(struct dentry *dentry, GOTO(cleanup_dentry, error = -ENOMEM); } - body = lustre_msg_buf(req->rq_repmsg, 1, sizeof (*body)); + body = lustre_msg_buf(req->rq_repmsg, DLM_REPLY_REC_OFF, sizeof(*body)); if (flags & FMODE_WRITE) { /* FIXME: in recovery, need to pass old epoch here */ @@ -259,7 +266,7 @@ static struct mds_file_data *mds_dentry_open(struct dentry *dentry, if (error) GOTO(cleanup_mfd, error); body->io_epoch = MDS_FILTERDATA(dentry->d_inode)->io_epoch; - } else if (flags & FMODE_EXEC) { + } else if (flags & MDS_FMODE_EXEC) { error = mds_deny_write_access(mds, dentry->d_inode); if (error) GOTO(cleanup_mfd, error); @@ -268,7 +275,9 @@ static struct mds_file_data *mds_dentry_open(struct dentry *dentry, dget(dentry); /* Mark the file as open to handle open-unlink. */ - mds_open_orphan_inc(dentry->d_inode); + MDS_DOWN_WRITE_ORPHAN_SEM(dentry->d_inode); + mds_orphan_open_inc(dentry->d_inode); + MDS_UP_WRITE_ORPHAN_SEM(dentry->d_inode); mfd->mfd_mode = flags; mfd->mfd_dentry = dentry; @@ -277,7 +286,6 @@ static struct mds_file_data *mds_dentry_open(struct dentry *dentry, spin_lock(&med->med_open_lock); list_add(&mfd->mfd_list, &med->med_open_head); spin_unlock(&med->med_open_lock); - mds_mfd_put(mfd); body->handle.cookie = mfd->mfd_handle.h_cookie; @@ -285,128 +293,113 @@ static struct mds_file_data *mds_dentry_open(struct dentry *dentry, cleanup_mfd: mds_mfd_put(mfd); - mds_mfd_destroy(mfd); + mds_mfd_unlink(mfd, 1); cleanup_dentry: return ERR_PTR(error); } -static void mds_objids_from_lmm(obd_id *ids, struct lov_mds_md *lmm, - struct lov_desc *desc) -{ - int i; - for (i = 0; i < le32_to_cpu(lmm->lmm_stripe_count); i++) { - ids[le32_to_cpu(lmm->lmm_objects[i].l_ost_idx)] = - le64_to_cpu(lmm->lmm_objects[i].l_object_id); - } -} - -/* Must be called with i_sem held */ +/* Must be called with i_mutex held */ 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 dentry *dchild, void **handle, - obd_id **ids) + struct dentry *dchild, void **handle, + struct lov_mds_md **objid) { - struct obdo *oa; + struct inode *inode = dchild->d_inode; 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; + int rc, lmm_size; + struct mds_body *body; + struct obd_info oinfo = { { { 0 } } }; void *lmm_buf; - int rc, lmm_bufsize, lmm_size; ENTRY; - if (rec->ur_flags & MDS_OPEN_DELAY_CREATE || - !(rec->ur_flags & FMODE_WRITE)) + if (!S_ISREG(inode->i_mode)) + RETURN(0); + if (!md_should_create(rec->ur_flags)) RETURN(0); - body = lustre_msg_buf(req->rq_repmsg, 1, sizeof(*body)); + body = lustre_msg_buf(req->rq_repmsg, DLM_REPLY_REC_OFF, sizeof(*body)); - if (!S_ISREG(inode->i_mode)) - RETURN(0); if (body->valid & OBD_MD_FLEASIZE) RETURN(0); - OBD_ALLOC(*ids, mds->mds_lov_desc.ld_tgt_count * sizeof(**ids)); - if (*ids == NULL) - RETURN(-ENOMEM); - oti.oti_objid = *ids; - - if (*handle == NULL) - *handle = fsfilt_start(obd, inode, FSFILT_OP_CREATE, NULL); - if (IS_ERR(*handle)) { - rc = PTR_ERR(*handle); - *handle = NULL; - GOTO(out_ids, rc); - } + oti_init(&oti, req); /* replay case */ - if(lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) { - LASSERT (rec->ur_fid2->id); + if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) { + if (rec->ur_fid2->id == 0) { + DEBUG_REQ(D_ERROR, req, "fid2 not set on open replay"); + RETURN(-EFAULT); + } + body->valid |= OBD_MD_FLBLKSZ | OBD_MD_FLEASIZE; lmm_size = rec->ur_eadatalen; lmm = rec->ur_eadata; LASSERT(lmm); - mds_objids_from_lmm(*ids, lmm, &mds->mds_lov_desc); + if (*handle == NULL) + *handle = fsfilt_start(obd,inode,FSFILT_OP_CREATE,NULL); + if (IS_ERR(*handle)) { + rc = PTR_ERR(*handle); + *handle = NULL; + GOTO(out_ids, rc); + } - lmm_buf = lustre_msg_buf(req->rq_repmsg, offset, 0); - lmm_bufsize = req->rq_repmsg->buflens[offset]; - LASSERT(lmm_buf); - LASSERT(lmm_bufsize >= lmm_size); - memcpy(lmm_buf, lmm, lmm_size); - rc = fsfilt_set_md(obd, inode, *handle, lmm, lmm_size); + rc = fsfilt_set_md(obd, inode, *handle, lmm, lmm_size, "lov"); if (rc) CERROR("open replay failed to set md:%d\n", rc); - RETURN(0); + lmm_buf = lustre_msg_buf(req->rq_repmsg, offset, lmm_size); + LASSERT(lmm_buf); + memcpy(lmm_buf, lmm, lmm_size); + + *objid = lmm_buf; + RETURN(rc); } - if (OBD_FAIL_CHECK_ONCE(OBD_FAIL_MDS_ALLOC_OBDO)) + if (OBD_FAIL_CHECK(OBD_FAIL_MDS_ALLOC_OBDO)) GOTO(out_ids, rc = -ENOMEM); - oa = obdo_alloc(); - if (oa == NULL) + OBDO_ALLOC(oinfo.oi_oa); + if (oinfo.oi_oa == NULL) GOTO(out_ids, rc = -ENOMEM); - oa->o_mode = S_IFREG | 0600; - oa->o_id = inode->i_ino; - oa->o_gr = FILTER_GROUP_FIRST_MDS + mds->mds_num; - oa->o_generation = inode->i_generation; - oa->o_uid = 0; /* must have 0 uid / gid on OST */ - oa->o_gid = 0; - oa->o_valid = OBD_MD_FLID | OBD_MD_FLGENER | OBD_MD_FLTYPE | - OBD_MD_FLMODE | OBD_MD_FLUID | OBD_MD_FLGID | OBD_MD_FLGROUP; - oa->o_size = 0; - - obdo_from_inode(oa, inode, OBD_MD_FLTYPE|OBD_MD_FLATIME|OBD_MD_FLMTIME| - OBD_MD_FLCTIME); + oinfo.oi_oa->o_uid = 0; /* must have 0 uid / gid on OST */ + oinfo.oi_oa->o_gid = 0; + oinfo.oi_oa->o_mode = S_IFREG | 0600; + oinfo.oi_oa->o_id = inode->i_ino; + oinfo.oi_oa->o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLFLAGS | + OBD_MD_FLMODE | OBD_MD_FLUID | OBD_MD_FLGID; + oinfo.oi_oa->o_size = 0; + + obdo_from_inode(oinfo.oi_oa, inode, OBD_MD_FLTYPE | OBD_MD_FLATIME | + OBD_MD_FLMTIME | OBD_MD_FLCTIME); if (!(rec->ur_flags & MDS_OPEN_HAS_OBJS)) { /* check if things like lfs setstripe 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); + 0, &oinfo.oi_md, 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); + 0, &oinfo.oi_md, lmm); OBD_FREE(lmm, mds->mds_max_mdsize); if (rc) GOTO(out_oa, rc); } - LASSERT(oa->o_gr >= FILTER_GROUP_FIRST_MDS); - rc = obd_create(mds->mds_osc_exp, oa, &lsm, &oti); + rc = obd_create(mds->mds_osc_exp, oinfo.oi_oa, + &oinfo.oi_md, &oti); if (rc) { int level = D_ERROR; if (rc == -ENOSPC) @@ -423,23 +416,31 @@ static int mds_create_objects(struct ptlrpc_request *req, int offset, } } else { rc = obd_iocontrol(OBD_IOC_LOV_SETEA, mds->mds_osc_exp, - 0, &lsm, rec->ur_eadata); + 0, &oinfo.oi_md, rec->ur_eadata); if (rc) { GOTO(out_oa, rc); } - lsm->lsm_object_id = oa->o_id; - lsm->lsm_object_gr = oa->o_gr; + oinfo.oi_md->lsm_object_id = oinfo.oi_oa->o_id; + oinfo.oi_md->lsm_object_gr = oinfo.oi_oa->o_gr; } - if (inode->i_size) { - oa->o_size = inode->i_size; - obdo_from_inode(oa, inode, OBD_MD_FLTYPE|OBD_MD_FLATIME| - OBD_MD_FLMTIME| OBD_MD_FLCTIME| OBD_MD_FLSIZE); - rc = obd_setattr(mds->mds_osc_exp, oa, lsm, &oti); + if (i_size_read(inode)) { + oinfo.oi_oa->o_size = i_size_read(inode); + obdo_from_inode(oinfo.oi_oa, inode, OBD_MD_FLTYPE | + OBD_MD_FLATIME | OBD_MD_FLMTIME | + OBD_MD_FLCTIME | OBD_MD_FLSIZE); + + /* pack lustre id to OST */ + oinfo.oi_oa->o_fid = body->fid1.id; + oinfo.oi_oa->o_generation = body->fid1.generation; + oinfo.oi_oa->o_valid |= OBD_MD_FLFID | OBD_MD_FLGENER; + + rc = obd_setattr_rqset(mds->mds_osc_exp, &oinfo, &oti); if (rc) { CERROR("error setting attrs for inode %lu: rc %d\n", inode->i_ino, rc); if (rc > 0) { - CERROR("obd_setattr returned bad rc %d\n", rc); + CERROR("obd_setattr_async returned bad rc %d\n", + rc); rc = -EIO; } GOTO(out_oa, rc); @@ -447,32 +448,41 @@ static int mds_create_objects(struct ptlrpc_request *req, int offset, } body->valid |= OBD_MD_FLBLKSZ | OBD_MD_FLEASIZE; - obdo_refresh_inode(inode, oa, OBD_MD_FLBLKSZ); + obdo_refresh_inode(inode, oinfo.oi_oa, OBD_MD_FLBLKSZ); - LASSERT(lsm && lsm->lsm_object_id); + LASSERT(oinfo.oi_md && oinfo.oi_md->lsm_object_id); lmm = NULL; - rc = obd_packmd(mds->mds_osc_exp, &lmm, lsm); - if (!rec->ur_fid2->id) - obd_free_memmd(mds->mds_osc_exp, &lsm); - LASSERT(rc >= 0); + rc = obd_packmd(mds->mds_osc_exp, &lmm, oinfo.oi_md); + if (rc < 0) { + CERROR("cannot pack lsm, err = %d\n", rc); + GOTO(out_oa, rc); + } lmm_size = rc; body->eadatasize = rc; - rc = fsfilt_set_md(obd, inode, *handle, lmm, lmm_size); - lmm_buf = lustre_msg_buf(req->rq_repmsg, offset, 0); - lmm_bufsize = req->rq_repmsg->buflens[offset]; - LASSERT(lmm_buf); - LASSERT(lmm_bufsize >= lmm_size); + if (*handle == NULL) + *handle = fsfilt_start(obd, inode, FSFILT_OP_CREATE, NULL); + if (IS_ERR(*handle)) { + rc = PTR_ERR(*handle); + *handle = NULL; + GOTO(free_diskmd, rc); + } + + rc = fsfilt_set_md(obd, inode, *handle, lmm, lmm_size, "lov"); + lmm_buf = lustre_msg_buf(req->rq_repmsg, offset, lmm_size); + LASSERT(lmm_buf); memcpy(lmm_buf, lmm, lmm_size); + + *objid = lmm_buf; // save for mds_lov_update_objid + +free_diskmd: obd_free_diskmd(mds->mds_osc_exp, &lmm); - out_oa: +out_oa: oti_free_cookies(&oti); - obdo_free(oa); - out_ids: - if (rc) { - OBD_FREE(*ids, mds->mds_lov_desc.ld_tgt_count * sizeof(**ids)); - *ids = NULL; - } + OBDO_FREE(oinfo.oi_oa); +out_ids: + if (oinfo.oi_md) + obd_free_memmd(mds->mds_osc_exp, &oinfo.oi_md); RETURN(rc); } @@ -485,7 +495,7 @@ static void reconstruct_open(struct mds_update_record *rec, int offset, struct mds_obd *mds = mds_req2mds(req); struct mds_file_data *mfd; struct obd_device *obd = req->rq_export->exp_obd; - struct dentry *parent, *child; + struct dentry *parent, *dchild; struct ldlm_reply *rep; struct mds_body *body; int rc; @@ -493,13 +503,13 @@ static void reconstruct_open(struct mds_update_record *rec, int offset, int put_child = 1; ENTRY; - LASSERT(offset == 2); /* only called via intent */ - rep = lustre_msg_buf(req->rq_repmsg, 0, sizeof (*rep)); - body = lustre_msg_buf(req->rq_repmsg, 1, sizeof (*body)); + LASSERT(offset == DLM_INTENT_REC_OFF); /* only called via intent */ + rep = lustre_msg_buf(req->rq_repmsg, DLM_LOCKREPLY_OFF, sizeof(*rep)); + body = lustre_msg_buf(req->rq_repmsg, DLM_REPLY_REC_OFF, sizeof(*body)); /* copy rc, transno and disp; steal locks */ mds_req_from_mcd(req, mcd); - intent_set_disposition(rep, mcd->mcd_last_data); + intent_set_disposition(rep, le32_to_cpu(mcd->mcd_last_data)); /* Only replay if create or open actually happened. */ if (!intent_disposition(rep, DISP_OPEN_CREATE | DISP_OPEN_OPEN) ) { @@ -510,12 +520,11 @@ static void reconstruct_open(struct mds_update_record *rec, int offset, parent = mds_fid2dentry(mds, rec->ur_fid1, NULL); LASSERT(!IS_ERR(parent)); - child = ll_lookup_one_len(rec->ur_name, parent, rec->ur_namelen - 1); - LASSERT(!IS_ERR(child)); + dchild = ll_lookup_one_len(rec->ur_name, parent, rec->ur_namelen - 1); + LASSERT(!IS_ERR(dchild)); - if (!child->d_inode) { + if (!dchild->d_inode) GOTO(out_dput, 0); /* child not present to open */ - } /* At this point, we know we have a child. We'll send * it back _unless_ it not created and open failed. @@ -526,13 +535,11 @@ static void reconstruct_open(struct mds_update_record *rec, int offset, GOTO(out_dput, 0); } - /* get lock (write for O_CREAT, read otherwise) */ - - mds_pack_inode2fid(obd, &body->fid1, child->d_inode); - mds_pack_inode2body(obd, body, child->d_inode); - if (S_ISREG(child->d_inode->i_mode)) { - rc = mds_pack_md(obd, req->rq_repmsg, 2, body, - child->d_inode, 1); + mds_pack_inode2fid(&body->fid1, dchild->d_inode); + mds_pack_inode2body(body, dchild->d_inode); + if (S_ISREG(dchild->d_inode->i_mode)) { + rc = mds_pack_md(obd, req->rq_repmsg, DLM_REPLY_REC_OFF + 1, + body, dchild->d_inode, 1); if (rc) LASSERT(rc == req->rq_status); @@ -541,12 +548,22 @@ static void reconstruct_open(struct mds_update_record *rec, int offset, if (!(body->valid & OBD_MD_FLEASIZE)) body->valid |= (OBD_MD_FLSIZE | OBD_MD_FLBLOCKS | OBD_MD_FLATIME | OBD_MD_FLMTIME); - } else { - /* XXX need to check this case */ } - /* If we're opening a file without an EA, change to a write - lock (unless we already have one). */ + if (!(rec->ur_flags & MDS_OPEN_JOIN_FILE)) + lustre_shrink_reply(req, DLM_REPLY_REC_OFF + 1, + body->eadatasize, 0); + + if (req->rq_export->exp_connect_flags & OBD_CONNECT_ACL && + !(rec->ur_flags & MDS_OPEN_JOIN_FILE)) { + int acl_off = DLM_REPLY_REC_OFF + (body->eadatasize ? 2 : 1); + + rc = mds_pack_acl(med, dchild->d_inode, req->rq_repmsg, + body, acl_off); + lustre_shrink_reply(req, acl_off, body->aclsize, 0); + if (!req->rq_status && rc) + req->rq_status = rc; + } /* If we have -EEXIST as the status, and we were asked to create * exclusively, we can tell we failed because the file already existed. @@ -570,21 +587,30 @@ static void reconstruct_open(struct mds_update_record *rec, int offset, GOTO(out_dput, 0); mfd = NULL; + spin_lock(&med->med_open_lock); list_for_each(t, &med->med_open_head) { mfd = list_entry(t, struct mds_file_data, mfd_list); - if (mfd->mfd_xid == req->rq_xid) + if (mfd->mfd_xid == req->rq_xid) { + mds_mfd_addref(mfd); break; + } mfd = NULL; } + spin_unlock(&med->med_open_lock); /* #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) { + if (rec->ur_flags & MDS_OPEN_JOIN_FILE) { + rc = mds_join_file(rec, req, dchild, NULL); + if (rc) + GOTO(out_dput, rc); + } mntget(mds->mds_vfsmnt); CERROR("Re-opened file \n"); - mfd = mds_dentry_open(child, mds->mds_vfsmnt, + mfd = mds_dentry_open(dchild, mds->mds_vfsmnt, rec->ur_flags & ~MDS_OPEN_TRUNC, req); if (!mfd) { CERROR("mds: out of memory\n"); @@ -597,23 +623,33 @@ static void reconstruct_open(struct mds_update_record *rec, int offset, mfd->mfd_handle.h_cookie); } + mds_mfd_put(mfd); + out_dput: if (put_child) - l_dput(child); + l_dput(dchild); l_dput(parent); EXIT; } /* do NOT or the MAY_*'s, you'll get the weakest */ -static int accmode(int flags) +static int accmode(struct inode *inode, int flags) { int res = 0; + /* Sadly, NFSD reopens a file repeatedly during operation, so the + * "acc_mode = 0" allowance for newly-created files isn't honoured. + * NFSD uses the MDS_OPEN_OWNEROVERRIDE flag to say that a file + * owner can write to a file even if it is marked readonly to hide + * its brokenness. (bug 5781) */ + if (flags & MDS_OPEN_OWNEROVERRIDE && inode->i_uid == current->fsuid) + return 0; + if (flags & FMODE_READ) res = MAY_READ; if (flags & (FMODE_WRITE|MDS_OPEN_TRUNC)) res |= MAY_WRITE; - if (flags & FMODE_EXEC) + if (flags & MDS_FMODE_EXEC) res = MAY_EXEC; return res; } @@ -621,57 +657,76 @@ static int accmode(int flags) /* Handles object creation, actual opening, and I/O epoch */ static int mds_finish_open(struct ptlrpc_request *req, struct dentry *dchild, struct mds_body *body, int flags, void **handle, - struct mds_update_record *rec,struct ldlm_reply *rep) + struct mds_update_record *rec,struct ldlm_reply *rep, + struct lustre_handle *lockh) { struct mds_obd *mds = mds_req2mds(req); struct obd_device *obd = req->rq_export->exp_obd; struct mds_file_data *mfd = NULL; - obd_id *ids = NULL; /* object IDs created */ - unsigned mode; + struct lov_mds_md *lmm; /* object IDs created */ int rc = 0; ENTRY; /* atomically create objects if necessary */ - down(&dchild->d_inode->i_sem); - mode = dchild->d_inode->i_mode; - if ((S_ISREG(mode) && !(body->valid & OBD_MD_FLEASIZE)) || - (S_ISDIR(mode) && !(body->valid & OBD_MD_FLDIREA))) { - rc = mds_pack_md(obd, req->rq_repmsg, 2, body, - dchild->d_inode, 0); + LOCK_INODE_MUTEX(dchild->d_inode); + + if (S_ISREG(dchild->d_inode->i_mode) && + !(body->valid & OBD_MD_FLEASIZE)) { + rc = mds_pack_md(obd, req->rq_repmsg, DLM_REPLY_REC_OFF + 1, + body, dchild->d_inode, 0); if (rc) { - up(&dchild->d_inode->i_sem); + UNLOCK_INODE_MUTEX(dchild->d_inode); RETURN(rc); } } if (rec != NULL) { - /* no EA: create objects */ - rc = mds_create_objects(req, 2, rec, mds, obd, - dchild, handle, &ids); - if (rc) { - CERROR("mds_create_objects: rc = %d\n", rc); - up(&dchild->d_inode->i_sem); - RETURN(rc); + if ((body->valid & OBD_MD_FLEASIZE) && + (rec->ur_flags & MDS_OPEN_HAS_EA)) { + UNLOCK_INODE_MUTEX(dchild->d_inode); + RETURN(-EEXIST); } - if (S_ISREG(dchild->d_inode->i_mode) && - (body->valid & OBD_MD_FLEASIZE)) { - rc = mds_revalidate_lov_ea(obd, dchild->d_inode, - req->rq_repmsg, 2); - if (!rc) - rc = mds_pack_md(obd, req->rq_repmsg, 2, body, - dchild->d_inode, 0); + if (rec->ur_flags & MDS_OPEN_JOIN_FILE) { + UNLOCK_INODE_MUTEX(dchild->d_inode); + rc = mds_join_file(rec, req, dchild, lockh); + if (rc) + RETURN(rc); + LOCK_INODE_MUTEX(dchild->d_inode); + } + if (!(body->valid & OBD_MD_FLEASIZE) && + !(body->valid & OBD_MD_FLMODEASIZE)) { + /* no EA: create objects */ + rc = mds_create_objects(req, DLM_REPLY_REC_OFF + 1, rec, + mds, obd, dchild, handle, &lmm); if (rc) { - up(&dchild->d_inode->i_sem); + CERROR("mds_create_objects: rc = %d\n", rc); + UNLOCK_INODE_MUTEX(dchild->d_inode); RETURN(rc); } } } - /* If the inode has no EA data, then MDSs hold size, mtime */ + /* If the inode has no EA data, then MDS holds size, mtime */ if (S_ISREG(dchild->d_inode->i_mode) && !(body->valid & OBD_MD_FLEASIZE)) { body->valid |= (OBD_MD_FLSIZE | OBD_MD_FLBLOCKS | OBD_MD_FLATIME | OBD_MD_FLMTIME); } - up(&dchild->d_inode->i_sem); + UNLOCK_INODE_MUTEX(dchild->d_inode); + + if (rec && !(rec->ur_flags & MDS_OPEN_JOIN_FILE)) + lustre_shrink_reply(req, DLM_REPLY_REC_OFF + 1, + body->eadatasize, 0); + + if (req->rq_export->exp_connect_flags & OBD_CONNECT_ACL && + rec && !(rec->ur_flags & MDS_OPEN_JOIN_FILE)) { + int acl_off = DLM_REPLY_REC_OFF + (body->eadatasize ? 2 : 1); + + rc = mds_pack_acl(&req->rq_export->exp_mds_data, + dchild->d_inode, req->rq_repmsg, + body, acl_off); + lustre_shrink_reply(req, acl_off, body->aclsize, 0); + if (rc) + RETURN(rc); + } intent_set_disposition(rep, DISP_OPEN_OPEN); mfd = mds_dentry_open(dchild, mds->mds_vfsmnt, flags, req); @@ -680,12 +735,14 @@ static int mds_finish_open(struct ptlrpc_request *req, struct dentry *dchild, CDEBUG(D_INODE, "mfd %p, cookie "LPX64"\n", mfd, mfd->mfd_handle.h_cookie); - if (ids != NULL) { - 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 (lmm != NULL) + mds_lov_update_objids(obd, lmm); + + if (rc) /* coverity[deadcode] */ + mds_mfd_unlink(mfd, 1); + + mds_mfd_put(mfd); RETURN(rc); } @@ -694,122 +751,100 @@ static int mds_open_by_fid(struct ptlrpc_request *req, struct ll_fid *fid, struct mds_update_record *rec,struct ldlm_reply *rep) { struct mds_obd *mds = mds_req2mds(req); - struct inode *pending_dir = mds->mds_pending_dir->d_inode; struct dentry *dchild; char fidname[LL_FID_NAMELEN]; int fidlen = 0, rc; void *handle = NULL; ENTRY; - down(&pending_dir->i_sem); fidlen = ll_fid2str(fidname, fid->id, fid->generation); - dchild = lookup_one_len(fidname, mds->mds_pending_dir, fidlen); + dchild = ll_lookup_one_len(fidname, mds->mds_pending_dir, fidlen); if (IS_ERR(dchild)) { - up(&pending_dir->i_sem); rc = PTR_ERR(dchild); CERROR("error looking up %s in PENDING: rc = %d\n",fidname, rc); RETURN(rc); } if (dchild->d_inode != NULL) { - up(&pending_dir->i_sem); mds_inode_set_orphan(dchild->d_inode); - mds_pack_inode2fid(req2obd(req), &body->fid1, dchild->d_inode); - mds_pack_inode2body(req2obd(req), body, dchild->d_inode); - intent_set_disposition(rep, DISP_LOOKUP_EXECD); - intent_set_disposition(rep, DISP_LOOKUP_POS); CWARN("Orphan %s found and opened in PENDING directory\n", fidname); - goto open; - } - dput(dchild); - up(&pending_dir->i_sem); + } else { + l_dput(dchild); - /* We didn't find it in PENDING so it isn't an orphan. See - * if it was a regular inode that was previously created. */ - dchild = mds_fid2dentry(mds, fid, NULL); - if (IS_ERR(dchild)) - RETURN(PTR_ERR(dchild)); + /* We didn't find it in PENDING so it isn't an orphan. See + * if it was a regular inode that was previously created. */ + dchild = mds_fid2dentry(mds, fid, NULL); + if (IS_ERR(dchild)) + RETURN(PTR_ERR(dchild)); + } - mds_pack_inode2fid(req2obd(req), &body->fid1, dchild->d_inode); - mds_pack_inode2body(req2obd(req), body, dchild->d_inode); + mds_pack_inode2fid(&body->fid1, dchild->d_inode); + mds_pack_inode2body(body, dchild->d_inode); intent_set_disposition(rep, DISP_LOOKUP_EXECD); intent_set_disposition(rep, DISP_LOOKUP_POS); - open: - rc = mds_finish_open(req, dchild, body, flags, &handle, rec, rep); - rc = mds_finish_transno(mds, dchild ? dchild->d_inode : NULL, handle, - req, rc, rep ? rep->lock_policy_res1 : 0); + rc = mds_finish_open(req, dchild, body, flags, &handle, rec, rep, NULL); + rc = mds_finish_transno(mds, dchild->d_inode, handle, + req, rc, rep ? rep->lock_policy_res1 : 0, 0); /* XXX what do we do here if mds_finish_transno itself failed? */ l_dput(dchild); RETURN(rc); } -int mds_pin(struct ptlrpc_request *req) +int mds_pin(struct ptlrpc_request *req, int offset) { struct obd_device *obd = req->rq_export->exp_obd; - struct mds_body *request_body, *reply_body; + struct mds_body *reqbody, *repbody; struct lvfs_run_ctxt saved; - int rc, size = sizeof(*reply_body); + int rc, size[2] = { sizeof(struct ptlrpc_body), sizeof(*repbody) }; ENTRY; - request_body = lustre_msg_buf(req->rq_reqmsg, 0, sizeof(*request_body)); + reqbody = lustre_msg_buf(req->rq_reqmsg, offset, sizeof(*reqbody)); - rc = lustre_pack_reply(req, 1, &size, NULL); + rc = lustre_pack_reply(req, 2, size, NULL); if (rc) RETURN(rc); - reply_body = lustre_msg_buf(req->rq_repmsg, 0, sizeof(*reply_body)); + + repbody = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, + sizeof(*repbody)); push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); - rc = mds_open_by_fid(req, &request_body->fid1, reply_body, - request_body->flags, NULL, NULL); + rc = mds_open_by_fid(req, &reqbody->fid1, repbody, reqbody->flags, NULL, + NULL); pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); RETURN(rc); } -/* Get a lock on the ino to sync with creation WRT inode reuse (bug 2029). - * If child_lockh is NULL we just get the lock as a barrier to wait for - * other holders of this lock, and drop it right away again. */ +/* Get an internal lock on the inode number (but not generation) to sync + * new inode creation with inode unlink (bug 2029). If child_lockh is NULL + * we just get the lock as a barrier to wait for other holders of this lock, + * and drop it right away again. */ 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, 0, 1, 0 } }; struct lustre_handle lockh; - int lock_flags = 0; + int lock_flags = LDLM_FL_ATOMIC_CB; int rc; if (child_lockh == NULL) child_lockh = &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); + rc = ldlm_cli_enqueue_local(obd->obd_namespace, &child_res_id, + LDLM_PLAIN, NULL, LCK_EX, &lock_flags, + ldlm_blocking_ast, ldlm_completion_ast, + NULL, NULL, 0, NULL, child_lockh); if (rc != ELDLM_OK) - CERROR("ldlm_cli_enqueue: %d\n", rc); + CERROR("ldlm_cli_enqueue_local: %d\n", rc); else if (child_lockh == &lockh) ldlm_lock_decref(child_lockh, LCK_EX); RETURN(rc); } -static int is_mount_object(struct dentry *dparent) -{ - struct dentry *dchild; - - if (!(dparent->d_inode->i_mode & S_ISUID)) - return 0; - - dchild = lookup_one_len(".mntinfo", dparent, strlen(".mntinfo")); - if (IS_ERR(dchild) || dchild == NULL) - return 0; - - dput(dchild); - return 1; -} - int mds_open(struct mds_update_record *rec, int offset, struct ptlrpc_request *req, struct lustre_handle *child_lockh) { @@ -820,23 +855,36 @@ int mds_open(struct mds_update_record *rec, int offset, struct mds_body *body = NULL; struct dentry *dchild = NULL, *dparent = NULL; struct mds_export_data *med; - struct lustre_handle parent_lockh[2]; + struct lustre_handle parent_lockh; int rc = 0, cleanup_phase = 0, acc_mode, created = 0; - int parent_mode = LCK_PR; + int parent_mode = LCK_CR; void *handle = NULL; - struct dentry_params dp; - struct mea *mea = NULL; - int mea_size, update_mode; + struct lvfs_dentry_params dp = LVFS_DENTRY_PARAMS_INIT; + unsigned int qcids[MAXQUOTAS] = { current->fsuid, current->fsgid }; + unsigned int qpids[MAXQUOTAS] = { 0, 0 }; + int child_mode = LCK_CR; + /* Always returning LOOKUP lock if open succesful to guard + dentry on client. */ + ldlm_policy_data_t policy = {.l_inodebits={MDS_INODELOCK_LOOKUP}}; + struct ldlm_res_id child_res_id = { .name = {0}}; + int lock_flags = 0; ENTRY; - parent_lockh[0].cookie = 0; - parent_lockh[1].cookie = 0; - - if (offset == 2) { /* intent */ - rep = lustre_msg_buf(req->rq_repmsg, 0, sizeof (*rep)); - body = lustre_msg_buf(req->rq_repmsg, 1, sizeof (*body)); - } else if (offset == 0) { /* non-intent reint */ - body = lustre_msg_buf(req->rq_repmsg, 0, sizeof (*body)); + mds_counter_incr(req->rq_export, LPROC_MDS_OPEN); + + OBD_FAIL_TIMEOUT_ORSET(OBD_FAIL_MDS_PAUSE_OPEN, OBD_FAIL_ONCE, + (obd_timeout + 1) / 4); + + CLASSERT(MAXQUOTAS < 4); + if (offset == DLM_INTENT_REC_OFF) { /* intent */ + rep = lustre_msg_buf(req->rq_repmsg, DLM_LOCKREPLY_OFF, + sizeof(*rep)); + body = lustre_msg_buf(req->rq_repmsg, DLM_REPLY_REC_OFF, + sizeof(*body)); + } else if (offset == REQ_REC_OFF) { /* non-intent reint */ + body = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, + sizeof(*body)); + LBUG(); /* XXX: not supported yet? */ } else { body = NULL; LBUG(); @@ -847,24 +895,44 @@ 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 (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); + /*XXX liblustre use mds_open_by_fid to implement LL_IOC_LOV_SETSTRIPE */ + if (((lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) || + (req->rq_export->exp_libclient && rec->ur_flags&MDS_OPEN_HAS_EA))&& + !(rec->ur_flags & MDS_OPEN_JOIN_FILE)) { + if (rec->ur_fid2->id == 0) { + struct ldlm_lock *lock = ldlm_handle2lock(child_lockh); + if (lock) { + LDLM_ERROR(lock, "fid2 not set on open replay"); + LDLM_LOCK_PUT(lock); + } + DEBUG_REQ(D_ERROR, req, "fid2 not set on open replay"); + RETURN(-EFAULT); + } rc = mds_open_by_fid(req, rec->ur_fid2, body, rec->ur_flags, rec, rep); - if (rc != -ENOENT) + if (rc != -ENOENT) { + if (req->rq_export->exp_libclient && + rec->ur_flags & MDS_OPEN_HAS_EA) + RETURN(0); + RETURN(rc); + } + /* 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); + if (!(rec->ur_flags & MDS_OPEN_CREAT)) { + DEBUG_REQ(D_ERROR, req,"OPEN_CREAT not in open replay"); + RETURN(-EFAULT); + } + } else if (rec->ur_fid2->id) { + DEBUG_REQ(D_ERROR, req, "fid2 "LPU64"/%u on open non-replay", + rec->ur_fid2->id, rec->ur_fid2->generation); + RETURN(-EFAULT); } - LASSERT(offset == 2); /* If we got here, we must be called via intent */ + /* If we got here, we must be called via intent */ + LASSERT(offset == DLM_INTENT_REC_OFF); med = &req->rq_export->exp_mds_data; if (OBD_FAIL_CHECK(OBD_FAIL_MDS_OPEN_PACK)) { @@ -872,108 +940,59 @@ int mds_open(struct mds_update_record *rec, int offset, RETURN(-ENOMEM); } - acc_mode = accmode(rec->ur_flags); - /* Step 1: Find and lock the parent */ - if (rec->ur_flags & O_CREAT) { - /* XXX Well, in fact we only need this lock mode change if - in addition to O_CREAT, the file does not exist. - But we do not know if it exists or not yet */ - parent_mode = LCK_PW; - } - - if (rec->ur_namelen == 1) { - /* client (LMV) wants to open the file by fid */ - CDEBUG(D_OTHER, "OPEN by fid %u/%u/%u\n", - (unsigned) rec->ur_fid1->mds, - (unsigned) rec->ur_fid1->id, - (unsigned) rec->ur_fid1->generation); - dchild = mds_fid2dentry(mds, rec->ur_fid1, NULL); - if (IS_ERR(dchild)) { - rc = PTR_ERR(dparent); - CERROR("child lookup by a fid error %d\n", rc); - GOTO(cleanup, rc); - } - goto got_child; - } - + if (rec->ur_flags & (MDS_OPEN_CREAT | MDS_OPEN_JOIN_FILE)) + parent_mode = LCK_EX; dparent = mds_fid2locked_dentry(obd, rec->ur_fid1, NULL, parent_mode, - parent_lockh, &update_mode, rec->ur_name, - rec->ur_namelen - 1, - MDS_INODELOCK_UPDATE); + &parent_lockh, MDS_INODELOCK_UPDATE); if (IS_ERR(dparent)) { rc = PTR_ERR(dparent); - CERROR("parent lookup error %d\n", rc); + if (rc != -ENOENT) { + CERROR("parent "LPU64"/%u lookup error %d\n", + rec->ur_fid1->id, rec->ur_fid1->generation, rc); + } else { + /* Just cannot find parent - make it look like + * usual negative lookup to avoid extra MDS RPC */ + intent_set_disposition(rep, DISP_LOOKUP_EXECD); + intent_set_disposition(rep, DISP_LOOKUP_NEG); + } GOTO(cleanup, rc); } LASSERT(dparent->d_inode != NULL); cleanup_phase = 1; /* parent dentry and lock */ - /* try to retrieve MEA data for this dir */ - rc = mds_get_lmv_attr(obd, dparent->d_inode, &mea, &mea_size); - if (rc) - GOTO(cleanup, rc); - - if (mea != NULL) { - /* dir is already splitted, check is requested filename - * should live at this MDS or at another one */ - int i; - i = mea_name2idx(mea, rec->ur_name, rec->ur_namelen - 1); - if (mea->mea_master != i) { - CERROR("inapropriate MDS(%d) for %s. should be %d\n", - mea->mea_master, rec->ur_name, i); - GOTO(cleanup, rc = -ERESTART); - } + if (rec->ur_flags & MDS_OPEN_JOIN_FILE) { + dchild = dget(dparent); + cleanup_phase = 2; /* child dentry */ + acc_mode = accmode(dchild->d_inode, rec->ur_flags); + GOTO(found_child, rc); } /* Step 2: Lookup the child */ - dchild = ll_lookup_one_len(rec->ur_name, dparent, rec->ur_namelen - 1); + + if (!(lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) && + (rec->ur_flags & MDS_OPEN_LOCK) && (rec->ur_namelen == 1)) { + /* hack for nfsd with no_subtree_check, it will use anon + * dentry w/o filename to open the file. the anon dentry's + * parent was set to itself, so rec->ur_fid1 is the file. + * And in MDC it cannot derive the dentry's parent dentry, + * hence the file's name, so we hack here in MDS, + * refer to bug 13030. */ + dchild = mds_fid2dentry(mds, rec->ur_fid1, NULL); + } else { + dchild = ll_lookup_one_len(rec->ur_name, dparent, + rec->ur_namelen - 1); + } if (IS_ERR(dchild)) { rc = PTR_ERR(dchild); dchild = NULL; /* don't confuse mds_finish_transno() below */ GOTO(cleanup, rc); } -got_child: cleanup_phase = 2; /* child dentry */ intent_set_disposition(rep, DISP_LOOKUP_EXECD); - - if (dchild->d_flags & DCACHE_CROSS_REF) { - struct ldlm_res_id res_id = { . name = {0} }; - ldlm_policy_data_t policy; - int flags = 0; - CDEBUG(D_OTHER, "cross reference: %lu/%lu/%lu\n", - (unsigned long) dchild->d_mdsnum, - (unsigned long) dchild->d_inum, - (unsigned long) dchild->d_generation); - body->valid |= OBD_MD_FLID | OBD_MD_MDS; - body->fid1.id = dchild->d_inum; - body->fid1.mds = dchild->d_mdsnum; - body->fid1.generation = dchild->d_generation; - intent_set_disposition(rep, DISP_LOOKUP_POS); - res_id.name[0] = dchild->d_inum; - res_id.name[1] = dchild->d_generation; - policy.l_inodebits.bits = MDS_INODELOCK_LOOKUP; - rc = ldlm_cli_enqueue(NULL, NULL, obd->obd_namespace, - res_id, LDLM_IBITS, &policy, - LCK_PR, &flags, - mds_blocking_ast, - ldlm_completion_ast, NULL, NULL, - NULL, 0, NULL, child_lockh); -#ifdef S_PDIROPS - if (parent_lockh[1].cookie != 0) - ldlm_lock_decref(parent_lockh + 1, update_mode); -#endif - ldlm_lock_decref(parent_lockh, parent_mode); - if (mea) - OBD_FREE(mea, mea_size); - l_dput(dchild); - l_dput(dparent); - RETURN(rc); - } - if (dchild->d_inode) intent_set_disposition(rep, DISP_LOOKUP_POS); else @@ -985,21 +1004,14 @@ got_child: struct iattr iattr; struct inode *inode; - if ((rc = mds_try_to_split_dir(obd, dparent, &mea, 0))) { - if (rc > 0) { - /* dir got splitted */ - GOTO(cleanup, rc = -ERESTART); - } else { - /* error happened during spitting */ - GOTO(cleanup, rc); - } - } - if (!(rec->ur_flags & MDS_OPEN_CREAT)) { /* It's negative and we weren't supposed to create it */ GOTO(cleanup, rc = -ENOENT); } + if (req->rq_export->exp_connect_flags & OBD_CONNECT_RDONLY) + GOTO(cleanup, rc = -EROFS); + intent_set_disposition(rep, DISP_OPEN_CREATE); handle = fsfilt_start(obd, dparent->d_inode, FSFILT_OP_CREATE, NULL); @@ -1009,8 +1021,8 @@ got_child: GOTO(cleanup, rc); } dchild->d_fsdata = (void *) &dp; - dp.p_ptr = req; - dp.p_inum = ino; + dp.ldp_ptr = req; + dp.ldp_inum = ino; rc = ll_vfs_create(dparent->d_inode, dchild, rec->ur_mode,NULL); if (dchild->d_fsdata == (void *)(unsigned long)ino) @@ -1030,15 +1042,15 @@ got_child: } created = 1; - LTIME_S(iattr.ia_atime) = LTIME_S(rec->ur_time); - LTIME_S(iattr.ia_ctime) = LTIME_S(rec->ur_time); - LTIME_S(iattr.ia_mtime) = LTIME_S(rec->ur_time); + LTIME_S(iattr.ia_atime) = rec->ur_time; + LTIME_S(iattr.ia_ctime) = rec->ur_time; + LTIME_S(iattr.ia_mtime) = rec->ur_time; - iattr.ia_uid = rec->_ur_fsuid; + iattr.ia_uid = current->fsuid; /* set by push_ctxt already */ if (dparent->d_inode->i_mode & S_ISGID) iattr.ia_gid = dparent->d_inode->i_gid; else - iattr.ia_gid = rec->_ur_fsgid; + iattr.ia_gid = current->fsgid; iattr.ia_valid = ATTR_UID | ATTR_GID | ATTR_ATIME | ATTR_MTIME | ATTR_CTIME; @@ -1053,13 +1065,21 @@ got_child: if (rc) CERROR("error on parent setattr: rc = %d\n", rc); + rc = fsfilt_commit(obd, dchild->d_inode, handle, 0); + handle = NULL; acc_mode = 0; /* Don't check for permissions */ + } else { + acc_mode = accmode(dchild->d_inode, rec->ur_flags); } - LASSERT(!mds_inode_is_orphan(dchild->d_inode)); + LASSERTF(!mds_inode_is_orphan(dchild->d_inode), + "dchild %.*s (%p) inode %p/%lu/%u\n", dchild->d_name.len, + dchild->d_name.name, dchild, dchild->d_inode, + dchild->d_inode->i_ino, dchild->d_inode->i_generation); - mds_pack_inode2fid(obd, &body->fid1, dchild->d_inode); - mds_pack_inode2body(obd, body, dchild->d_inode); +found_child: + mds_pack_inode2fid(&body->fid1, dchild->d_inode); + mds_pack_inode2body(body, dchild->d_inode); if (S_ISREG(dchild->d_inode->i_mode)) { /* Check permissions etc */ @@ -1067,9 +1087,9 @@ got_child: if (rc != 0) GOTO(cleanup, rc); - /* Can't write to a read-only file */ - if (IS_RDONLY(dchild->d_inode) && (acc_mode & MAY_WRITE) != 0) - GOTO(cleanup, rc = -EPERM); + if ((req->rq_export->exp_connect_flags & OBD_CONNECT_RDONLY) && + (acc_mode & MAY_WRITE)) + GOTO(cleanup, rc = -EROFS); /* An append-only file must be opened in append mode for * writing */ @@ -1088,70 +1108,100 @@ got_child: /* if we are following a symlink, don't open */ if (S_ISLNK(dchild->d_inode->i_mode)) - GOTO(cleanup, rc = 0); - - if ((rec->ur_flags & MDS_OPEN_DIRECTORY) && - !S_ISDIR(dchild->d_inode->i_mode)) - GOTO(cleanup, rc = -ENOTDIR); + GOTO(cleanup_no_trans, rc = 0); if (S_ISDIR(dchild->d_inode->i_mode)) { if (rec->ur_flags & MDS_OPEN_CREAT || rec->ur_flags & FMODE_WRITE) { - /*we are trying to create or write a exist dir*/ + /* we are trying to create or write a exist dir */ GOTO(cleanup, rc = -EISDIR); } - if (ll_permission(dchild->d_inode, acc_mode, NULL)) { + if (rec->ur_flags & MDS_FMODE_EXEC) { + /* we are trying to exec a directory */ GOTO(cleanup, rc = -EACCES); } - if (is_mount_object(dchild)) { - CERROR("Found possible GNS mount object %*s; not " - "opening.\n", dchild->d_name.len, - dchild->d_name.name); - GOTO(cleanup, rc = 0); // success, but don't really open + if (ll_permission(dchild->d_inode, acc_mode, NULL)) { + intent_set_disposition(rep, DISP_OPEN_OPEN); + GOTO(cleanup, rc = -EACCES); } + } else if (rec->ur_flags & MDS_OPEN_DIRECTORY) { + GOTO(cleanup, rc = -ENOTDIR); } - if (rc == 0) { - struct ldlm_res_id res_id = { . name = {0} }; - ldlm_policy_data_t policy; - int flags = 0; - res_id.name[0] = dchild->d_inode->i_ino; - res_id.name[1] = dchild->d_inode->i_generation; - policy.l_inodebits.bits = MDS_INODELOCK_LOOKUP | - MDS_INODELOCK_UPDATE; - rc = ldlm_cli_enqueue(NULL, NULL, obd->obd_namespace, - res_id, LDLM_IBITS, &policy, - LCK_PR, &flags, - mds_blocking_ast, - ldlm_completion_ast, NULL, NULL, - NULL, 0, NULL, child_lockh); - if (rc == 0) - cleanup_phase = 3; + if (OBD_FAIL_CHECK_RESET(OBD_FAIL_MDS_OPEN_CREATE, + OBD_FAIL_LDLM_REPLY | OBD_FAIL_ONCE)) { + GOTO(cleanup, rc = -EAGAIN); + } + + /* Obtain OPEN lock as well */ + policy.l_inodebits.bits |= MDS_INODELOCK_OPEN; + + /* We cannot use acc_mode here, because it is zeroed in case of + creating a file, so we get wrong lockmode */ + if (accmode(dchild->d_inode, rec->ur_flags) & MAY_WRITE) + child_mode = LCK_CW; + else if (accmode(dchild->d_inode, rec->ur_flags) & MAY_EXEC) + child_mode = LCK_PR; + else + child_mode = LCK_CR; + + if (!(lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) && + (rec->ur_flags & MDS_OPEN_LOCK)) { + /* In case of replay we do not get a lock assuming that the + caller has it already */ + child_res_id.name[0] = dchild->d_inode->i_ino; + child_res_id.name[1] = dchild->d_inode->i_generation; + + rc = ldlm_cli_enqueue_local(obd->obd_namespace, &child_res_id, + LDLM_IBITS, &policy, child_mode, + &lock_flags, ldlm_blocking_ast, + ldlm_completion_ast, NULL, NULL, + 0, NULL, child_lockh); + if (rc != ELDLM_OK) + GOTO(cleanup, rc); + + /* Let mds_intent_policy know that we have a lock to return */ + intent_set_disposition(rep, DISP_OPEN_LOCK); + cleanup_phase = 3; + } + + if (!S_ISREG(dchild->d_inode->i_mode) && + !S_ISDIR(dchild->d_inode->i_mode) && + (req->rq_export->exp_connect_flags & OBD_CONNECT_NODEVOH)) { + /* If client supports this, do not return open handle for + * special device nodes */ + GOTO(cleanup_no_trans, rc = 0); } /* Step 5: mds_open it */ rc = mds_finish_open(req, dchild, body, rec->ur_flags, &handle, rec, - rep); + rep, &parent_lockh); GOTO(cleanup, rc); cleanup: rc = mds_finish_transno(mds, dchild ? dchild->d_inode : NULL, handle, - req, rc, rep ? rep->lock_policy_res1 : 0); + req, rc, rep ? rep->lock_policy_res1 : 0, 0); + cleanup_no_trans: switch (cleanup_phase) { case 3: if (rc) - ldlm_lock_decref(child_lockh, LCK_PR); + /* It is safe to leave IT_OPEN_LOCK set, if rc is not 0, + * mds_intent_policy won't try to return any locks */ + ldlm_lock_decref(child_lockh, child_mode); case 2: if (rc && created) { int err = vfs_unlink(dparent->d_inode, dchild); if (err) { - CERROR("unlink(%*s) in error path: %d\n", + CERROR("unlink(%.*s) in error path: %d\n", dchild->d_name.len, dchild->d_name.name, err); } } else if (created) { mds_lock_new_child(obd, dchild->d_inode, NULL); + /* save uid/gid for quota acquire/release */ + qpids[USRQUOTA] = dparent->d_inode->i_uid; + qpids[GRPQUOTA] = dparent->d_inode->i_gid; } l_dput(dchild); case 1: @@ -1159,26 +1209,26 @@ got_child: break; l_dput(dparent); -#ifdef S_PDIROPS - if (parent_lockh[1].cookie != 0) - ldlm_lock_decref(parent_lockh + 1, update_mode); -#endif if (rc) - ldlm_lock_decref(parent_lockh, parent_mode); + ldlm_lock_decref(&parent_lockh, parent_mode); else - ptlrpc_save_lock (req, parent_lockh, parent_mode); + ptlrpc_save_lock(req, &parent_lockh, parent_mode); } - if (rc == 0) - atomic_inc(&mds->mds_open_count); - if (mea) - OBD_FREE(mea, mea_size); - if ((cleanup_phase != 3) && !rc) - rc = ENOLCK; + /* trigger dqacq on the owner of child and parent */ + lquota_adjust(mds_quota_interface_ref, obd, qcids, qpids, rc, + FSFILT_OP_CREATE); + + /* If we have not taken the "open" lock, we may not return 0 here, + because caller expects 0 to mean "lock is taken", and it needs + nonzero return here for caller to return EDLM_LOCK_ABORTED to + client. Later caller should rewrite the return value back to zero + if it to be used any further + */ RETURN(rc); } /* Close a "file descriptor" and possibly unlink an orphan from the - * PENDING directory. + * PENDING directory. Caller must hold child->i_mutex, this drops it. * * If we are being called from mds_disconnect() because the client has * disappeared, then req == NULL and we do not update last_rcvd because @@ -1186,8 +1236,11 @@ got_child: * (it will not even _have_ an entry in last_rcvd anymore). * * Returns EAGAIN if the client needs to get more data and re-close. */ -int mds_mfd_close(struct ptlrpc_request *req, struct obd_device *obd, - struct mds_file_data *mfd, int unlink_orphan) +int mds_mfd_close(struct ptlrpc_request *req, int offset,struct obd_device *obd, + struct mds_file_data *mfd, int unlink_orphan, + struct lov_mds_md *lmm, int lmm_size, + struct llog_cookie *logcookies, int cookies_size, + __u64 *valid) { struct inode *inode = mfd->mfd_dentry->d_inode; char fidname[LL_FID_NAMELEN]; @@ -1197,49 +1250,53 @@ int mds_mfd_close(struct ptlrpc_request *req, struct obd_device *obd, struct inode *pending_dir = mds->mds_pending_dir->d_inode; void *handle = NULL; struct mds_body *request_body = NULL, *reply_body = NULL; - struct dentry_params dp; + struct lvfs_dentry_params dp = LVFS_DENTRY_PARAMS_INIT; struct iattr iattr = { 0 }; ENTRY; if (req && req->rq_reqmsg != NULL) - request_body = lustre_msg_buf(req->rq_reqmsg, 0, + request_body = lustre_msg_buf(req->rq_reqmsg, offset, sizeof(*request_body)); if (req && req->rq_repmsg != NULL) - reply_body = lustre_msg_buf(req->rq_repmsg, 0, + reply_body = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, sizeof(*reply_body)); fidlen = ll_fid2str(fidname, inode->i_ino, inode->i_generation); - last_orphan = mds_open_orphan_dec_test(inode) && - mds_inode_is_orphan(inode); + CDEBUG(D_INODE, "inode %p ino %s nlink %d orphan %d\n", inode, fidname, + inode->i_nlink, mds_orphan_open_count(inode)); + + last_orphan = mds_orphan_open_dec_test(inode) && + mds_inode_is_orphan(inode); /* this is half of the actual "close" */ if (mfd->mfd_mode & FMODE_WRITE) { rc = mds_put_write_access(mds, inode, request_body, last_orphan && unlink_orphan); - } else if (mfd->mfd_mode & FMODE_EXEC) { + } else if (mfd->mfd_mode & MDS_FMODE_EXEC) { mds_allow_write_access(inode); } + /* here writecount change also needs protection from orphan write sem. + * so drop orphan write sem after mds_put_write_access, bz 12888. */ + MDS_UP_WRITE_ORPHAN_SEM(inode); if (last_orphan && unlink_orphan) { - struct lov_mds_md *lmm = NULL; int stripe_count = 0; LASSERT(rc == 0); /* mds_put_write_access must have succeeded */ - if (obd->obd_recovering) { - CDEBUG(D_HA, "not remove orphan %s until recovery" - " is over\n", fidname); - GOTO(out, rc); - } + CDEBUG(D_INODE, "destroying orphan object %s\n", fidname); - CDEBUG(D_HA, "destroying orphan object %s\n", fidname); + if ((S_ISREG(inode->i_mode) && inode->i_nlink != 1) || + (S_ISDIR(inode->i_mode) && inode->i_nlink != 2)) + CERROR("found \"orphan\" %s %s with link count %d\n", + S_ISREG(inode->i_mode) ? "file" : "dir", + fidname, inode->i_nlink); /* Sadly, there is no easy way to save pending_child from * mds_reint_unlink() into mfd, so we need to re-lookup, * but normally it will still be in the dcache. */ - pending_dir = mds->mds_pending_dir->d_inode; - down(&pending_dir->i_sem); - cleanup_phase = 1; /* up(i_sem) when finished */ + LOCK_INODE_MUTEX(pending_dir); + cleanup_phase = 1; /* UNLOCK_INODE_MUTEX(pending_dir) when finished */ pending_child = lookup_one_len(fidname, mds->mds_pending_dir, fidlen); if (IS_ERR(pending_child)) @@ -1247,8 +1304,15 @@ 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 */ - if (req != NULL && req->rq_repmsg != NULL) { - lmm = lustre_msg_buf(req->rq_repmsg, 1, 0); + if (S_ISDIR(pending_child->d_inode->i_mode)) { + rc = vfs_rmdir(pending_dir, pending_child); + if (rc) + CERROR("error unlinking orphan dir %s: rc %d\n", + fidname,rc); + goto out; + } + + if (lmm != NULL) { stripe_count = le32_to_cpu(lmm->lmm_stripe_count); } @@ -1260,28 +1324,23 @@ int mds_mfd_close(struct ptlrpc_request *req, struct obd_device *obd, GOTO(cleanup, rc); } - if (req != NULL && req->rq_repmsg != 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; + if (lmm != NULL && (*valid & OBD_MD_FLEASIZE) && + mds_log_op_unlink(obd, lmm, lmm_size, + logcookies, cookies_size) > 0) { + *valid |= OBD_MD_FLCOOKIE; } + dp.ldp_inum = 0; + dp.ldp_ptr = req; pending_child->d_fsdata = (void *) &dp; - dp.p_inum = 0; - dp.p_ptr = req; - if (S_ISDIR(pending_child->d_inode->i_mode)) - rc = vfs_rmdir(pending_dir, pending_child); - else - rc = vfs_unlink(pending_dir, pending_child); + rc = vfs_unlink(pending_dir, pending_child); if (rc) CERROR("error unlinking orphan %s: rc %d\n",fidname,rc); goto out; /* Don't bother updating attrs on unlinked inode */ } +#if 0 if (request_body != NULL && mfd->mfd_mode & FMODE_WRITE && rc == 0) { /* Update the on-disk attributes if this was the last write * close, and all information was provided (i.e., rc == 0) @@ -1289,15 +1348,14 @@ int mds_mfd_close(struct ptlrpc_request *req, struct obd_device *obd, * XXX this should probably be abstracted with mds_reint_setattr */ -#if 0 if (request_body->valid & OBD_MD_FLMTIME && - LTIME_S(request_body->mtime) > LTIME_S(inode->i_mtime)) { - LTIME_S(iattr.ia_mtime) = LTIME_S(request_body->mtime); + LTIME_S(iattr.ia_mtime) > LTIME_S(inode->i_mtime)) { + LTIME_S(iattr.ia_mtime) = request_body->mtime; iattr.ia_valid |= ATTR_MTIME; } if (request_body->valid & OBD_MD_FLCTIME && - LTIME_S(request_body->ctime) > LTIME_S(inode->i_ctime)) { - LTIME_S(iattr.ia_ctime) = LTIME_S(request_body->ctime); + LTIME_S(iattr.ia_ctime) > LTIME_S(inode->i_ctime)) { + LTIME_S(iattr.ia_ctime) = request_body->ctime; iattr.ia_valid |= ATTR_CTIME; } @@ -1306,32 +1364,30 @@ int mds_mfd_close(struct ptlrpc_request *req, struct obd_device *obd, iattr.ia_valid |= ATTR_SIZE; iattr.ia_size = request_body->size; } - /* if (request_body->valid & OBD_MD_FLBLOCKS) { - iattr.ia_valid |= ATTR_BLOCKS; - iattr.ia_blocks = request_body->blocks - } */ + /* iattr.ia_blocks = request_body->blocks */ -#endif } - +#endif if (request_body != NULL && request_body->valid & OBD_MD_FLATIME) { /* Only start a transaction to write out only the atime if * it is more out-of-date than the specified limit. If we * are already going to write out the atime then do it anyway. * */ - if ((LTIME_S(request_body->atime) > - LTIME_S(inode->i_atime) + MAX_ATIME_DIFF) || + LTIME_S(iattr.ia_atime) = request_body->atime; + if ((LTIME_S(iattr.ia_atime) > + LTIME_S(inode->i_atime) + mds->mds_atime_diff) || (iattr.ia_valid != 0 && - LTIME_S(request_body->atime) > LTIME_S(inode->i_atime))) { - LTIME_S(iattr.ia_atime) = LTIME_S(request_body->atime); + LTIME_S(iattr.ia_atime) > LTIME_S(inode->i_atime))) iattr.ia_valid |= ATTR_ATIME; - } } if (iattr.ia_valid != 0) { handle = fsfilt_start(obd, inode, FSFILT_OP_SETATTR, NULL); - if (IS_ERR(handle)) - GOTO(cleanup, rc = PTR_ERR(handle)); + if (IS_ERR(handle)) { + rc = PTR_ERR(handle); + handle = NULL; + GOTO(cleanup, rc); + } rc = fsfilt_setattr(obd, mfd->mfd_dentry, handle, &iattr, 0); if (rc) CERROR("error in setattr(%s): rc %d\n", fidname, rc); @@ -1341,14 +1397,13 @@ out: if (rc > 0) rc = 0; l_dput(mfd->mfd_dentry); - mds_mfd_destroy(mfd); + mds_mfd_put(mfd); cleanup: - atomic_dec(&mds->mds_open_count); if (req != NULL && reply_body != NULL) { - rc = mds_finish_transno(mds, pending_dir, handle, req, rc, 0); + rc = mds_finish_transno(mds, pending_dir, handle, req, rc, 0, 0); } else if (handle) { - int err = fsfilt_commit(obd, mds->mds_sb, pending_dir, handle, 0); + int err = fsfilt_commit(obd, pending_dir, handle, 0); if (err) { CERROR("error committing close: %d\n", err); if (!rc) @@ -1360,12 +1415,12 @@ out: case 2: dput(pending_child); case 1: - up(&pending_dir->i_sem); + UNLOCK_INODE_MUTEX(pending_dir); } RETURN(rc); } -int mds_close(struct ptlrpc_request *req) +int mds_close(struct ptlrpc_request *req, int offset) { struct mds_export_data *med = &req->rq_export->exp_mds_data; struct obd_device *obd = req->rq_export->exp_obd; @@ -1373,85 +1428,106 @@ int mds_close(struct ptlrpc_request *req) struct mds_file_data *mfd; struct lvfs_run_ctxt saved; struct inode *inode; - int rc, repsize[3] = {sizeof(struct mds_body), - obd->u.mds.mds_max_mdsize, - obd->u.mds.mds_max_cookiesize}; + int rc, repsize[4] = { sizeof(struct ptlrpc_body), + sizeof(struct mds_body), + obd->u.mds.mds_max_mdsize, + obd->u.mds.mds_max_cookiesize }; + struct mds_body *reply_body; + struct lov_mds_md *lmm; + int lmm_size; + struct llog_cookie *logcookies; + int cookies_size; ENTRY; - rc = lustre_pack_reply(req, 3, repsize, NULL); - if (rc) { - CERROR("lustre_pack_reply: rc = %d\n", rc); + rc = lustre_pack_reply(req, 4, repsize, NULL); + if (rc) req->rq_status = rc; - } else { + /* continue on to drop local open even if we can't send reply */ + else MDS_CHECK_RESENT(req, mds_reconstruct_generic(req)); - } - body = lustre_swab_reqbuf(req, 0, sizeof(*body), lustre_swab_mds_body); + CDEBUG(D_INODE, "close req->rep_len %d mdsize %d cookiesize %d\n", + req->rq_replen, + obd->u.mds.mds_max_mdsize, obd->u.mds.mds_max_cookiesize); + mds_counter_incr(req->rq_export, LPROC_MDS_CLOSE); + + body = lustre_swab_reqbuf(req, offset, sizeof(*body), + lustre_swab_mds_body); if (body == NULL) { CERROR("Can't unpack body\n"); req->rq_status = -EFAULT; RETURN(-EFAULT); } - if (body->flags & MDS_BFLAG_UNCOMMITTED_WRITES) - /* do some stuff */ ; - + spin_lock(&med->med_open_lock); mfd = mds_handle2mfd(&body->handle); if (mfd == NULL) { + spin_unlock(&med->med_open_lock); DEBUG_REQ(D_ERROR, req, "no handle for file close ino "LPD64 ": cookie "LPX64, body->fid1.id, body->handle.cookie); req->rq_status = -ESTALE; RETURN(-ESTALE); } + /* Remove mfd handle so it can't be found again. We consume mfd_list + * reference here, but still have mds_handle2mfd ref until mfd_close. */ + mds_mfd_unlink(mfd, 1); + spin_unlock(&med->med_open_lock); 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)); + /* child orphan sem protects orphan_dec_test && is_orphan race */ + MDS_DOWN_WRITE_ORPHAN_SEM(inode); /* mds_mfd_close drops this */ + if (mds_inode_is_orphan(inode) && mds_orphan_open_count(inode) == 1) { + body = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, + sizeof(*body)); LASSERT(body != NULL); - mds_pack_inode2fid(obd, &body->fid1, inode); - mds_pack_inode2body(obd, body, inode); - mds_pack_md(obd, req->rq_repmsg, 1, body, inode, 1); + mds_pack_inode2fid(&body->fid1, inode); + mds_pack_inode2body(body, inode); + mds_pack_md(obd, req->rq_repmsg, REPLY_REC_OFF + 1, body, inode, + MDS_PACK_MD_LOCK); } - spin_lock(&med->med_open_lock); - list_del(&mfd->mfd_list); - spin_unlock(&med->med_open_lock); push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); - req->rq_status = mds_mfd_close(req, obd, mfd, 1); + reply_body = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, sizeof(*reply_body)); + lmm = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF + 1, 0); + lmm_size = lustre_msg_buflen(req->rq_repmsg, REPLY_REC_OFF + 1), + logcookies = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF + 2, 0); + cookies_size = lustre_msg_buflen(req->rq_repmsg, REPLY_REC_OFF + 2); + req->rq_status = mds_mfd_close(req, offset, obd, mfd, 1, + lmm, lmm_size, logcookies, cookies_size, + &reply_body->valid); pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); + mds_shrink_reply(obd, req, body, REPLY_REC_OFF + 1); if (OBD_FAIL_CHECK(OBD_FAIL_MDS_CLOSE_PACK)) { CERROR("test case OBD_FAIL_MDS_CLOSE_PACK\n"); req->rq_status = -ENOMEM; - mds_mfd_put(mfd); RETURN(-ENOMEM); } - mds_mfd_put(mfd); - RETURN(0); + RETURN(rc); } -int mds_done_writing(struct ptlrpc_request *req) +int mds_done_writing(struct ptlrpc_request *req, int offset) { struct mds_body *body; - int rc, size = sizeof(struct mds_body); + int rc, size[2] = { sizeof(struct ptlrpc_body), + sizeof(struct mds_body) }; ENTRY; MDS_CHECK_RESENT(req, mds_reconstruct_generic(req)); - body = lustre_swab_reqbuf(req, 0, sizeof(*body), lustre_swab_mds_body); + body = lustre_swab_reqbuf(req, offset, sizeof(*body), + lustre_swab_mds_body); if (body == NULL) { CERROR("Can't unpack body\n"); req->rq_status = -EFAULT; RETURN(-EFAULT); } - rc = lustre_pack_reply(req, 1, &size, NULL); - if (rc) { - CERROR("lustre_pack_reply: rc = %d\n", rc); + rc = lustre_pack_reply(req, 2, size, NULL); + if (rc) req->rq_status = rc; - } RETURN(0); }