* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
struct thandle *handle;
#ifdef HAVE_QUOTA_SUPPORT
struct obd_device *obd = mdd->mdd_obd_dev;
+ struct obd_export *exp = md_quota(env)->mq_exp;
struct mds_obd *mds = &obd->u.mds;
unsigned int qids[MAXQUOTAS] = { 0, 0 };
int quota_opc = 0, rec_pending[MAXQUOTAS] = { 0, 0 };
quota_opc = FSFILT_OP_LINK;
mdd_quota_wrapper(la_tmp, qids);
/* get block quota for parent */
- lquota_chkquota(mds_quota_interface_ref, obd,
+ lquota_chkquota(mds_quota_interface_ref, obd, exp,
qids, rec_pending, 1, NULL,
LQUOTA_FLAGS_BLK, data, 1);
}
}
}
#endif
-
- if (rc == 0)
- obd_set_info_async(mdd2obd_dev(mdd)->u.mds.mds_osc_exp,
- sizeof(KEY_UNLINKED), KEY_UNLINKED, 0,
- NULL, NULL);
if (!is_dir)
/* old files may not have link ea; ignore errors */
mdd_links_rename(env, mdd_cobj, mdo2fid(mdd_pobj),
#ifdef HAVE_QUOTA_SUPPORT
struct md_ucred *uc = md_ucred(env);
struct obd_device *obd = mdd->mdd_obd_dev;
+ struct obd_export *exp = md_quota(env)->mq_exp;
struct mds_obd *mds = &obd->u.mds;
unsigned int qids[MAXQUOTAS] = { 0, 0 };
int quota_opc = 0, rec_pending[MAXQUOTAS] = { 0, 0 };
mdd_quota_wrapper(la_tmp, qids);
/* get block quota for parent */
lquota_chkquota(mds_quota_interface_ref, obd,
- qids, rec_pending, 1, NULL,
+ exp, qids, rec_pending, 1, NULL,
LQUOTA_FLAGS_BLK, data, 1);
}
} else {
struct thandle *handle;
#ifdef HAVE_QUOTA_SUPPORT
struct obd_device *obd = mdd->mdd_obd_dev;
+ struct obd_export *exp = md_quota(env)->mq_exp;
struct mds_obd *mds = &obd->u.mds;
unsigned int qcids[MAXQUOTAS] = { 0, 0 };
unsigned int qpids[MAXQUOTAS] = { 0, 0 };
quota_popc = FSFILT_OP_LINK;
mdd_quota_wrapper(la_tmp, qpids);
/* get block quota for target parent */
- lquota_chkquota(mds_quota_interface_ref, obd,
+ lquota_chkquota(mds_quota_interface_ref, obd, exp,
qpids, rec_pending, 1, NULL,
LQUOTA_FLAGS_BLK, data, 1);
}
int got_def_acl = 0;
#ifdef HAVE_QUOTA_SUPPORT
struct obd_device *obd = mdd->mdd_obd_dev;
+ struct obd_export *exp = md_quota(env)->mq_exp;
struct mds_obd *mds = &obd->u.mds;
unsigned int qcids[MAXQUOTAS] = { 0, 0 };
unsigned int qpids[MAXQUOTAS] = { 0, 0 };
mdd_quota_wrapper(&ma->ma_attr, qcids);
mdd_quota_wrapper(la_tmp, qpids);
/* get file quota for child */
- lquota_chkquota(mds_quota_interface_ref, obd, qcids,
- inode_pending, 1, NULL, 0, NULL, 0);
+ lquota_chkquota(mds_quota_interface_ref, obd, exp,
+ qcids, inode_pending, 1, NULL, 0, NULL,
+ 0);
switch (ma->ma_attr.la_mode & S_IFMT) {
case S_IFLNK:
case S_IFDIR:
/* get block quota for child and parent */
if (block_count)
lquota_chkquota(mds_quota_interface_ref, obd,
- qcids, block_pending,
+ exp, qcids, block_pending,
block_count, NULL,
LQUOTA_FLAGS_BLK, NULL, 0);
if (!same)
lquota_chkquota(mds_quota_interface_ref, obd,
- qpids, parent_pending, 1, NULL,
- LQUOTA_FLAGS_BLK, NULL, 0);
+ exp, qpids, parent_pending, 1,
+ NULL, LQUOTA_FLAGS_BLK, NULL,
+ 0);
}
}
#endif
#ifdef HAVE_QUOTA_SUPPORT
struct obd_device *obd = mdd->mdd_obd_dev;
+ struct obd_export *exp = md_quota(env)->mq_exp;
struct mds_obd *mds = &obd->u.mds;
unsigned int qspids[MAXQUOTAS] = { 0, 0 };
unsigned int qtcids[MAXQUOTAS] = { 0, 0 };
mdd_quota_wrapper(la_tmp, qtpids);
/* get block quota for target parent */
lquota_chkquota(mds_quota_interface_ref,
- obd, qtpids,
+ obd, exp, qtpids,
rec_pending, 1, NULL,
LQUOTA_FLAGS_BLK,
data, 1);
GOTO(cleanup, rc);
/* "mv dir1 dir2" needs "dir1/.." link update */
- if (is_dir && mdd_sobj) {
+ if (is_dir && mdd_sobj && !lu_fid_eq(spobj_fid, tpobj_fid)) {
rc = __mdd_index_delete_only(env, mdd_sobj, dotdot, handle,
mdd_object_capa(env, mdd_sobj));
if (rc)
rc = __mdd_index_insert_only(env, mdd_sobj, tpobj_fid, dotdot,
handle, mdd_object_capa(env, mdd_sobj));
- if (rc) {
+ if (rc)
GOTO(fixup_spobj, rc);
- }
}
/* Remove target name from target directory
rc = mdo_xattr_get(env, mdd_obj, buf, XATTR_NAME_LINK, capa);
if (rc == -ERANGE) {
/* Buf was too small, figure out what we need. */
- buf->lb_buf = NULL;
- buf->lb_len = 0;
+ mdd_buf_put(buf);
rc = mdo_xattr_get(env, mdd_obj, buf, XATTR_NAME_LINK, capa);
if (rc < 0)
return ERR_PTR(rc);
static int mdd_lee_pack(struct link_ea_entry *lee, const struct lu_name *lname,
const struct lu_fid *pfid)
{
- int reclen;
+ struct lu_fid tmpfid;
+ int reclen;
- fid_cpu_to_be(&lee->lee_parent_fid, pfid);
- strncpy(lee->lee_name, lname->ln_name, lname->ln_namelen);
+ fid_cpu_to_be(&tmpfid, pfid);
+ memcpy(&lee->lee_parent_fid, &tmpfid, sizeof(tmpfid));
+ memcpy(lee->lee_name, lname->ln_name, lname->ln_namelen);
reclen = sizeof(struct link_ea_entry) + lname->ln_namelen;
lee->lee_reclen[0] = (reclen >> 8) & 0xff;
struct lu_name *lname, struct lu_fid *pfid)
{
*reclen = (lee->lee_reclen[0] << 8) | lee->lee_reclen[1];
- fid_be_to_cpu(pfid, &lee->lee_parent_fid);
+ memcpy(pfid, &lee->lee_parent_fid, sizeof(*pfid));
+ fid_be_to_cpu(pfid, pfid);
lname->ln_name = lee->lee_name;
lname->ln_namelen = *reclen - sizeof(struct link_ea_entry);
}
rc = __mdd_xattr_set(env, mdd_obj,
mdd_buf_get_const(env, buf->lb_buf, leh->leh_len),
XATTR_NAME_LINK, 0, handle);
- if (rc)
- CERROR("link_ea add failed %d "DFID"\n", rc,
- PFID(mdd_object_fid(mdd_obj)));
+ if (rc) {
+ if (rc == -ENOSPC)
+ CDEBUG(D_INODE, "link_ea add failed %d "DFID"\n", rc,
+ PFID(mdd_object_fid(mdd_obj)));
+ else
+ CERROR("link_ea add failed %d "DFID"\n", rc,
+ PFID(mdd_object_fid(mdd_obj)));
+ }
if (buf->lb_vmalloc)
/* if we vmalloced a large buffer drop it */
buf = mdd_links_get(env, mdd_obj);
if (IS_ERR(buf)) {
rc = PTR_ERR(buf);
- CERROR("link_ea read failed %d "DFID"\n",
- rc, PFID(mdd_object_fid(mdd_obj)));
+ if (rc == -ENODATA)
+ CDEBUG(D_INODE, "link_ea read failed %d "DFID"\n",
+ rc, PFID(mdd_object_fid(mdd_obj)));
+ else
+ CERROR("link_ea read failed %d "DFID"\n",
+ rc, PFID(mdd_object_fid(mdd_obj)));
RETURN(rc);
}
leh = buf->lb_buf;
lee = (struct link_ea_entry *)(leh + 1); /* link #0 */
/* Find the old record */
- for(count = 0; count <= leh->leh_reccount; count++) {
+ for(count = 0; count < leh->leh_reccount; count++) {
mdd_lee_unpack(lee, &reclen, tmpname, tmpfid);
if (tmpname->ln_namelen == oldlname->ln_namelen &&
lu_fid_eq(tmpfid, oldpfid) &&
break;
lee = (struct link_ea_entry *)((char *)lee + reclen);
}
- if (count > leh->leh_reccount) {
+ if ((count + 1) > leh->leh_reccount) {
CDEBUG(D_INODE, "Old link_ea name '%.*s' not found\n",
oldlname->ln_namelen, oldlname->ln_name);
GOTO(out, rc = -ENOENT);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff