static inline int fid2type(const struct lu_fid *fid)
{
LASSERT(fid_is_acct(fid));
- if (fid_oid(fid) == ACCT_GROUP_OID)
+ switch (fid_oid(fid)) {
+ case ACCT_USER_OID:
+ return USRQUOTA;
+ case ACCT_GROUP_OID:
return GRPQUOTA;
- return USRQUOTA;
-}
+ case ACCT_PROJECT_OID:
+ return PRJQUOTA;
+ }
-static inline int obj2type(struct dt_object *obj)
-{
- return fid2type(lu_object_fid(&obj->do_lu));
+ LASSERTF(0, "invalid fid for quota type: %u", fid_oid(fid));
+ return USRQUOTA;
}
/**
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 = qf_inums[fid2type(fid)];
+ switch (fid2type(fid)) {
+ case USRQUOTA:
+ id->oii_ino =
+ le32_to_cpu(LDISKFS_SB(sb)->s_es->s_usr_quota_inum);
+ break;
+ case GRPQUOTA:
+ id->oii_ino =
+ le32_to_cpu(LDISKFS_SB(sb)->s_es->s_grp_quota_inum);
+ break;
+ case PRJQUOTA:
+ #ifdef HAVE_PROJECT_QUOTA
+ if (LDISKFS_HAS_RO_COMPAT_FEATURE(sb,
+ LDISKFS_FEATURE_RO_COMPAT_PROJECT))
+ id->oii_ino =
+ le32_to_cpu(LDISKFS_SB(sb)->s_es->s_prj_quota_inum);
+ else
+ #endif
+ RETURN(-ENOENT);
+ break;
+ }
if (!ldiskfs_valid_inum(sb, id->oii_ino))
RETURN(-ENOENT);
RETURN(0);
const struct dt_key *dtkey)
{
struct osd_thread_info *info = osd_oti_get(env);
-#ifdef HAVE_DQUOT_FS_DISK_QUOTA
+#if defined(HAVE_DQUOT_QC_DQBLK)
+ struct qc_dqblk *dqblk = &info->oti_qdq;
+#elif defined(HAVE_DQUOT_FS_DISK_QUOTA)
struct fs_disk_quota *dqblk = &info->oti_fdq;
#else
struct if_dqblk *dqblk = &info->oti_dqblk;
#ifdef HAVE_DQUOT_KQID
struct kqid qid;
#endif
+ int type;
ENTRY;
+ type = fid2type(lu_object_fid(&dtobj->do_lu));
memset(dqblk, 0, sizeof(*dqblk));
#ifdef HAVE_DQUOT_KQID
- qid = make_kqid(&init_user_ns, obj2type(dtobj), id);
+ qid = make_kqid(&init_user_ns, type, id);
rc = sb->s_qcop->get_dqblk(sb, qid, dqblk);
#else
- rc = sb->s_qcop->get_dqblk(sb, obj2type(dtobj), (qid_t)id, dqblk);
+ rc = sb->s_qcop->get_dqblk(sb, type, (qid_t) id, dqblk);
#endif
if (rc)
RETURN(rc);
-#ifdef HAVE_DQUOT_FS_DISK_QUOTA
+#if defined(HAVE_DQUOT_QC_DQBLK)
+ rec->bspace = dqblk->d_space;
+ rec->ispace = dqblk->d_ino_count;
+#elif defined(HAVE_DQUOT_FS_DISK_QUOTA)
rec->bspace = dqblk->d_bcount;
rec->ispace = dqblk->d_icount;
#else
struct osd_quota_leaf *leaf, *tmp;
ENTRY;
- lu_object_put(env, &it->oiq_obj->oo_dt.do_lu);
+ osd_object_put(env, it->oiq_obj);
list_for_each_entry_safe(leaf, tmp, &it->oiq_list, oql_link) {
list_del_init(&leaf->oql_link);
struct osd_it_quota *it = (struct osd_it_quota *)di;
const struct lu_fid *fid =
lu_object_fid(&it->oiq_obj->oo_dt.do_lu);
- int type = fid2type(fid);
+ int type;
qid_t dqid = *(qid_t *)key;
loff_t offset;
int rc;
ENTRY;
+ type = fid2type(fid);
offset = find_tree_dqentry(env, it->oiq_obj, type, dqid,
LUSTRE_DQTREEOFF, 0, it);
struct osd_it_quota *it = (struct osd_it_quota *)di;
const struct lu_fid *fid =
lu_object_fid(&it->oiq_obj->oo_dt.do_lu);
- int type = fid2type(fid);
+ int type;
int depth, rc;
uint index;
ENTRY;
+ type = fid2type(fid);
+
/* Let's first check if there are any remaining valid entry in the
* current leaf block. Start with the next entry after the current one.
*/
static inline int osd_qid_type(struct osd_thandle *oh, int i)
{
- return (oh->ot_id_type & (1 << i)) ? GRPQUOTA : USRQUOTA;
-}
-
-static inline void osd_qid_set_type(struct osd_thandle *oh, int i, int type)
-{
- oh->ot_id_type |= ((type == GRPQUOTA) ? (1 << i) : 0);
+ return oh->ot_id_types[i];
}
/**
struct lquota_id_info *qi, struct osd_object *obj,
bool enforce, int *flags)
{
- struct osd_device *dev = osd_dt_dev(oh->ot_super.th_dev);
- struct qsd_instance *qsd = dev->od_quota_slave;
+ struct osd_device *dev;
+ struct qsd_instance *qsd;
struct inode *inode = NULL;
int i, rc = 0, crd;
bool found = false;
LASSERTF(oh->ot_id_cnt <= OSD_MAX_UGID_CNT, "count=%d\n",
oh->ot_id_cnt);
+ dev = osd_dt_dev(oh->ot_super.th_dev);
+ LASSERT(dev != NULL);
+
+ qsd = dev->od_quota_slave;
+
for (i = 0; i < oh->ot_id_cnt; i++) {
if (oh->ot_id_array[i] == qi->lqi_id.qid_uid &&
- osd_qid_type(oh, i) == qi->lqi_type) {
+ oh->ot_id_types[i] == qi->lqi_type) {
found = true;
break;
}
/* reserve credits for adding ID entry to the quota
* file if the i_dquot isn't initialized yet. */
else if (inode == NULL ||
+#ifdef HAVE_EXT4_INFO_DQUOT
+ LDISKFS_I(inode)->i_dquot[qi->lqi_type] == NULL)
+#else
inode->i_dquot[qi->lqi_type] == NULL)
+#endif
crd = LDISKFS_QUOTA_INIT_BLOCKS(osd_sb(dev));
else
crd = 1;
osd_trans_declare_op(env, oh, OSD_OT_QUOTA, crd);
oh->ot_id_array[i] = qi->lqi_id.qid_uid;
- osd_qid_set_type(oh, i, qi->lqi_type);
+ oh->ot_id_types[i] = qi->lqi_type;
oh->ot_id_cnt++;
}
* \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 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
- * can't failed with EDQUOT
+ * \param osd_qid_flags - indicate this is a inode/block accounting
+ * and whether changes are performed by root user
*
* \retval 0 - success
* \retval -ve - failure
*/
int osd_declare_inode_qid(const struct lu_env *env, qid_t uid, qid_t gid,
- long long space, struct osd_thandle *oh,
- struct osd_object *obj, bool is_blk, int *flags,
- bool force)
+ __u32 projid, long long space, struct osd_thandle *oh,
+ struct osd_object *obj, int *flags,
+ enum osd_qid_declare_flags osd_qid_declare_flags)
{
struct osd_thread_info *info = osd_oti_get(env);
struct lquota_id_info *qi = &info->oti_qi;
- int rcu, rcg; /* user & group rc */
+ int rcu, rcg, rcp = 0; /* user & group & project rc */
+ bool force = !!(osd_qid_declare_flags & OSD_QID_FORCE);
ENTRY;
/* let's start with user quota */
qi->lqi_id.qid_uid = uid;
qi->lqi_type = USRQUOTA;
qi->lqi_space = space;
- qi->lqi_is_blk = is_blk;
+ qi->lqi_is_blk = !!(osd_qid_declare_flags & OSD_QID_BLK);
rcu = osd_declare_qid(env, oh, qi, obj, true, flags);
if (force && (rcu == -EDQUOT || rcu == -EINPROGRESS))
/* as before, ignore EDQUOT & EINPROGRESS for root */
rcg = 0;
- RETURN(rcu ? rcu : rcg);
-}
-
-int osd_quota_migration(const struct lu_env *env, struct dt_object *dt)
-{
- struct osd_thread_info *oti = osd_oti_get(env);
- struct osd_device *osd = osd_obj2dev(osd_dt_obj(dt));
- struct dt_object *root, *parent = NULL, *admin = NULL;
- dt_obj_version_t version;
- char *fname, *fnames[] = {ADMIN_USR, ADMIN_GRP};
- int rc, i;
- ENTRY;
+#ifdef HAVE_PROJECT_QUOTA
+ if (rcg && (rcg != -EDQUOT || flags == NULL))
+ RETURN(rcg);
- /* not newly created global index */
- version = dt_version_get(env, dt);
- if (version != 0)
- RETURN(0);
+ /* and now project quota */
+ qi->lqi_id.qid_projid = projid;
+ qi->lqi_type = PRJQUOTA;
+ rcp = osd_declare_qid(env, oh, qi, obj, true, flags);
- /* locate root */
- rc = dt_root_get(env, &osd->od_dt_dev, &oti->oti_fid);
- if (rc) {
- CERROR("%s: Can't get root FID, rc:%d\n", osd->od_svname, rc);
- RETURN(rc);
- }
-
- root = dt_locate(env, &osd->od_dt_dev, &oti->oti_fid);
- if (IS_ERR(root)) {
- CERROR("%s: Failed to locate root "DFID", rc:%ld\n",
- osd->od_svname, PFID(&oti->oti_fid), PTR_ERR(root));
- RETURN(PTR_ERR(root));
- }
-
- /* locate /OBJECTS */
- rc = dt_lookup_dir(env, root, OBJECTS, &oti->oti_fid);
- if (rc == -ENOENT) {
- GOTO(out, rc = 0);
- } else if (rc) {
- CERROR("%s: Failed to lookup %s, rc:%d\n",
- osd->od_svname, OBJECTS, rc);
- GOTO(out, rc);
- }
-
- parent = dt_locate(env, &osd->od_dt_dev, &oti->oti_fid);
- if (IS_ERR(parent)) {
- CERROR("%s: Failed to locate %s "DFID", rc:%ld\n",
- osd->od_svname, OBJECTS, PFID(&oti->oti_fid),
- PTR_ERR(parent));
- GOTO(out, rc = PTR_ERR(parent));
- }
-
- /* locate quota admin files */
- for (i = 0; i < 2; i++) {
- fname = fnames[i];
- rc = dt_lookup_dir(env, parent, fname, &oti->oti_fid);
- if (rc == -ENOENT) {
- rc = 0;
- continue;
- } else if (rc) {
- CERROR("%s: Failed to lookup %s, rc:%d\n",
- osd->od_svname, fname, rc);
- GOTO(out, rc);
- }
-
- admin = dt_locate(env, &osd->od_dt_dev, &oti->oti_fid);
- if (IS_ERR(admin)) {
- CERROR("%s: Failed to locate %s "DFID", rc:%d\n",
- osd->od_svname, fname, PFID(&oti->oti_fid), rc);
- GOTO(out, rc = PTR_ERR(admin));
- }
-
- if (!dt_object_exists(admin)) {
- CERROR("%s: Old admin file %s doesn't exist, but is "
- "still referenced in parent directory.\n",
- osd->od_svname, fname);
- lu_object_put(env, &admin->do_lu);
- GOTO(out, rc = -ENOENT);
- }
-
- LCONSOLE_WARN("%s: Detected old quota admin file(%s)! If you "
- "want to keep the old quota limits settings, "
- "please upgrade to lower version(2.5) first to "
- "convert them into new format.\n",
- osd->od_svname, fname);
+ if (force && (rcp == -EDQUOT || rcp == -EINPROGRESS))
+ /* as before, ignore EDQUOT & EINPROGRESS for root */
+ rcp = 0;
+#endif
- lu_object_put(env, &admin->do_lu);
- GOTO(out, rc = -EINVAL);
- }
-out:
- if (parent && !IS_ERR(parent))
- lu_object_put(env, &parent->do_lu);
- lu_object_put(env, &root->do_lu);
- RETURN(rc);
+ RETURN(rcu ? rcu : (rcg ? rcg : rcp));
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff