const struct lu_fid *fid,
const struct osd_inode_id *id,
int ops, bool force,
- enum oi_check_flags flags)
+ enum oi_check_flags flags, bool *exist)
{
handle_t *th;
int rc;
rc = PTR_ERR(th);
CDEBUG(D_LFSCK, "%s: fail to start trans for scrub op %d "
DFID" => %u/%u: rc = %d\n", osd_name(dev), ops,
- PFID(fid), id->oii_ino, id->oii_gen, rc);
+ PFID(fid), id ? id->oii_ino : -1, id ? id->oii_gen : -1,
+ rc);
RETURN(rc);
}
}
break;
case DTO_INDEX_INSERT:
- rc = osd_oi_insert(info, dev, fid, id, th, flags);
+ rc = osd_oi_insert(info, dev, fid, id, th, flags, exist);
if (unlikely(rc == -EEXIST)) {
rc = 1;
/* XXX: There are trouble things when adding OI
struct osd_inconsistent_item *oii = NULL;
struct inode *inode = NULL;
int ops = DTO_INDEX_UPDATE;
- int idx;
int rc;
bool converted = false;
+ bool exist = false;
ENTRY;
down_write(&scrub->os_rwsem);
GOTO(out, rc);
}
+ /* The inode has been reused as EA inode, ignore it. */
+ if (unlikely(osd_is_ea_inode(inode)))
+ GOTO(out, rc = 0);
+
sf->sf_flags |= SF_UPGRADE;
sf->sf_internal_flags &= ~SIF_NO_HANDLE_OLD_FID;
dev->od_check_ff = 1;
rc = 0;
GOTO(out, rc);
}
+
+ /* The inode has been reused as EA inode, ignore it. */
+ if (unlikely(osd_is_ea_inode(inode)))
+ GOTO(out, rc = 0);
}
if (!scrub->os_partial_scan)
scrub->os_full_speed = 1;
- idx = osd_oi_fid2idx(dev, fid);
switch (val) {
case SCRUB_NEXT_NOLMA:
sf->sf_flags |= SF_UPGRADE;
case SCRUB_NEXT_OSTOBJ_OLD:
break;
default:
- sf->sf_flags |= SF_RECREATED;
- if (unlikely(!ldiskfs_test_bit(idx, sf->sf_oi_bitmap)))
- ldiskfs_set_bit(idx, sf->sf_oi_bitmap);
break;
}
} else if (osd_id_eq(lid, lid2)) {
rc = osd_scrub_refresh_mapping(info, dev, fid, lid, ops, false,
(val == SCRUB_NEXT_OSTOBJ ||
- val == SCRUB_NEXT_OSTOBJ_OLD) ? OI_KNOWN_ON_OST : 0);
+ val == SCRUB_NEXT_OSTOBJ_OLD) ? OI_KNOWN_ON_OST : 0,
+ &exist);
if (rc == 0) {
if (scrub->os_in_prior)
sf->sf_items_updated_prior++;
else
sf->sf_items_updated++;
+
+ if (ops == DTO_INDEX_INSERT && val == 0 && !exist) {
+ int idx = osd_oi_fid2idx(dev, fid);
+
+ sf->sf_flags |= SF_RECREATED;
+ if (unlikely(!ldiskfs_test_bit(idx, sf->sf_oi_bitmap)))
+ ldiskfs_set_bit(idx, sf->sf_oi_bitmap);
+ }
}
GOTO(out, rc);
DTO_INDEX_DELETE, false,
(val == SCRUB_NEXT_OSTOBJ ||
val == SCRUB_NEXT_OSTOBJ_OLD) ?
- OI_KNOWN_ON_OST : 0);
+ OI_KNOWN_ON_OST : 0, NULL);
up_write(&scrub->os_rwsem);
if (inode != NULL && !IS_ERR(inode))
iput(inode);
if (oii != NULL) {
- LASSERT(list_empty(&oii->oii_list));
+ spin_lock(&scrub->os_lock);
+ if (likely(!list_empty(&oii->oii_list)))
+ list_del(&oii->oii_list);
+ spin_unlock(&scrub->os_lock);
OBD_FREE_PTR(oii);
}
RETURN(rc);
}
+ /* It is an EA inode, no OI mapping for it, skip it. */
+ if (osd_is_ea_inode(inode))
+ GOTO(put, rc = SCRUB_NEXT_CONTINUE);
+
if (scrub &&
ldiskfs_test_inode_state(inode, LDISKFS_STATE_LUSTRE_NOSCRUB)) {
/* Only skip it for the first OI scrub accessing. */
oii = list_entry(scrub->os_inconsistent_items.next,
struct osd_inconsistent_item, oii_list);
- list_del_init(&oii->oii_list);
spin_unlock(&scrub->os_lock);
*oic = &oii->oii_cache;
sf->sf_status = SS_SCANNING;
}
- if (flags & SS_AUTO_FULL) {
- sf->sf_flags |= SF_AUTO;
- scrub->os_full_speed = 1;
- }
-
if (sf->sf_flags & (SF_RECREATED | SF_INCONSISTENT | SF_UPGRADE))
scrub->os_full_speed = 1;
else
scrub->os_full_speed = 0;
+ if (flags & SS_AUTO_FULL) {
+ sf->sf_flags |= SF_AUTO;
+ scrub->os_full_speed = 1;
+ }
+
scrub->os_new_checked = 0;
if (sf->sf_pos_last_checkpoint != 0)
sf->sf_pos_latest_start = sf->sf_pos_last_checkpoint + 1;
*count < max) {
if (param.offset +
ldiskfs_itable_unused_count(param.sb, desc) >
- LDISKFS_INODES_PER_GROUP(param.sb))
+ LDISKFS_INODES_PER_GROUP(param.sb)) {
+ *pos = 1 + (param.bg + 1) *
+ LDISKFS_INODES_PER_GROUP(param.sb);
goto next_group;
+ }
rc = next(info, dev, ¶m, &oic, noslot);
switch (rc) {
typedef int (*scandir_t)(struct osd_thread_info *, struct osd_device *,
struct dentry *, filldir_t filldir);
+#ifdef HAVE_FILLDIR_USE_CTX
+static int osd_ios_varfid_fill(struct dir_context *buf, const char *name,
+ int namelen, loff_t offset, __u64 ino,
+ unsigned d_type);
+static int osd_ios_lf_fill(struct dir_context *buf, const char *name,
+ int namelen, loff_t offset, __u64 ino,
+ unsigned d_type);
+static int osd_ios_dl_fill(struct dir_context *buf, const char *name,
+ int namelen, loff_t offset, __u64 ino,
+ unsigned d_type);
+static int osd_ios_uld_fill(struct dir_context *buf, const char *name,
+ int namelen, loff_t offset, __u64 ino,
+ unsigned d_type);
+#else
static int osd_ios_varfid_fill(void *buf, const char *name, int namelen,
loff_t offset, __u64 ino, unsigned d_type);
static int osd_ios_lf_fill(void *buf, const char *name, int namelen,
loff_t offset, __u64 ino, unsigned d_type);
static int osd_ios_uld_fill(void *buf, const char *name, int namelen,
loff_t offset, __u64 ino, unsigned d_type);
+#endif
static int
osd_ios_general_scan(struct osd_thread_info *info, struct osd_device *dev,
RETURN(rc);
rc = osd_scrub_refresh_mapping(info, dev, &tfid, id,
- DTO_INDEX_INSERT, true, 0);
+ DTO_INDEX_INSERT, true, 0, NULL);
if (rc > 0)
rc = 0;
}
rc = osd_scrub_refresh_mapping(info, dev, &tfid, id,
- DTO_INDEX_UPDATE, true, 0);
+ DTO_INDEX_UPDATE, true, 0, NULL);
if (rc > 0)
rc = 0;
* It scans the /lost+found, and for the OST-object (with filter_fid
* or filter_fid_old), move them back to its proper /O/<seq>/d<x>.
*/
-static int osd_ios_lf_fill(void *buf, const char *name, int namelen,
+#ifdef HAVE_FILLDIR_USE_CTX
+static int osd_ios_lf_fill(struct dir_context *buf,
+#else
+static int osd_ios_lf_fill(void *buf,
+#endif
+ const char *name, int namelen,
loff_t offset, __u64 ino, unsigned d_type)
{
- struct osd_ios_filldir_buf *fill_buf = buf;
+ struct osd_ios_filldir_buf *fill_buf =
+ (struct osd_ios_filldir_buf *)buf;
struct osd_thread_info *info = fill_buf->oifb_info;
struct osd_device *dev = fill_buf->oifb_dev;
struct lu_fid *fid = &info->oti_fid;
return 0;
}
-static int osd_ios_varfid_fill(void *buf, const char *name, int namelen,
+#ifdef HAVE_FILLDIR_USE_CTX
+static int osd_ios_varfid_fill(struct dir_context *buf,
+#else
+static int osd_ios_varfid_fill(void *buf,
+#endif
+ const char *name, int namelen,
loff_t offset, __u64 ino, unsigned d_type)
{
- struct osd_ios_filldir_buf *fill_buf = buf;
+ struct osd_ios_filldir_buf *fill_buf =
+ (struct osd_ios_filldir_buf *)buf;
struct osd_device *dev = fill_buf->oifb_dev;
struct dentry *child;
int rc;
RETURN(rc);
}
-static int osd_ios_dl_fill(void *buf, const char *name, int namelen,
+#ifdef HAVE_FILLDIR_USE_CTX
+static int osd_ios_dl_fill(struct dir_context *buf,
+#else
+static int osd_ios_dl_fill(void *buf,
+#endif
+ const char *name, int namelen,
loff_t offset, __u64 ino, unsigned d_type)
{
- struct osd_ios_filldir_buf *fill_buf = buf;
+ struct osd_ios_filldir_buf *fill_buf =
+ (struct osd_ios_filldir_buf *)buf;
struct osd_device *dev = fill_buf->oifb_dev;
const struct osd_lf_map *map;
struct dentry *child;
RETURN(rc);
}
-static int osd_ios_uld_fill(void *buf, const char *name, int namelen,
+#ifdef HAVE_FILLDIR_USE_CTX
+static int osd_ios_uld_fill(struct dir_context *buf,
+#else
+static int osd_ios_uld_fill(void *buf,
+#endif
+ const char *name, int namelen,
loff_t offset, __u64 ino, unsigned d_type)
{
- struct osd_ios_filldir_buf *fill_buf = buf;
+ struct osd_ios_filldir_buf *fill_buf =
+ (struct osd_ios_filldir_buf *)buf;
struct dentry *child;
struct lu_fid tfid;
int rc = 0;
RETURN(rc);
}
-static int osd_ios_root_fill(void *buf, const char *name, int namelen,
+#ifdef HAVE_FILLDIR_USE_CTX
+static int osd_ios_root_fill(struct dir_context *buf,
+#else
+static int osd_ios_root_fill(void *buf,
+#endif
+ const char *name, int namelen,
loff_t offset, __u64 ino, unsigned d_type)
{
- struct osd_ios_filldir_buf *fill_buf = buf;
+ struct osd_ios_filldir_buf *fill_buf =
+ (struct osd_ios_filldir_buf *)buf;
struct osd_device *dev = fill_buf->oifb_dev;
const struct osd_lf_map *map;
struct dentry *child;
else if (PTR_ERR(child) == -ENOENT)
osd_scrub_refresh_mapping(info, dev, &map->olm_fid,
NULL, DTO_INDEX_DELETE,
- true, 0);
+ true, 0, NULL);
map++;
}
again:
if (thread_is_running(thread)) {
spin_unlock(&scrub->os_lock);
- if (!(scrub->os_file.sf_flags & SF_AUTO) ||
- (flags & (SS_AUTO_FULL | SS_AUTO_PARTIAL)))
+ if (!(scrub->os_file.sf_flags & SF_AUTO ||
+ scrub->os_partial_scan) ||
+ (flags & SS_AUTO_PARTIAL))
RETURN(-EALREADY);
osd_scrub_join(dev, flags, false);
struct file *filp;
struct inode *inode;
struct lu_fid *fid = &info->oti_fid;
- int dirty = 0;
+ bool dirty = false;
+ bool restored = false;
int rc = 0;
ENTRY;
RETURN(PTR_ERR(filp));
}
- inode = filp->f_path.dentry->d_inode;
+ inode = file_inode(filp);
/* 'What the @fid is' is not imporatant, because the object
* has no OI mapping, and only is visible inside the OSD.*/
lu_igif_build(fid, inode->i_ino, inode->i_generation);
* have their FID mapping in OI files already. */
if (dev->od_maybe_new)
sf->sf_internal_flags = SIF_NO_HANDLE_OLD_FID;
- dirty = 1;
+ dirty = true;
} else if (rc != 0) {
GOTO(cleanup_inode, rc);
} else {
old_uuid->uuid, new_uuid->uuid);
}
osd_scrub_file_reset(scrub, es->s_uuid,SF_INCONSISTENT);
- dirty = 1;
+ dirty = true;
+ restored = true;
if (old_uuid != NULL)
OBD_FREE_PTR(old_uuid);
if (new_uuid != NULL)
OBD_FREE_PTR(new_uuid);
} else if (sf->sf_status == SS_SCANNING) {
sf->sf_status = SS_CRASHED;
- dirty = 1;
+ dirty = true;
}
}
else
scrub->os_pos_current = LDISKFS_FIRST_INO(sb) + 1;
- if (dirty != 0) {
+ if (dirty) {
rc = osd_scrub_file_store(scrub);
if (rc != 0)
GOTO(cleanup_inode, rc);
}
/* Initialize OI files. */
- rc = osd_oi_init(info, dev);
+ rc = osd_oi_init(info, dev, restored);
if (rc < 0)
GOTO(cleanup_inode, rc);
if (it->ooi_user_ready)
RETURN(-EPERM);
+ LASSERT(!scrub->os_partial_scan);
+
if (hash > OSD_OTABLE_MAX_HASH)
hash = OSD_OTABLE_MAX_HASH;
NULL
};
-static int scrub_bits_dump(struct seq_file *m, int bits, const char *names[],
- const char *prefix)
+static void scrub_bits_dump(struct seq_file *m, int bits, const char *names[],
+ const char *prefix)
{
int flag;
- int rc;
int i;
- rc = seq_printf(m, "%s:%c", prefix, bits != 0 ? ' ' : '\n');
- if (rc < 0)
- return rc;
+ seq_printf(m, "%s:%c", prefix, bits != 0 ? ' ' : '\n');
for (i = 0, flag = 1; bits != 0; i++, flag = 1 << i) {
if (flag & bits) {
bits &= ~flag;
- rc = seq_printf(m, "%s%c", names[i],
- bits != 0 ? ',' : '\n');
- if (rc < 0)
- return rc;
+ seq_printf(m, "%s%c", names[i],
+ bits != 0 ? ',' : '\n');
}
}
- return 0;
}
-static int scrub_time_dump(struct seq_file *m, __u64 time, const char *prefix)
+static void scrub_time_dump(struct seq_file *m, __u64 time, const char *prefix)
{
- int rc;
-
if (time != 0)
- rc = seq_printf(m, "%s: "LPU64" seconds\n", prefix,
- cfs_time_current_sec() - time);
+ seq_printf(m, "%s: "LPU64" seconds\n", prefix,
+ cfs_time_current_sec() - time);
else
- rc = seq_printf(m, "%s: N/A\n", prefix);
- return rc;
+ seq_printf(m, "%s: N/A\n", prefix);
}
-static int scrub_pos_dump(struct seq_file *m, __u64 pos, const char *prefix)
+static void scrub_pos_dump(struct seq_file *m, __u64 pos, const char *prefix)
{
- int rc;
-
if (pos != 0)
- rc = seq_printf(m, "%s: "LPU64"\n", prefix, pos);
+ seq_printf(m, "%s: "LPU64"\n", prefix, pos);
else
- rc = seq_printf(m, "%s: N/A\n", prefix);
- return rc;
+ seq_printf(m, "%s: N/A\n", prefix);
}
int osd_scrub_dump(struct seq_file *m, struct osd_device *dev)
struct scrub_file *sf = &scrub->os_file;
__u64 checked;
__u64 speed;
- int rc;
down_read(&scrub->os_rwsem);
- rc = seq_printf(m, "name: OI_scrub\n"
- "magic: 0x%x\n"
- "oi_files: %d\n"
- "status: %s\n",
- sf->sf_magic, (int)sf->sf_oi_count,
- scrub_status_names[sf->sf_status]);
- if (rc < 0)
- goto out;
+ seq_printf(m, "name: OI_scrub\n"
+ "magic: 0x%x\n"
+ "oi_files: %d\n"
+ "status: %s\n",
+ sf->sf_magic, (int)sf->sf_oi_count,
+ scrub_status_names[sf->sf_status]);
- rc = scrub_bits_dump(m, sf->sf_flags, scrub_flags_names,
- "flags");
- if (rc < 0)
- goto out;
+ scrub_bits_dump(m, sf->sf_flags, scrub_flags_names, "flags");
- rc = scrub_bits_dump(m, sf->sf_param, scrub_param_names,
- "param");
- if (rc < 0)
- goto out;
+ scrub_bits_dump(m, sf->sf_param, scrub_param_names, "param");
- rc = scrub_time_dump(m, sf->sf_time_last_complete,
- "time_since_last_completed");
- if (rc < 0)
- goto out;
+ scrub_time_dump(m, sf->sf_time_last_complete,
+ "time_since_last_completed");
- rc = scrub_time_dump(m, sf->sf_time_latest_start,
- "time_since_latest_start");
- if (rc < 0)
- goto out;
+ scrub_time_dump(m, sf->sf_time_latest_start,
+ "time_since_latest_start");
- rc = scrub_time_dump(m, sf->sf_time_last_checkpoint,
- "time_since_last_checkpoint");
- if (rc < 0)
- goto out;
+ scrub_time_dump(m, sf->sf_time_last_checkpoint,
+ "time_since_last_checkpoint");
- rc = scrub_pos_dump(m, sf->sf_pos_latest_start,
- "latest_start_position");
- if (rc < 0)
- goto out;
+ scrub_pos_dump(m, sf->sf_pos_latest_start,
+ "latest_start_position");
- rc = scrub_pos_dump(m, sf->sf_pos_last_checkpoint,
- "last_checkpoint_position");
- if (rc < 0)
- goto out;
+ scrub_pos_dump(m, sf->sf_pos_last_checkpoint,
+ "last_checkpoint_position");
- rc = scrub_pos_dump(m, sf->sf_pos_first_inconsistent,
- "first_failure_position");
- if (rc < 0)
- goto out;
+ scrub_pos_dump(m, sf->sf_pos_first_inconsistent,
+ "first_failure_position");
checked = sf->sf_items_checked + scrub->os_new_checked;
- rc = seq_printf(m, "checked: "LPU64"\n"
- "updated: "LPU64"\n"
- "failed: "LPU64"\n"
- "prior_updated: "LPU64"\n"
- "noscrub: "LPU64"\n"
- "igif: "LPU64"\n"
- "success_count: %u\n",
- checked, sf->sf_items_updated, sf->sf_items_failed,
- sf->sf_items_updated_prior, sf->sf_items_noscrub,
- sf->sf_items_igif, sf->sf_success_count);
- if (rc < 0)
- goto out;
+ seq_printf(m, "checked: "LPU64"\n"
+ "updated: "LPU64"\n"
+ "failed: "LPU64"\n"
+ "prior_updated: "LPU64"\n"
+ "noscrub: "LPU64"\n"
+ "igif: "LPU64"\n"
+ "success_count: %u\n",
+ checked, sf->sf_items_updated, sf->sf_items_failed,
+ sf->sf_items_updated_prior, sf->sf_items_noscrub,
+ sf->sf_items_igif, sf->sf_success_count);
speed = checked;
if (thread_is_running(&scrub->os_thread)) {
do_div(new_checked, duration);
if (rtime != 0)
do_div(speed, rtime);
- rc = seq_printf(m, "run_time: %u seconds\n"
- "average_speed: "LPU64" objects/sec\n"
- "real-time_speed: "LPU64" objects/sec\n"
- "current_position: %u\n"
- "lf_scanned: "LPU64"\n"
- "lf_repaired: "LPU64"\n"
- "lf_failed: "LPU64"\n",
- rtime, speed, new_checked, scrub->os_pos_current,
- scrub->os_lf_scanned, scrub->os_lf_repaired,
- scrub->os_lf_failed);
+ seq_printf(m, "run_time: %u seconds\n"
+ "average_speed: "LPU64" objects/sec\n"
+ "real-time_speed: "LPU64" objects/sec\n"
+ "current_position: %u\n"
+ "lf_scanned: "LPU64"\n"
+ "lf_repaired: "LPU64"\n"
+ "lf_failed: "LPU64"\n",
+ rtime, speed, new_checked, scrub->os_pos_current,
+ scrub->os_lf_scanned, scrub->os_lf_repaired,
+ scrub->os_lf_failed);
} else {
if (sf->sf_run_time != 0)
do_div(speed, sf->sf_run_time);
- rc = seq_printf(m, "run_time: %u seconds\n"
- "average_speed: "LPU64" objects/sec\n"
- "real-time_speed: N/A\n"
- "current_position: N/A\n"
- "lf_scanned: "LPU64"\n"
- "lf_repaired: "LPU64"\n"
- "lf_failed: "LPU64"\n",
- sf->sf_run_time, speed, scrub->os_lf_scanned,
- scrub->os_lf_repaired, scrub->os_lf_failed);
+ seq_printf(m, "run_time: %u seconds\n"
+ "average_speed: "LPU64" objects/sec\n"
+ "real-time_speed: N/A\n"
+ "current_position: N/A\n"
+ "lf_scanned: "LPU64"\n"
+ "lf_repaired: "LPU64"\n"
+ "lf_failed: "LPU64"\n",
+ sf->sf_run_time, speed, scrub->os_lf_scanned,
+ scrub->os_lf_repaired, scrub->os_lf_failed);
}
-out:
up_read(&scrub->os_rwsem);
- return (rc < 0 ? -ENOSPC : 0);
+ return 0;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff