| Message ID | 1399782773-20029-4-git-send-email-tytso@mit.edu |
|---|---|
| State | Accepted, archived |
| Headers | show |
Looks good. On Sat, May 10, 2014 at 9:32 PM, Theodore Ts'o <tytso@mit.edu> wrote: > Previously if there was a missing quota entry --- i.e., if there were > files owned by group "eng", but there was no quota record for group > "eng", e2fsck would not notice the missing entry. This means that the > usage informtion would not be properly repaired. This is unfortunate. > Fix this by marking each quota record in quota_dict that has a > corresponding record on disk, and then check to see if there are any > records in quota_dict that have not been marked as having been seen. > In that case, we know we need to update the relevant quota inode. > > Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> > Cc: adityakali@google.com Reviewed-by: Aditya Kali <adityakali@google.com> Thanks! > --- > lib/quota/mkquota.c | 17 ++++++++++++++++- > lib/quota/quotaio.h | 2 ++ > 2 files changed, 18 insertions(+), 1 deletion(-) > > diff --git a/lib/quota/mkquota.c b/lib/quota/mkquota.c > index f77e072..f5ae0e0 100644 > --- a/lib/quota/mkquota.c > +++ b/lib/quota/mkquota.c > @@ -458,6 +458,7 @@ static int scan_dquots_callback(struct dquot *dquot, void *cb_data) > > dq = get_dq(quota_dict, dquot->dq_id); > dq->dq_id = dquot->dq_id; > + dq->dq_flags |= DQF_SEEN; > > print_dquot("mem", dq); > print_dquot("dsk", dquot); > @@ -572,10 +573,13 @@ errcode_t quota_compare_and_update(quota_ctx_t qctx, int qtype, > ext2_filsys fs = qctx->fs; > struct quota_handle qh; > struct scan_dquots_data scan_data; > + struct dquot *dq; > + dnode_t *n; > + dict_t *dict = qctx->quota_dict[qtype]; > ext2_ino_t qf_ino; > errcode_t err = 0; > > - if (!qctx->quota_dict[qtype]) > + if (!dict) > goto out; > > qf_ino = qtype == USRQUOTA ? fs->super->s_usr_quota_inum : > @@ -595,6 +599,17 @@ errcode_t quota_compare_and_update(quota_ctx_t qctx, int qtype, > log_err("Error scanning dquots"); > goto out; > } > + > + for (n = dict_first(dict); n; n = dict_next(dict, n)) { > + dq = dnode_get(n); > + if (!dq) > + continue; > + if ((dq->dq_flags & DQF_SEEN) == 0) { > + fprintf(stderr, "[QUOTA WARNING] " > + "Missing quota entry ID %d\n", dq->dq_id); > + scan_data.usage_is_inconsistent = 1; > + } > + } > *usage_inconsistent = scan_data.usage_is_inconsistent; > > out: > diff --git a/lib/quota/quotaio.h b/lib/quota/quotaio.h > index 1c062f1..55e6eb0 100644 > --- a/lib/quota/quotaio.h > +++ b/lib/quota/quotaio.h > @@ -104,6 +104,8 @@ struct dquot { > struct util_dqblk dq_dqb; /* Parsed data of dquot */ > }; > > +#define DQF_SEEN 0x0001 > + > /* Structure of quotafile operations */ > struct quotafile_ops { > /* Check whether quotafile is in our format */ > -- > 1.9.0 >
diff --git a/lib/quota/mkquota.c b/lib/quota/mkquota.c index f77e072..f5ae0e0 100644 --- a/lib/quota/mkquota.c +++ b/lib/quota/mkquota.c @@ -458,6 +458,7 @@ static int scan_dquots_callback(struct dquot *dquot, void *cb_data) dq = get_dq(quota_dict, dquot->dq_id); dq->dq_id = dquot->dq_id; + dq->dq_flags |= DQF_SEEN; print_dquot("mem", dq); print_dquot("dsk", dquot); @@ -572,10 +573,13 @@ errcode_t quota_compare_and_update(quota_ctx_t qctx, int qtype, ext2_filsys fs = qctx->fs; struct quota_handle qh; struct scan_dquots_data scan_data; + struct dquot *dq; + dnode_t *n; + dict_t *dict = qctx->quota_dict[qtype]; ext2_ino_t qf_ino; errcode_t err = 0; - if (!qctx->quota_dict[qtype]) + if (!dict) goto out; qf_ino = qtype == USRQUOTA ? fs->super->s_usr_quota_inum : @@ -595,6 +599,17 @@ errcode_t quota_compare_and_update(quota_ctx_t qctx, int qtype, log_err("Error scanning dquots"); goto out; } + + for (n = dict_first(dict); n; n = dict_next(dict, n)) { + dq = dnode_get(n); + if (!dq) + continue; + if ((dq->dq_flags & DQF_SEEN) == 0) { + fprintf(stderr, "[QUOTA WARNING] " + "Missing quota entry ID %d\n", dq->dq_id); + scan_data.usage_is_inconsistent = 1; + } + } *usage_inconsistent = scan_data.usage_is_inconsistent; out: diff --git a/lib/quota/quotaio.h b/lib/quota/quotaio.h index 1c062f1..55e6eb0 100644 --- a/lib/quota/quotaio.h +++ b/lib/quota/quotaio.h @@ -104,6 +104,8 @@ struct dquot { struct util_dqblk dq_dqb; /* Parsed data of dquot */ }; +#define DQF_SEEN 0x0001 + /* Structure of quotafile operations */ struct quotafile_ops { /* Check whether quotafile is in our format */
Previously if there was a missing quota entry --- i.e., if there were files owned by group "eng", but there was no quota record for group "eng", e2fsck would not notice the missing entry. This means that the usage informtion would not be properly repaired. This is unfortunate. Fix this by marking each quota record in quota_dict that has a corresponding record on disk, and then check to see if there are any records in quota_dict that have not been marked as having been seen. In that case, we know we need to update the relevant quota inode. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Cc: adityakali@google.com --- lib/quota/mkquota.c | 17 ++++++++++++++++- lib/quota/quotaio.h | 2 ++ 2 files changed, 18 insertions(+), 1 deletion(-)