X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_quota.c;h=2345501f74a4ada1fb5771994528ec73b17df9dc;hb=e431666d6636ce5ff3637592188fc96bcf695a31;hp=3e7807a2af7fab0849a7af34dcde61872110bafe;hpb=5963af745b3aa14410d5ceb66f8a7b7d6aaf576a;p=fs%2Flustre-release.git

diff --git a/lustre/osd-ldiskfs/osd_quota.c b/lustre/osd-ldiskfs/osd_quota.c
index 3e7807a..2345501 100644
--- a/lustre/osd-ldiskfs/osd_quota.c
+++ b/lustre/osd-ldiskfs/osd_quota.c
@@ -38,14 +38,17 @@
 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;
 }
 
 /**
@@ -65,10 +68,6 @@ int osd_acct_obj_lookup(struct osd_thread_info *info, struct osd_device *osd,
 			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));
@@ -78,7 +77,26 @@ int osd_acct_obj_lookup(struct osd_thread_info *info, struct osd_device *osd,
 		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);
@@ -116,15 +134,17 @@ static int osd_acct_index_lookup(const struct lu_env *env,
 #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);
@@ -221,12 +241,13 @@ static int osd_it_acct_get(const struct lu_env *env, struct dt_it *di,
 	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);
@@ -285,12 +306,14 @@ static int osd_it_acct_next(const struct lu_env *env, struct dt_it *di)
 	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.
 	 */
@@ -483,12 +506,7 @@ void osd_quota_unpack(struct osd_object *obj, const struct dt_rec *rec)
 
 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];
 }
 
 /**
@@ -528,7 +546,7 @@ int osd_declare_qid(const struct lu_env *env, struct osd_thandle *oh,
 
 	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;
 		}
@@ -569,7 +587,7 @@ int osd_declare_qid(const struct lu_env *env, struct osd_thandle *oh,
 		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++;
 	}
 
@@ -592,30 +610,30 @@ int osd_declare_qid(const struct lu_env *env, struct osd_thandle *oh,
  * \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; /* user & group & project rc */
+	int 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))
@@ -637,97 +655,24 @@ int osd_declare_inode_qid(const struct lu_env *env, qid_t uid, qid_t gid,
 	if (force && (rcg == -EDQUOT || rcg == -EINPROGRESS))
 		/* as before, ignore EDQUOT & EINPROGRESS for root */
 		rcg = 0;
+	if (rcg && (rcg != -EDQUOT || flags == NULL))
+		RETURN(rcg);
 
-	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));
-		}
+	/* and now project quota */
+	qi->lqi_id.qid_gid = projid;
+	qi->lqi_type       = PRJQUOTA;
+	rcp = osd_declare_qid(env, oh, qi, obj, true, flags);
 
-		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);
-			dt_object_put(env, admin);
-			GOTO(out, rc = -ENOENT);
-		}
+	if (force && (rcp == -EDQUOT || rcp == -EINPROGRESS))
+		/* as before, ignore EDQUOT & EINPROGRESS for root */
+		rcp = 0;
 
-		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 (rcu)
+		RETURN(rcu);
+	if (rcg)
+		RETURN(rcg);
+	if (rcp)
+		RETURN(rcp);
 
-		dt_object_put(env, admin);
-		GOTO(out, rc = -EINVAL);
-	}
-out:
-	if (parent && !IS_ERR(parent))
-		dt_object_put(env, parent);
-	dt_object_put(env, root);
-	RETURN(rc);
+	RETURN(0);
 }