lfsck_bookmark_le_to_cpu(bm, &lfsck->li_bookmark_disk);
if (bm->lb_magic != LFSCK_BOOKMARK_MAGIC) {
- CWARN("%s: invalid lfsck_bookmark magic %#x != %#x\n",
- lfsck_lfsck2name(lfsck), bm->lb_magic,
- LFSCK_BOOKMARK_MAGIC);
+ CDEBUG(D_LFSCK, "%s: invalid lfsck_bookmark magic "
+ "%#x != %#x\n", lfsck_lfsck2name(lfsck),
+ bm->lb_magic, LFSCK_BOOKMARK_MAGIC);
/* Process it as new lfsck_bookmark. */
rc = -ENODATA;
}
/* return -ENODATA for empty lfsck_bookmark. */
rc = -ENODATA;
else
- CERROR("%s: fail to load lfsck_bookmark: "
- "expected = %d, rc = %d\n",
+ CDEBUG(D_LFSCK, "%s: fail to load lfsck_bookmark, "
+ "expected = %d: rc = %d\n",
lfsck_lfsck2name(lfsck), len, rc);
}
return rc;
lfsck_bookmark_cpu_to_le(&lfsck->li_bookmark_disk,
&lfsck->li_bookmark_ram);
handle = dt_trans_create(env, lfsck->li_bottom);
- if (IS_ERR(handle)) {
- rc = PTR_ERR(handle);
- CERROR("%s: fail to create trans for storing lfsck_bookmark: "
- "rc = %d\n", lfsck_lfsck2name(lfsck), rc);
- RETURN(rc);
- }
+ if (IS_ERR(handle))
+ GOTO(log, rc = PTR_ERR(handle));
rc = dt_declare_record_write(env, obj,
lfsck_buf_get(env,
&lfsck->li_bookmark_disk, len),
0, handle);
- if (rc != 0) {
- CERROR("%s: fail to declare trans for storing lfsck_bookmark: "
- "rc = %d\n", lfsck_lfsck2name(lfsck), rc);
+ if (rc != 0)
GOTO(out, rc);
- }
rc = dt_trans_start_local(env, lfsck->li_bottom, handle);
- if (rc != 0) {
- CERROR("%s: fail to start trans for storing lfsck_bookmark: "
- "rc = %d\n", lfsck_lfsck2name(lfsck), rc);
+ if (rc != 0)
GOTO(out, rc);
- }
rc = dt_record_write(env, obj,
lfsck_buf_get(env, &lfsck->li_bookmark_disk, len),
&pos, handle);
- if (rc != 0)
- CERROR("%s: fail to store lfsck_bookmark: expected = %d, "
- "rc = %d\n", lfsck_lfsck2name(lfsck), len, rc);
GOTO(out, rc);
out:
dt_trans_stop(env, lfsck->li_bottom, handle);
+
+log:
+ if (rc != 0)
+ CDEBUG(D_LFSCK, "%s: fail to store lfsck_bookmark: rc = %d\n",
+ lfsck_lfsck2name(lfsck), rc);
return rc;
}
dirty = true;
}
+ if (bk->lb_param & LPF_CREATE_MDTOBJ) {
+ bk->lb_param &= ~LPF_CREATE_MDTOBJ;
+ dirty = true;
+ }
+
if (bk->lb_param & LPF_FAILOUT) {
bk->lb_param &= ~LPF_FAILOUT;
dirty = true;
dirty = true;
}
- if (bk->lb_param & LPF_ORPHAN) {
- bk->lb_param &= ~LPF_ORPHAN;
+ if (bk->lb_param & LPF_OST_ORPHAN) {
+ bk->lb_param &= ~LPF_OST_ORPHAN;
dirty = true;
}
}
}
+ if ((start->ls_valid & LSV_CREATE_MDTOBJ) || reset) {
+ if ((bk->lb_param & LPF_CREATE_MDTOBJ) &&
+ !(start->ls_valid & LSV_CREATE_MDTOBJ)) {
+ bk->lb_param &= ~LPF_CREATE_MDTOBJ;
+ dirty = true;
+ } else if (!(bk->lb_param & LPF_CREATE_MDTOBJ) &&
+ (start->ls_flags & LPF_CREATE_MDTOBJ)) {
+ bk->lb_param |= LPF_CREATE_MDTOBJ;
+ dirty = true;
+ }
+ }
+
if ((start->ls_valid & LSV_ERROR_HANDLE) || reset) {
if ((bk->lb_param & LPF_FAILOUT) &&
!(start->ls_valid & LSV_ERROR_HANDLE)) {
}
}
- if ((bk->lb_param & LPF_ORPHAN) &&
- !(start->ls_flags & LPF_ORPHAN)) {
- bk->lb_param &= ~LPF_ORPHAN;
+ if ((bk->lb_param & LPF_OST_ORPHAN) &&
+ !(start->ls_flags & LPF_OST_ORPHAN)) {
+ bk->lb_param &= ~LPF_OST_ORPHAN;
dirty = true;
- } else if (!(bk->lb_param & LPF_ORPHAN) &&
- (start->ls_flags & LPF_ORPHAN)) {
- bk->lb_param |= LPF_ORPHAN;
+ } else if (!(bk->lb_param & LPF_OST_ORPHAN) &&
+ (start->ls_flags & LPF_OST_ORPHAN)) {
+ bk->lb_param |= LPF_OST_ORPHAN;
dirty = true;
}
return rc;
}
-