/* 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,
+ int *cancel_update_lock)
{
struct obd_device *obd = req->rq_export->exp_obd;
struct mds_obd *mds = mds_req2mds(req);
int rc = 0, reply_off;
ENTRY;
+ *cancel_update_lock = 0;
+
/* atomically create objects if necessary */
down(&dchild->d_inode->i_sem);
mode = dchild->d_inode->i_mode;
if (S_ISREG(dchild->d_inode->i_mode) &&
(body->valid & OBD_MD_FLEASIZE)) {
rc = mds_revalidate_lov_ea(obd,dchild,req->rq_repmsg,2);
- if (!rc)
+ if (!rc) {
rc = mds_pack_md(obd, req->rq_repmsg, 2, body,
dchild->d_inode, 0, 0);
+ /* after ost add/delete, lov ea can change
+ * along with size/blocks, which we have
+ * to update as well */
+ body->size = dchild->d_inode->i_size;
+ body->blocks = dchild->d_inode->i_blocks;
+ *cancel_update_lock = 1;
+ }
if (rc) {
up(&dchild->d_inode->i_sem);
RETURN(rc);
struct inode *pending_dir = mds->mds_pending_dir->d_inode;
struct dentry *dchild;
char idname[LL_ID_NAMELEN];
- int idlen = 0, rc;
+ int idlen = 0, rc, fake;
void *handle = NULL;
ENTRY;
intent_set_disposition(rep, DISP_LOOKUP_POS);
open:
- rc = mds_finish_open(req, dchild, body, flags, &handle, rec, rep);
+ rc = mds_finish_open(req, dchild, body, flags, &handle, rec, rep,&fake);
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? */
int child_mode = LCK_PR;
struct lustre_id sid;
__u64 fid = 0;
+ int cancel_update_lock;
ENTRY;
DEBUG_REQ(D_INODE, req, "parent "DLID4" name %*s mode %o",
/* Step 5: mds_open it */
rc = mds_finish_open(req, dchild, body, rec->ur_flags, &handle,
- rec, rep);
+ rec, rep, &cancel_update_lock);
if (rc)
GOTO(cleanup, rc);
* isize/iblocks from mds anymore.
* FIXME: can cause a deadlock, use mds_get_parent_child_locked()
* XXX: optimization is to do this for first writer only */
- if (accmode(rec->ur_flags) & MAY_WRITE) {
+ if ((accmode(rec->ur_flags) & MAY_WRITE) || cancel_update_lock) {
struct ldlm_res_id child_res_id = { .name = {0}};
ldlm_policy_data_t sz_policy;
struct lustre_handle sz_lockh;