* GPL HEADER END
*/
/*
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, 2015, Intel Corporation.
* Use is subject to license terms.
*
* Author: Johann Lombardi <johann@whamcloud.com>
* Author: Niu Yawei <niu@whamcloud.com>
*/
-#include <lquota.h>
+#include <lustre_quota.h>
#include "osd_internal.h"
/**
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);
* \param env - is the environment passed by the caller
* \param dtobj - is the accounting object
* \param dtrec - is the record to fill with space usage information
- * \param dtkey - is the id the of the user or group for which we would
+ * \param dtkey - is the id of the user or group for which we would
* like to access disk usage.
- * \param capa - is the capability, not used.
*
* \retval +ve - success : exact match
* \retval -ve - failure
static int osd_acct_index_lookup(const struct lu_env *env,
struct dt_object *dtobj,
struct dt_rec *dtrec,
- const struct dt_key *dtkey,
- struct lustre_capa *capa)
+ const struct dt_key *dtkey)
{
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));
- rc = sb->s_qcop->get_dqblk(sb, obj2type(dtobj), (qid_t) id, dqblk);
+ memset(dqblk, 0, sizeof(*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);
}
#define QUOTA_IT_READ_ERROR(it, rc) \
CERROR("%s: Error while trying to read quota information, " \
"failed with %d\n", \
- it->oiq_obj->oo_dt.do_lu.lo_dev->ld_obd->obd_name, rc); \
+ osd_dev(it->oiq_obj->oo_dt.do_lu.lo_dev)->od_svname, rc); \
/**
* Initialize osd Iterator for given osd index object.
*
* \param dt - osd index object
* \param attr - not used
- * \param capa - BYPASS_CAPA
*/
static struct dt_it *osd_it_acct_init(const struct lu_env *env,
struct dt_object *dt,
- __u32 attr, struct lustre_capa *capa)
+ __u32 attr)
{
- struct osd_thread_info *info = osd_oti_get(env);
struct osd_it_quota *it;
struct lu_object *lo = &dt->do_lu;
struct osd_object *obj = osd_dt_obj(dt);
LASSERT(lu_object_exists(lo));
- if (info == NULL)
+ OBD_ALLOC_PTR(it);
+ if (it == NULL)
RETURN(ERR_PTR(-ENOMEM));
- it = &info->oti_it_quota;
- 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);
}
+
+ OBD_FREE_PTR(it);
+
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);
}
ENTRY;
- rc = osd_acct_index_lookup(env, &it->oiq_obj->oo_dt, dtrec, key,
- BYPASS_CAPA);
+ rc = osd_acct_index_lookup(env, &it->oiq_obj->oo_dt, dtrec, key);
RETURN(rc > 0 ? 0 : rc);
}
* 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 osd_device *dev = osd_dt_dev(oh->ot_super.th_dev);
struct qsd_instance *qsd = dev->od_quota_slave;
- int i, rc;
+ struct inode *inode = NULL;
+ int i, rc = 0, crd;
bool found = false;
ENTRY;
RETURN(-EOVERFLOW);
}
- oh->ot_credits += (allocated || qi->lqi_id.qid_uid == 0) ?
- 1 : LDISKFS_QUOTA_INIT_BLOCKS(osd_sb(dev));
+ if (obj != NULL)
+ inode = obj->oo_inode;
+
+ /* root ID entry should be always present in the quota file */
+ if (qi->lqi_id.qid_uid == 0) {
+ crd = 1;
+ } else {
+ /* used space for this ID could be dropped to zero,
+ * reserve extra credits for removing ID entry from
+ * the quota file */
+ if (qi->lqi_space < 0)
+ crd = LDISKFS_QUOTA_DEL_BLOCKS(osd_sb(dev));
+ /* reserve credits for adding ID entry to the quota
+ * file if the i_dquot isn't initialized yet. */
+ else if (inode == NULL ||
+ inode->i_dquot[qi->lqi_type] == NULL)
+ 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);
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);
}
+
+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;
+
+ /* not newly created global index */
+ version = dt_version_get(env, dt);
+ if (version != 0)
+ RETURN(0);
+
+ /* 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);
+
+ 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);
+}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff