X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdc%2Fmdc_locks.c;h=c2937bbfdc3b6377ef0982044cff9bffc7ad05fc;hb=95861d418ff150ef3e820203b1453d1f1e27be67;hp=a64942d86a7447bb166bd6404f67cf154a4e7b45;hpb=95d394d59bbccbc92af076c985fd664719f8fe12;p=fs%2Flustre-release.git diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c index a64942d..c2937bb 100644 --- a/lustre/mdc/mdc_locks.c +++ b/lustre/mdc/mdc_locks.c @@ -3,20 +3,23 @@ * * Copyright (C) 2001-2003 Cluster File Systems, Inc. * - * This file is part of Lustre, http://www.sf.net/projects/lustre/ + * 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 @@ -33,10 +36,9 @@ # include #endif -#include -#include -#include -#include +#include +#include +#include #include "mdc_internal.h" int it_disposition(struct lookup_intent *it, int flag) @@ -51,34 +53,19 @@ void it_set_disposition(struct lookup_intent *it, int flag) } EXPORT_SYMBOL(it_set_disposition); -static void mdc_id2mdc_data(struct mdc_op_data *data, - struct lustre_id *f1, - struct lustre_id *f2, - const char *name, - int namelen, int mode) +void it_clear_disposition(struct lookup_intent *it, int flag) { - LASSERT(data); - LASSERT(f1); - - data->id1 = *f1; - if (f2) - data->id2 = *f2; - - data->valid = 0; - data->name = name; - data->namelen = namelen; - data->create_mode = mode; - data->mod_time = LTIME_S(CURRENT_TIME); + it->d.lustre.it_disposition &= ~flag; } +EXPORT_SYMBOL(it_clear_disposition); static int it_to_lock_mode(struct lookup_intent *it) { /* CREAT needs to be tested before open (both could be set) */ if (it->it_op & IT_CREAT) - return LCK_PW; - else if (it->it_op & (IT_READDIR | IT_GETATTR | IT_OPEN | IT_LOOKUP | - IT_CHDIR)) - return LCK_PR; + return LCK_CW; + else if (it->it_op & (IT_READDIR | IT_GETATTR | IT_OPEN | IT_LOOKUP)) + return LCK_CR; LBUG(); RETURN(-EINVAL); @@ -87,28 +74,28 @@ static int it_to_lock_mode(struct lookup_intent *it) int it_open_error(int phase, struct lookup_intent *it) { if (it_disposition(it, DISP_OPEN_OPEN)) { - if (phase == DISP_OPEN_OPEN) + if (phase >= DISP_OPEN_OPEN) return it->d.lustre.it_status; else return 0; } if (it_disposition(it, DISP_OPEN_CREATE)) { - if (phase == DISP_OPEN_CREATE) + if (phase >= DISP_OPEN_CREATE) return it->d.lustre.it_status; else return 0; } if (it_disposition(it, DISP_LOOKUP_EXECD)) { - if (phase == DISP_LOOKUP_EXECD) + if (phase >= DISP_LOOKUP_EXECD) return it->d.lustre.it_status; else return 0; } if (it_disposition(it, DISP_IT_EXECD)) { - if (phase == DISP_IT_EXECD) + if (phase >= DISP_IT_EXECD) return it->d.lustre.it_status; else return 0; @@ -121,7 +108,7 @@ int it_open_error(int phase, struct lookup_intent *it) EXPORT_SYMBOL(it_open_error); /* this must be called on a lockh that is known to have a referenced lock */ -int mdc_set_lock_data(struct obd_export *exp, __u64 *l, void *data) +void mdc_set_lock_data(__u64 *l, void *data) { struct ldlm_lock *lock; struct lustre_handle *lockh = (struct lustre_handle *)l; @@ -129,13 +116,13 @@ int mdc_set_lock_data(struct obd_export *exp, __u64 *l, void *data) if (!*l) { EXIT; - return 0; + return; } lock = ldlm_handle2lock(lockh); LASSERT(lock != NULL); - l_lock(&lock->l_resource->lr_namespace->ns_lock); + lock_res_and_lock(lock); #ifdef __KERNEL__ if (lock->l_ast_data && lock->l_ast_data != data) { struct inode *new_inode = data; @@ -144,35 +131,102 @@ int mdc_set_lock_data(struct obd_export *exp, __u64 *l, void *data) "Found existing inode %p/%lu/%u state %lu in lock: " "setting data to %p/%lu/%u\n", old_inode, old_inode->i_ino, old_inode->i_generation, - old_inode->i_state, new_inode, new_inode->i_ino, - new_inode->i_generation); + old_inode->i_state, + new_inode, new_inode->i_ino, new_inode->i_generation); } #endif lock->l_ast_data = data; - l_unlock(&lock->l_resource->lr_namespace->ns_lock); + unlock_res_and_lock(lock); LDLM_LOCK_PUT(lock); EXIT; - return 0; } EXPORT_SYMBOL(mdc_set_lock_data); -int mdc_change_cbdata(struct obd_export *exp, struct lustre_id *id, +int mdc_change_cbdata(struct obd_export *exp, struct ll_fid *fid, ldlm_iterator_t it, void *data) { struct ldlm_res_id res_id = { .name = {0} }; ENTRY; - res_id.name[0] = id_fid(id); - res_id.name[1] = id_group(id); + res_id.name[0] = fid->id; + res_id.name[1] = fid->generation; - ldlm_change_cbdata(class_exp2obd(exp)->obd_namespace, - &res_id, it, data); + ldlm_resource_iterate(class_exp2obd(exp)->obd_namespace, &res_id, + it, data); EXIT; return 0; } +static inline void mdc_clear_replay_flag(struct ptlrpc_request *req, int rc) +{ + /* Don't hold error requests for replay. */ + if (req->rq_replay) { + spin_lock(&req->rq_lock); + req->rq_replay = 0; + spin_unlock(&req->rq_lock); + } + if (rc && req->rq_transno != 0) { + DEBUG_REQ(D_ERROR, req, "transno returned on error rc %d", rc); + LBUG(); + } +} + +static int round_up(int val) +{ + int ret = 1; + while (val) { + val >>= 1; + ret <<= 1; + } + return ret; +} + +/* Save a large LOV EA into the request buffer so that it is available + * for replay. We don't do this in the initial request because the + * original request doesn't need this buffer (at most it sends just the + * lov_mds_md) and it is a waste of RAM/bandwidth to send the empty + * buffer and may also be difficult to allocate and save a very large + * request buffer for each open. (bug 5707) + * + * OOM here may cause recovery failure if lmm is needed (only for the + * original open if the MDS crashed just when this client also OOM'd) + * but this is incredibly unlikely, and questionable whether the client + * could do MDS recovery under OOM anyways... */ +static void mdc_realloc_openmsg(struct ptlrpc_request *req, + struct mds_body *body, int size[6]) +{ + int new_size, old_size; + struct lustre_msg *new_msg; + + /* save old size */ + old_size = lustre_msg_size(lustre_request_magic(req), 6, size); + + size[DLM_INTENT_REC_OFF + 2] = body->eadatasize; + new_size = lustre_msg_size(lustre_request_magic(req), 6, size); + OBD_ALLOC(new_msg, new_size); + if (new_msg != NULL) { + struct lustre_msg *old_msg = req->rq_reqmsg; + + DEBUG_REQ(D_INFO, req, "replace reqmsg for larger EA %u\n", + body->eadatasize); + memcpy(new_msg, old_msg, old_size); + lustre_msg_set_buflen(new_msg, DLM_INTENT_REC_OFF + 2, + body->eadatasize); + + spin_lock(&req->rq_lock); + req->rq_reqmsg = new_msg; + req->rq_reqlen = new_size; + spin_unlock(&req->rq_lock); + + OBD_FREE(old_msg, old_size); + } else { + body->valid &= ~OBD_MD_FLEASIZE; + body->eadatasize = 0; + } +} + /* We always reserve enough space in the reply packet for a stripe MD, because * we don't know in advance the file type. */ int mdc_enqueue(struct obd_export *exp, @@ -185,140 +239,168 @@ int mdc_enqueue(struct obd_export *exp, int lmmsize, ldlm_completion_callback cb_completion, ldlm_blocking_callback cb_blocking, - void *cb_data) + void *cb_data, int extra_lock_flags) { struct ptlrpc_request *req; - struct ldlm_res_id res_id = { - .name = {id_fid(&data->id1), id_group(&data->id1)} - }; struct obd_device *obddev = class_exp2obd(exp); + struct ldlm_res_id res_id = + { .name = {data->fid1.id, data->fid1.generation} }; ldlm_policy_data_t policy = { .l_inodebits = { MDS_INODELOCK_LOOKUP } }; - struct ldlm_intent *lit; struct ldlm_request *lockreq; - struct ldlm_reply *dlm_rep; - int reqsize[6] = {[MDS_REQ_SECDESC_OFF] = 0, - [MDS_REQ_INTENT_LOCKREQ_OFF] = sizeof(*lockreq), - [MDS_REQ_INTENT_IT_OFF] = sizeof(*lit)}; - int repsize[4] = {sizeof(struct ldlm_reply), - sizeof(struct mds_body), - obddev->u.cli.cl_max_mds_easize, - obddev->u.cli.cl_max_mds_cookiesize}; - int req_buffers = 3, reply_buffers = 0; - int rc, flags = LDLM_FL_HAS_INTENT; + struct ldlm_intent *lit; + struct ldlm_reply *lockrep; + int size[7] = { [MSG_PTLRPC_BODY_OFF] = sizeof(struct ptlrpc_body), + [DLM_LOCKREQ_OFF] = sizeof(*lockreq), + [DLM_INTENT_IT_OFF] = sizeof(*lit) }; + int repsize[5] = { [MSG_PTLRPC_BODY_OFF] = sizeof(struct ptlrpc_body), + [DLM_LOCKREPLY_OFF] = sizeof(*lockrep), + [DLM_REPLY_REC_OFF] = sizeof(struct mds_body), + [DLM_REPLY_REC_OFF+1] = obddev->u.cli. + cl_max_mds_easize }; + int flags = extra_lock_flags | LDLM_FL_HAS_INTENT; + int repbufcnt = 4, rc; void *eadata; - unsigned long irqflags; ENTRY; + LASSERTF(lock_type == LDLM_IBITS, "lock type %d\n", lock_type); // LDLM_DEBUG_NOLOCK("mdsintent=%s,name=%s,dir=%lu", // ldlm_it2str(it->it_op), it_name, it_inode->i_ino); - reqsize[0] = mdc_get_secdesc_size(); - if (it->it_op & IT_OPEN) { it->it_create_mode |= S_IFREG; - it->it_create_mode &= ~current->fs->umask; - reqsize[req_buffers++] = sizeof(struct mds_rec_create); - reqsize[req_buffers++] = data->namelen + 1; - reqsize[req_buffers++] = obddev->u.cli.cl_max_mds_easize; - req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_DLM_VERSION, - LDLM_ENQUEUE, req_buffers, reqsize, NULL); + size[DLM_INTENT_REC_OFF] = sizeof(struct mds_rec_create); + size[DLM_INTENT_REC_OFF + 1] = data->namelen + 1; + /* As an optimization, we allocate an RPC request buffer for + * at least a default-sized LOV EA even if we aren't sending + * one. We grow the whole request to the next power-of-two + * size since we get that much from a slab allocation anyways. + * This avoids an allocation below in the common case where + * we need to save a default-sized LOV EA for open replay. */ + size[DLM_INTENT_REC_OFF + 2] = max(lmmsize, + obddev->u.cli.cl_default_mds_easize); + rc = lustre_msg_size(class_exp2cliimp(exp)->imp_msg_magic, 6, + size); + if (rc & (rc - 1)) + size[DLM_INTENT_REC_OFF + 2] = + min(size[DLM_INTENT_REC_OFF+2]+round_up(rc)-rc, + obddev->u.cli.cl_max_mds_easize); + + if (it->it_flags & O_JOIN_FILE) { + __u64 head_size = *(__u32*)cb_data; + __u32 tsize = *(__u32*)lmm; + + /* join is like an unlink of the tail */ + policy.l_inodebits.bits = MDS_INODELOCK_UPDATE; + size[DLM_INTENT_REC_OFF + 3] = + sizeof(struct mds_rec_join); + req = ptlrpc_prep_req(class_exp2cliimp(exp), + LUSTRE_DLM_VERSION, LDLM_ENQUEUE, + 7, size, NULL); + /* when joining file, cb_data and lmm args together + * indicate the head file size*/ + mdc_join_pack(req, DLM_INTENT_REC_OFF + 3, data, + (head_size << 32) | tsize); + cb_data = NULL; + lmm = NULL; + } else { + req = ptlrpc_prep_req(class_exp2cliimp(exp), + LUSTRE_DLM_VERSION, LDLM_ENQUEUE, + 6, size, NULL); + } + if (!req) RETURN(-ENOMEM); - spin_lock_irqsave (&req->rq_lock, irqflags); + spin_lock(&req->rq_lock); req->rq_replay = 1; - spin_unlock_irqrestore (&req->rq_lock, irqflags); + spin_unlock(&req->rq_lock); + + /* pack the intent */ + lit = lustre_msg_buf(req->rq_reqmsg, DLM_INTENT_IT_OFF, + sizeof(*lit)); + lit->opc = (__u64)it->it_op; + + /* pack the intended request */ + mdc_open_pack(req, DLM_INTENT_REC_OFF, data, it->it_create_mode, + 0, it->it_flags, lmm, lmmsize); + + repsize[repbufcnt++] = LUSTRE_POSIX_ACL_MAX_SIZE; + } else if (it->it_op & IT_UNLINK) { + size[DLM_INTENT_REC_OFF] = sizeof(struct mds_rec_unlink); + size[DLM_INTENT_REC_OFF + 1] = data->namelen + 1; + policy.l_inodebits.bits = MDS_INODELOCK_UPDATE; + req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_DLM_VERSION, + LDLM_ENQUEUE, 5, size, NULL); + if (!req) + RETURN(-ENOMEM); /* pack the intent */ - lit = lustre_msg_buf(req->rq_reqmsg, MDS_REQ_INTENT_IT_OFF, - sizeof (*lit)); + lit = lustre_msg_buf(req->rq_reqmsg, DLM_INTENT_IT_OFF, + sizeof(*lit)); lit->opc = (__u64)it->it_op; /* pack the intended request */ - mdc_open_pack(req->rq_reqmsg, MDS_REQ_INTENT_REC_OFF, data, - it->it_create_mode, 0, it->it_flags, - lmm, lmmsize); - /* get ready for the reply */ - reply_buffers = 3; - req->rq_replen = lustre_msg_size(3, repsize); - } else if (it->it_op & (IT_GETATTR | IT_LOOKUP | IT_CHDIR)) { - __u64 valid = data->valid | OBD_MD_FLNOTOBD | OBD_MD_FLEASIZE; - - reqsize[req_buffers++] = sizeof(struct mds_body); - reqsize[req_buffers++] = data->namelen + 1; + mdc_unlink_pack(req, DLM_INTENT_REC_OFF, data); + + repsize[repbufcnt++] = obddev->u.cli.cl_max_mds_cookiesize; + } else if (it->it_op & (IT_GETATTR | IT_LOOKUP)) { + obd_valid valid = OBD_MD_FLGETATTR | OBD_MD_FLEASIZE | + OBD_MD_FLACL | OBD_MD_FLMODEASIZE | + OBD_MD_FLDIREA; + size[DLM_INTENT_REC_OFF] = sizeof(struct mds_body); + size[DLM_INTENT_REC_OFF + 1] = data->namelen + 1; if (it->it_op & IT_GETATTR) policy.l_inodebits.bits = MDS_INODELOCK_UPDATE; req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_DLM_VERSION, - LDLM_ENQUEUE, req_buffers, reqsize, NULL); - + LDLM_ENQUEUE, 5, size, NULL); if (!req) RETURN(-ENOMEM); /* pack the intent */ - lit = lustre_msg_buf(req->rq_reqmsg, MDS_REQ_INTENT_IT_OFF, - sizeof (*lit)); + lit = lustre_msg_buf(req->rq_reqmsg, DLM_INTENT_IT_OFF, + sizeof(*lit)); lit->opc = (__u64)it->it_op; /* pack the intended request */ - mdc_getattr_pack(req->rq_reqmsg, MDS_REQ_INTENT_REC_OFF, - valid, it->it_flags, data); - - /* get ready for the reply */ - reply_buffers = 3; - req->rq_replen = lustre_msg_size(3, repsize); + mdc_getattr_pack(req, DLM_INTENT_REC_OFF, valid, + it->it_flags, data); + + repsize[repbufcnt++] = LUSTRE_POSIX_ACL_MAX_SIZE; } else if (it->it_op == IT_READDIR) { policy.l_inodebits.bits = MDS_INODELOCK_UPDATE; req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_DLM_VERSION, - LDLM_ENQUEUE, 2, reqsize, NULL); - - if (!req) - RETURN(-ENOMEM); - /* get ready for the reply */ - reply_buffers = 1; - req->rq_replen = lustre_msg_size(1, repsize); - } else if (it->it_op == IT_UNLINK) { - reqsize[req_buffers++] = sizeof(struct mds_body); - policy.l_inodebits.bits = MDS_INODELOCK_UPDATE; - req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_DLM_VERSION, - LDLM_ENQUEUE, req_buffers, reqsize, NULL); + LDLM_ENQUEUE, 2, size, NULL); if (!req) RETURN(-ENOMEM); - /* pack the intended request */ - mdc_getattr_pack(req->rq_reqmsg, MDS_REQ_INTENT_REC_OFF, - 0, 0, data); - - /* pack the intent */ - lit = lustre_msg_buf(req->rq_reqmsg, MDS_REQ_INTENT_IT_OFF, - sizeof (*lit)); - lit->opc = (__u64)it->it_op; - - /* get ready for the reply */ - reply_buffers = 3; - req->rq_replen = lustre_msg_size(3, repsize); + repbufcnt = 2; } else { LBUG(); RETURN(-EINVAL); } - mdc_pack_secdesc(req, reqsize[0]); + /* get ready for the reply */ + ptlrpc_req_set_repsize(req, repbufcnt, repsize); + /* It is important to obtain rpc_lock first (if applicable), so that + * threads that are serialised with rpc_lock are not polluting our + * rpcs in flight counter */ mdc_get_rpc_lock(obddev->u.cli.cl_rpc_lock, it); - rc = ldlm_cli_enqueue(exp, req, obddev->obd_namespace, res_id, - lock_type, &policy, lock_mode, &flags,cb_blocking, - cb_completion, NULL, cb_data, NULL, 0, NULL, - lockh); + mdc_enter_request(&obddev->u.cli); + rc = ldlm_cli_enqueue(exp, &req, res_id, lock_type, &policy, + lock_mode, &flags, cb_blocking, cb_completion, + NULL, cb_data, NULL, 0, NULL, lockh, 0); + mdc_exit_request(&obddev->u.cli); mdc_put_rpc_lock(obddev->u.cli.cl_rpc_lock, it); /* Similarly, if we're going to replay this request, we don't want to * actually get a lock, just perform the intent. */ if (req->rq_transno || req->rq_replay) { - lockreq = lustre_msg_buf(req->rq_reqmsg, - MDS_REQ_INTENT_LOCKREQ_OFF, - sizeof (*lockreq)); + lockreq = lustre_msg_buf(req->rq_reqmsg, DLM_LOCKREQ_OFF, + sizeof(*lockreq)); lockreq->lock_flags |= LDLM_FL_INTENT_ONLY; } @@ -330,7 +412,8 @@ int mdc_enqueue(struct obd_export *exp, rc = 0; } else if (rc != 0) { CERROR("ldlm_cli_enqueue: %d\n", rc); - LASSERT (rc < 0); + LASSERTF(rc < 0, "rc %d\n", rc); + mdc_clear_replay_flag(req, rc); ptlrpc_req_finished(req); RETURN(rc); } else { /* rc = 0 */ @@ -344,65 +427,96 @@ int mdc_enqueue(struct obd_export *exp, ldlm_lock_decref(lockh, lock_mode); lock_mode = lock->l_req_mode; } - - ldlm_lock_allow_match(lock); LDLM_LOCK_PUT(lock); } - dlm_rep = lustre_msg_buf(req->rq_repmsg, 0, sizeof (*dlm_rep)); - LASSERT(dlm_rep != NULL); /* checked by ldlm_cli_enqueue() */ - LASSERT_REPSWABBED(req, 0); /* swabbed by ldlm_cli_enqueue() */ + lockrep = lustre_msg_buf(req->rq_repmsg, DLM_LOCKREPLY_OFF, + sizeof(*lockrep)); + LASSERT(lockrep != NULL); /* checked by ldlm_cli_enqueue() */ + LASSERT_REPSWABBED(req, DLM_LOCKREPLY_OFF); /* swabbed by ldlm_cli_enqueue() */ - it->d.lustre.it_disposition = (int) dlm_rep->lock_policy_res1; - it->d.lustre.it_status = (int) dlm_rep->lock_policy_res2; + it->d.lustre.it_disposition = (int)lockrep->lock_policy_res1; + it->d.lustre.it_status = (int)lockrep->lock_policy_res2; it->d.lustre.it_lock_mode = lock_mode; it->d.lustre.it_data = req; - if (it->d.lustre.it_status < 0 && req->rq_replay) { - LASSERT(req->rq_transno == 0); - /* Don't hold error requests for replay. */ - spin_lock(&req->rq_lock); - req->rq_replay = 0; - spin_unlock(&req->rq_lock); - } + if (it->d.lustre.it_status < 0 && req->rq_replay) + mdc_clear_replay_flag(req, it->d.lustre.it_status); - DEBUG_REQ(D_RPCTRACE, req, "disposition: %x, status: %d", - it->d.lustre.it_disposition, it->d.lustre.it_status); + /* If we're doing an IT_OPEN which did not result in an actual + * successful open, then we need to remove the bit which saves + * this request for unconditional replay. + * + * It's important that we do this first! Otherwise we might exit the + * function without doing so, and try to replay a failed create + * (bug 3440) */ + if (it->it_op & IT_OPEN && req->rq_replay && + (!it_disposition(it, DISP_OPEN_OPEN) ||it->d.lustre.it_status != 0)) + mdc_clear_replay_flag(req, it->d.lustre.it_status); + + DEBUG_REQ(D_RPCTRACE, req, "op: %d disposition: %x, status: %d", + it->it_op,it->d.lustre.it_disposition,it->d.lustre.it_status); /* We know what to expect, so we do any byte flipping required here */ - LASSERT(reply_buffers == 4 || reply_buffers == 3 || reply_buffers == 1); - if (reply_buffers >= 3) { + LASSERT(repbufcnt == 5 || repbufcnt == 2); + if (repbufcnt == 5) { struct mds_body *body; - body = lustre_swab_repbuf(req, 1, sizeof (*body), - lustre_swab_mds_body); + body = lustre_swab_repbuf(req, DLM_REPLY_REC_OFF, sizeof(*body), + lustre_swab_mds_body); if (body == NULL) { CERROR ("Can't swab mds_body\n"); RETURN (-EPROTO); } + /* If this is a successful OPEN request, we need to set + replay handler and data early, so that if replay happens + immediately after swabbing below, new reply is swabbed + by that handler correctly */ + if (it_disposition(it, DISP_OPEN_OPEN) && + !it_open_error(DISP_OPEN_OPEN, it)) + mdc_set_open_replay_data(NULL, req); + if ((body->valid & OBD_MD_FLEASIZE) != 0) { /* The eadata is opaque; just check that it is there. * Eventually, obd_unpackmd() will check the contents */ - eadata = lustre_swab_repbuf(req, 2, body->eadatasize, - NULL); + eadata = lustre_swab_repbuf(req, DLM_REPLY_REC_OFF + 1, + body->eadatasize, NULL); if (eadata == NULL) { CERROR ("Missing/short eadata\n"); RETURN (-EPROTO); } + if (body->valid & OBD_MD_FLMODEASIZE) { + if (obddev->u.cli.cl_max_mds_easize < + body->max_mdsize) { + obddev->u.cli.cl_max_mds_easize = + body->max_mdsize; + CDEBUG(D_INFO, "maxeasize become %d\n", + body->max_mdsize); + } + if (obddev->u.cli.cl_max_mds_cookiesize < + body->max_cookiesize) { + obddev->u.cli.cl_max_mds_cookiesize = + body->max_cookiesize; + CDEBUG(D_INFO, "cookiesize become %d\n", + body->max_cookiesize); + } + } + /* We save the reply LOV EA in case we have to replay + * a create for recovery. If we didn't allocate a + * large enough request buffer above we need to + * reallocate it here to hold the actual LOV EA. */ if (it->it_op & IT_OPEN) { - void *replayea; - - replayea = lustre_msg_buf(req->rq_reqmsg, - MDS_REQ_INTENT_REC_OFF + 2, - body->eadatasize); - LASSERT(replayea); - memcpy(replayea, eadata, body->eadatasize); - - LASSERT(req->rq_reqmsg->bufcount == 6); - req->rq_reqmsg->buflens[5] = body->eadatasize; - /* If this isn't the last buffer, we might - * have to shift other data around. */ + int offset = DLM_INTENT_REC_OFF + 2; + + if (lustre_msg_buflen(req->rq_reqmsg, offset) < + body->eadatasize) + mdc_realloc_openmsg(req, body, size); + + lmm = lustre_msg_buf(req->rq_reqmsg, offset, + body->eadatasize); + if (lmm) + memcpy(lmm, eadata, body->eadatasize); } } } @@ -438,52 +552,56 @@ EXPORT_SYMBOL(mdc_enqueue); * Else, if DISP_LOOKUP_EXECD then d.lustre.it_status is the rc of the * child lookup. */ -int mdc_intent_lock(struct obd_export *exp, struct lustre_id *pid, - const char *name, int len, void *lmm, int lmmsize, - struct lustre_id *cid, struct lookup_intent *it, +int mdc_intent_lock(struct obd_export *exp, struct mdc_op_data *op_data, + void *lmm, int lmmsize, struct lookup_intent *it, int lookup_flags, struct ptlrpc_request **reqp, - ldlm_blocking_callback cb_blocking) + ldlm_blocking_callback cb_blocking, int extra_lock_flags) { struct lustre_handle lockh; struct ptlrpc_request *request; + int rc = 0; struct mds_body *mds_body; struct lustre_handle old_lock; struct ldlm_lock *lock; - int rc = 0; ENTRY; LASSERT(it); - CDEBUG(D_DLMTRACE, "name: %*s in obj "DLID4", intent: %s flags %#o\n", - len, name, OLID4(pid), ldlm_it2str(it->it_op), it->it_flags); + CDEBUG(D_DLMTRACE,"name: %.*s in inode "LPU64", intent: %s flags %#o\n", + op_data->namelen, op_data->name, op_data->fid1.id, + ldlm_it2str(it->it_op), it->it_flags); - if (cid && (it->it_op == IT_LOOKUP || it->it_op == IT_GETATTR || - it->it_op == IT_CHDIR)) { + if (op_data->fid2.id && + (it->it_op == IT_LOOKUP || it->it_op == IT_GETATTR)) { /* We could just return 1 immediately, but since we should only * be called in revalidate_it if we already have a lock, let's * verify that. */ - struct ldlm_res_id res_id = {.name = {id_fid(cid), - id_group(cid)}}; + struct ldlm_res_id res_id = {.name ={op_data->fid2.id, + op_data->fid2.generation}}; struct lustre_handle lockh; ldlm_policy_data_t policy; - int mode = LCK_PR; + int mode = LCK_CR; - /* For the GETATTR case, ll_revalidate_it issues two separate - queries - for LOOKUP and for UPDATE lock because it cannot - check them together - we might have those two bits to be - present in two separate granted locks */ + /* As not all attributes are kept under update lock, e.g. + owner/group/acls are under lookup lock, we need both + ibits for GETATTR. */ policy.l_inodebits.bits = (it->it_op == IT_GETATTR) ? - MDS_INODELOCK_UPDATE: MDS_INODELOCK_LOOKUP; - - mode = LCK_PR; + MDS_INODELOCK_UPDATE | MDS_INODELOCK_LOOKUP : + MDS_INODELOCK_LOOKUP; + rc = ldlm_lock_match(exp->exp_obd->obd_namespace, LDLM_FL_BLOCK_GRANTED, &res_id, - LDLM_IBITS, &policy, LCK_PR, &lockh); + LDLM_IBITS, &policy, LCK_CR, &lockh); if (!rc) { - mode = LCK_PW; + mode = LCK_CW; rc = ldlm_lock_match(exp->exp_obd->obd_namespace, LDLM_FL_BLOCK_GRANTED, &res_id, - LDLM_IBITS, &policy, LCK_PW, - &lockh); + LDLM_IBITS, &policy,LCK_CW,&lockh); + } + if (!rc) { + mode = LCK_PR; + rc = ldlm_lock_match(exp->exp_obd->obd_namespace, + LDLM_FL_BLOCK_GRANTED, &res_id, + LDLM_IBITS, &policy,LCK_PR,&lockh); } if (rc) { memcpy(&it->d.lustre.it_lock_handle, &lockh, @@ -491,9 +609,9 @@ int mdc_intent_lock(struct obd_export *exp, struct lustre_id *pid, it->d.lustre.it_lock_mode = mode; } - /* Only return failure if it was not GETATTR by cid (from - inode_revalidate) */ - if (rc || name) + /* Only return failure if it was not GETATTR by cfid + (from inode_revalidate) */ + if (rc || op_data->namelen != 0) RETURN(rc); } @@ -506,59 +624,26 @@ int mdc_intent_lock(struct obd_export *exp, struct lustre_id *pid, * this and use the request from revalidate. In this case, revalidate * never dropped its reference, so the refcounts are all OK */ if (!it_disposition(it, DISP_ENQ_COMPLETE)) { - struct mdc_op_data op_data; - - mdc_id2mdc_data(&op_data, pid, cid, name, len, 0); - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) - /* - * This is optimization. Now fid will not be obtained from - * server if client inode already exists. This flag is set in - * ll_revalidate_it() if it finds that passed dentry contains - * inode. - */ - if (!(it->d.lustre.it_int_flags && LL_IT_EXIST)) { -#endif - /* - * if we get inode by name (ll_lookup_it() case), we - * always should ask for fid, as we will not be able to - * take locks, revalidate dentry, etc. later with - * invalid fid in inode. - */ - if (cid == NULL && name != NULL) - op_data.valid |= OBD_MD_FID; -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) - } -#endif rc = mdc_enqueue(exp, LDLM_IBITS, it, it_to_lock_mode(it), - &op_data, &lockh, lmm, lmmsize, - ldlm_completion_ast, cb_blocking, NULL); + op_data, &lockh, lmm, lmmsize, + ldlm_completion_ast, cb_blocking, NULL, + extra_lock_flags); if (rc < 0) RETURN(rc); - memcpy(&it->d.lustre.it_lock_handle, &lockh, sizeof(lockh)); + } else if (!op_data->fid2.id) { + /* DISP_ENQ_COMPLETE set means there is extra reference on + * request referenced from this intent, saved for subsequent + * lookup. This path is executed when we proceed to this + * lookup, so we clear DISP_ENQ_COMPLETE */ + it_clear_disposition(it, DISP_ENQ_COMPLETE); } request = *reqp = it->d.lustre.it_data; LASSERT(request != NULL); - - /* If we're doing an IT_OPEN which did not result in an actual - * successful open, then we need to remove the bit which saves this - * request for unconditional replay. - * - * It's important that we do this first! Otherwise we might exit the - * function without doing so, and try to replay a failed create (bug - * 3440) */ - if (it->it_op & IT_OPEN) { - if (!it_disposition(it, DISP_OPEN_OPEN) || - it->d.lustre.it_status != 0) { - unsigned long irqflags; + LASSERT(request != LP_POISON); + LASSERT(request->rq_repmsg != LP_POISON); - spin_lock_irqsave(&request->rq_lock, irqflags); - request->rq_replay = 0; - spin_unlock_irqrestore(&request->rq_lock, irqflags); - } - } if (!it_disposition(it, DISP_IT_EXECD)) { /* The server failed before it even started executing the * intent, i.e. because it couldn't unpack the request. */ @@ -569,66 +654,59 @@ int mdc_intent_lock(struct obd_export *exp, struct lustre_id *pid, if (rc) RETURN(rc); - mds_body = lustre_msg_buf(request->rq_repmsg, 1, sizeof(*mds_body)); - LASSERT(mds_body != NULL); /* mdc_enqueue checked */ + mds_body = lustre_msg_buf(request->rq_repmsg, DLM_REPLY_REC_OFF, + sizeof(*mds_body)); + LASSERT(mds_body != NULL); /* mdc_enqueue checked */ LASSERT_REPSWABBED(request, 1); /* mdc_enqueue swabbed */ - /* If we were revalidating a fid/name pair, mark the intent in case we - * fail and get called again from lookup */ - if (cid != NULL) { + /* If we were revalidating a fid/name pair, mark the intent in + * case we fail and get called again from lookup */ + if (op_data->fid2.id && (it->it_op != IT_GETATTR)) { it_set_disposition(it, DISP_ENQ_COMPLETE); /* Also: did we find the same inode? */ - - /* we have to compare all the fields but type, because MDS can - * return fid/mds/ino/gen if inode lives on another MDS -bzzz */ - if (!id_equal(cid, &mds_body->id1)) - RETURN(-ESTALE); + if (memcmp(&op_data->fid2, &mds_body->fid1, + sizeof(op_data->fid2))) + RETURN (-ESTALE); } rc = it_open_error(DISP_LOOKUP_EXECD, it); if (rc) RETURN(rc); - /* - * keep requests around for the multiple phases of the call this shows - * the DISP_XX must guarantee we make it into the call. + /* keep requests around for the multiple phases of the call + * this shows the DISP_XX must guarantee we make it into the call */ - if (it_disposition(it, DISP_OPEN_CREATE) && - !it_open_error(DISP_OPEN_CREATE, it)) + if (!it_disposition(it, DISP_ENQ_CREATE_REF) && + it_disposition(it, DISP_OPEN_CREATE) && + !it_open_error(DISP_OPEN_CREATE, it)) { + it_set_disposition(it, DISP_ENQ_CREATE_REF); ptlrpc_request_addref(request); /* balanced in ll_create_node */ - if (it_disposition(it, DISP_OPEN_OPEN) && - !it_open_error(DISP_OPEN_OPEN, it)) + } + if (!it_disposition(it, DISP_ENQ_OPEN_REF) && + it_disposition(it, DISP_OPEN_OPEN) && + !it_open_error(DISP_OPEN_OPEN, it)) { + it_set_disposition(it, DISP_ENQ_OPEN_REF); ptlrpc_request_addref(request); /* balanced in ll_file_open */ + } if (it->it_op & IT_CREAT) { /* XXX this belongs in ll_create_it */ } else if (it->it_op == IT_OPEN) { LASSERT(!it_disposition(it, DISP_OPEN_CREATE)); } else { - LASSERT(it->it_op & (IT_GETATTR | IT_LOOKUP | IT_CHDIR)); + LASSERT(it->it_op & (IT_GETATTR | IT_LOOKUP)); } - /* - * if we already have a matching lock, then cancel the new one. We have - * to set the data here instead of in mdc_enqueue, because we need to - * use the child's inode as the l_ast_data to match, and that's not - * available until intent_finish has performed the iget().) - */ + /* If we already have a matching lock, then cancel the new + * one. We have to set the data here instead of in + * mdc_enqueue, because we need to use the child's inode as + * the l_ast_data to match, and that's not available until + * intent_finish has performed the iget().) */ lock = ldlm_handle2lock(&lockh); if (lock) { ldlm_policy_data_t policy = lock->l_policy_data; LDLM_DEBUG(lock, "matching against this"); LDLM_LOCK_PUT(lock); - - LASSERTF(id_fid(&mds_body->id1) == lock->l_resource->lr_name.name[0] && - id_group(&mds_body->id1) == lock->l_resource->lr_name.name[1], - "Invalid lock is returned to client. Lock res_is: %lu/%lu, " - "response res_id: %lu/%lu.\n", - (unsigned long)lock->l_resource->lr_name.name[0], - (unsigned long)lock->l_resource->lr_name.name[1], - (unsigned long)id_fid(&mds_body->id1), - (unsigned long)id_group(&mds_body->id1)); - memcpy(&old_lock, &lockh, sizeof(lockh)); if (ldlm_lock_match(NULL, LDLM_FL_BLOCK_GRANTED, NULL, LDLM_IBITS, &policy, LCK_NL, &old_lock)) { @@ -639,9 +717,9 @@ int mdc_intent_lock(struct obd_export *exp, struct lustre_id *pid, sizeof(lockh)); } } - CDEBUG(D_DENTRY, "D_IT dentry %*s intent: %s status %d disp %x rc %d\n", - len, name, ldlm_it2str(it->it_op), it->d.lustre.it_status, - it->d.lustre.it_disposition, rc); + CDEBUG(D_DENTRY,"D_IT dentry %.*s intent: %s status %d disp %x rc %d\n", + op_data->namelen, op_data->name, ldlm_it2str(it->it_op), + it->d.lustre.it_status, it->d.lustre.it_disposition, rc); RETURN(rc); }