* GPL HEADER END
*/
/*
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, 2013, Intel Corporation.
* Use is subject to license terms.
*
* Author: Johann Lombardi <johann@whamcloud.com>
const struct lu_fid *fid, struct osd_inode_id *id)
{
struct super_block *sb = osd_sb(osd);
+ unsigned long qf_inums[2] = {
+ le32_to_cpu(LDISKFS_SB(sb)->s_es->s_usr_quota_inum),
+ le32_to_cpu(LDISKFS_SB(sb)->s_es->s_grp_quota_inum)
+ };
ENTRY;
LASSERT(fid_is_acct(fid));
RETURN(-ENOENT);
id->oii_gen = OSD_OII_NOGEN;
- id->oii_ino = LDISKFS_SB(sb)->s_qf_inums[fid2type(fid)];
+ id->oii_ino = qf_inums[fid2type(fid)];
if (!ldiskfs_valid_inum(sb, id->oii_ino))
RETURN(-ENOENT);
RETURN(0);
struct lustre_capa *capa)
{
struct osd_thread_info *info = osd_oti_get(env);
+#ifdef HAVE_DQUOT_FS_DISK_QUOTA
+ struct fs_disk_quota *dqblk = &info->oti_fdq;
+#else
struct if_dqblk *dqblk = &info->oti_dqblk;
+#endif
struct super_block *sb = osd_sb(osd_obj2dev(osd_dt_obj(dtobj)));
struct lquota_acct_rec *rec = (struct lquota_acct_rec *)dtrec;
__u64 id = *((__u64 *)dtkey);
int rc;
+#ifdef HAVE_DQUOT_KQID
+ struct kqid qid;
+#endif
ENTRY;
memset((void *)dqblk, 0, sizeof(struct obd_dqblk));
+#ifdef HAVE_DQUOT_KQID
+ qid = make_kqid(&init_user_ns, obj2type(dtobj), id);
+ rc = sb->s_qcop->get_dqblk(sb, qid, dqblk);
+#else
rc = sb->s_qcop->get_dqblk(sb, obj2type(dtobj), (qid_t) id, dqblk);
+#endif
if (rc)
RETURN(rc);
+#ifdef HAVE_DQUOT_FS_DISK_QUOTA
+ rec->bspace = dqblk->d_bcount;
+ rec->ispace = dqblk->d_icount;
+#else
rec->bspace = dqblk->dqb_curspace;
rec->ispace = dqblk->dqb_curinodes;
+#endif
RETURN(+1);
}
memset(it, 0, sizeof(*it));
lu_object_get(lo);
it->oiq_obj = obj;
- CFS_INIT_LIST_HEAD(&it->oiq_list);
+ INIT_LIST_HEAD(&it->oiq_list);
/* LUSTRE_DQTREEOFF is the initial offset where the tree can be found */
it->oiq_blk[0] = LUSTRE_DQTREEOFF;
lu_object_put(env, &it->oiq_obj->oo_dt.do_lu);
- cfs_list_for_each_entry_safe(leaf, tmp, &it->oiq_list, oql_link) {
- cfs_list_del_init(&leaf->oql_link);
+ list_for_each_entry_safe(leaf, tmp, &it->oiq_list, oql_link) {
+ list_del_init(&leaf->oql_link);
OBD_FREE_PTR(leaf);
}
EXIT;
OBD_ALLOC_PTR(leaf);
if (leaf == NULL)
RETURN(-ENOMEM);
- CFS_INIT_LIST_HEAD(&leaf->oql_link);
+ INIT_LIST_HEAD(&leaf->oql_link);
leaf->oql_blk = it->oiq_blk[depth];
- cfs_list_add_tail(&leaf->oql_link, &it->oiq_list);
+ list_add_tail(&leaf->oql_link, &it->oiq_list);
RETURN(0);
}
* Reserve journal credits for quota files update first, then call
* ->op_begin() to perform quota enforcement.
*
- * \param env - the environment passed by the caller
- * \param oh - osd transaction handle
- * \param qi - quota id & space required for this operation
- * \param allocated - dquot entry in quota accounting file has been allocated
- * \param flags - if the operation is write, return no user quota, no
- * group quota, or sync commit flags to the caller
+ * \param env - the environment passed by the caller
+ * \param oh - osd transaction handle
+ * \param qi - quota id & space required for this operation
+ * \param obj - osd object, could be NULL when it's under create
+ * \param enforce - whether to perform quota enforcement
+ * \param flags - if the operation is write, return no user quota, no
+ * group quota, or sync commit flags to the caller
*
- * \retval 0 - success
- * \retval -ve - failure
+ * \retval 0 - success
+ * \retval -ve - failure
*/
int osd_declare_qid(const struct lu_env *env, struct osd_thandle *oh,
- struct lquota_id_info *qi, bool allocated, int *flags)
+ struct lquota_id_info *qi, struct osd_object *obj,
+ bool enforce, int *flags)
{
struct osd_thread_info *info = osd_oti_get(env);
struct osd_device *dev = info->oti_dev;
struct qsd_instance *qsd = dev->od_quota_slave;
- int i, rc;
+ struct inode *inode = NULL;
+ int i, rc = 0;
bool found = false;
ENTRY;
RETURN(-EOVERFLOW);
}
- OSD_DECLARE_OP(oh, quota,
- (allocated || qi->lqi_id.qid_uid == 0) ?
- 1 : LDISKFS_QUOTA_INIT_BLOCKS(osd_sb(dev)));
+ if (obj != NULL)
+ inode = obj->oo_inode;
+ osd_trans_declare_op(env, oh, OSD_OT_QUOTA,
+ (qi->lqi_id.qid_uid == 0 ||
+ (inode != NULL &&
+ inode->i_dquot[qi->lqi_type] != NULL)) ?
+ 1: LDISKFS_QUOTA_INIT_BLOCKS(osd_sb(dev)));
oh->ot_id_array[i] = qi->lqi_id.qid_uid;
osd_qid_set_type(oh, i, qi->lqi_type);
RETURN(0);
/* check quota */
- rc = qsd_op_begin(env, qsd, oh->ot_quota_trans, qi, flags);
+ if (enforce)
+ rc = qsd_op_begin(env, qsd, oh->ot_quota_trans, qi, flags);
RETURN(rc);
}
* \param gid - group id of the inode
* \param space - how many blocks/inodes will be consumed/released
* \param oh - osd transaction handle
+ * \param obj - osd object, could be NULL when it's under create
* \param is_blk - block quota or inode quota?
- * \param allocated - dquot entry in quota accounting file has been allocated
* \param flags - if the operation is write, return no user quota, no
* group quota, or sync commit flags to the caller
* \param force - set to 1 when changes are performed by root user and thus
*/
int osd_declare_inode_qid(const struct lu_env *env, qid_t uid, qid_t gid,
long long space, struct osd_thandle *oh,
- bool is_blk, bool allocated, int *flags, bool force)
+ struct osd_object *obj, bool is_blk, int *flags,
+ bool force)
{
struct osd_thread_info *info = osd_oti_get(env);
struct lquota_id_info *qi = &info->oti_qi;
qi->lqi_type = USRQUOTA;
qi->lqi_space = space;
qi->lqi_is_blk = is_blk;
- rcu = osd_declare_qid(env, oh, qi, allocated, flags);
+ rcu = osd_declare_qid(env, oh, qi, obj, true, flags);
if (force && (rcu == -EDQUOT || rcu == -EINPROGRESS))
/* ignore EDQUOT & EINPROGRESS when changes are done by root */
/* and now group quota */
qi->lqi_id.qid_gid = gid;
qi->lqi_type = GRPQUOTA;
- rcg = osd_declare_qid(env, oh, qi, allocated, flags);
+ rcg = osd_declare_qid(env, oh, qi, obj, true, flags);
if (force && (rcg == -EDQUOT || rcg == -EINPROGRESS))
/* as before, ignore EDQUOT & EINPROGRESS for root */
RETURN(rcu ? rcu : rcg);
}
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 53, 0)
/* Following code is used to migrate old admin quota files (in Linux quota
* file v2 format) into the new quota global indexes (in IAM format). */
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,7,50,0)
-
/* copied from osd_it_acct_get(), only changed the 'type' to -1 */
static int osd_it_admin_get(const struct lu_env *env, struct dt_it *di,
const struct dt_key *key)
return rc;
}
+/* Nobdy else can access the global index now, it's safe to truncate and
+ * reinitialize it */
static int truncate_quota_index(const struct lu_env *env, struct dt_object *dt,
const struct dt_index_features *feat)
{
struct osd_thandle *oth;
struct inode *inode;
int rc;
+ struct iam_container *bag = &(osd_dt_obj(dt))->oo_dir->od_container;
+ struct lu_buf *lb = &osd_oti_get(env)->oti_buf;
ENTRY;
+ LASSERT(bag->ic_root_bh != NULL);
+ iam_container_fini(bag);
+
+ LASSERT(fid_seq(lu_object_fid(&dt->do_lu)) == FID_SEQ_QUOTA_GLB);
+
OBD_ALLOC_PTR(attr);
if (attr == NULL)
RETURN(-ENOMEM);
inode = osd_dt_obj(dt)->oo_inode;
LASSERT(inode);
- rc = dt_declare_record_write(env, dt, inode->i_sb->s_blocksize * 2, 0, th);
+ /* iam_lfix_create() writes two blocks at the beginning */
+ lb->lb_len = osd_sb(osd)->s_blocksize * 2;
+ rc = dt_declare_record_write(env, dt, lb, 0, th);
if (rc)
GOTO(out, rc);
out:
dt_trans_stop(env, &osd->od_dt_dev, th);
OBD_FREE_PTR(attr);
+
+ if (rc == 0) {
+ rc = iam_container_setup(bag);
+ if (rc != 0)
+ iam_container_fini(bag);
+ }
RETURN(rc);
}
static int set_quota_index_version(const struct lu_env *env,
- struct dt_object *dt)
+ struct dt_object *dt,
+ dt_obj_version_t version)
{
struct osd_device *osd = osd_obj2dev(osd_dt_obj(dt));
struct thandle *th;
GOTO(out, rc);
th->th_sync = 1;
- dt_version_set(env, dt, 1, th);
+ dt_version_set(env, dt, version, th);
out:
dt_trans_stop(env, &osd->od_dt_dev, th);
RETURN(rc);
}
-#define OBJECTS "OBJECTS"
-#define ADMIN_USR "admin_quotafile_v2.usr"
-#define ADMIN_GRP "admin_quotafile_v2.grp"
-
int osd_quota_migration(const struct lu_env *env, struct dt_object *dt,
const struct dt_index_features *feat)
{
struct dt_object *root, *parent = NULL, *admin = NULL;
dt_obj_version_t version;
char *fname;
- bool isblk, converted = false;
+ bool isblk = false, converted = false;
int rc;
ENTRY;
if (rc) {
CERROR("%s: Failed to truncate the quota index "DFID", rc:%d\n",
osd->od_svname, PFID(lu_object_fid(&dt->do_lu)), rc);
- RETURN(rc);
+ GOTO(out, rc);
}
/* set up indexing operations for the admin file */
PFID(lu_object_fid(&dt->do_lu)), rc);
}
- /* bump index version to 1, so the migration will be skipped
- * next time. */
+ /* bump index version to 1 (or 2 if migration happened), so the
+ * migration will be skipped next time. */
if (rc == 0) {
- rc = set_quota_index_version(env , dt);
+ rc = set_quota_index_version(env , dt, converted ? 2 : 1);
if (rc)
CERROR("%s: Failed to set quota index("DFID") "
"version, rc:%d\n", osd->od_svname,
RETURN(rc);
}
-#else
-#warning "remove old quota compatibility code"
-#endif
+#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 53, 0) */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff