search for: ocfs2_queue_recovery_completion

...journal.c index 57d7d25..1bcbf5e 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c @@ -65,6 +65,11 @@ static int ocfs2_trylock_journal(struct ocfs2_super *osb, static int ocfs2_recover_orphans(struct ocfs2_super *osb, int slot); static int ocfs2_commit_thread(void *arg); +static void ocfs2_queue_recovery_completion(struct ocfs2_journal *journal, + int slot_num, + struct ocfs2_dinode *la_dinode, + struct ocfs2_dinode *tl_dinode, + struct ocfs2_quota_recovery *qrec); static inline int ocfs2_wait_on_mount(struct ocfs2_super *osb) { @@ -77,6 +82,62 @@ static inline int ocfs2_wa...

The following patch is a backport of patch that recovers orphans from offline slots. It is being backported from mainline to 1.4 mainline patch: 0001-Patch-to-recover-orphans-in-offline-slots-during-rec.patch Thanks, --Srini

...journal.c index 57d7d25..cb1ec7f 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c @@ -65,6 +65,11 @@ static int ocfs2_trylock_journal(struct ocfs2_super *osb, static int ocfs2_recover_orphans(struct ocfs2_super *osb, int slot); static int ocfs2_commit_thread(void *arg); +static void ocfs2_queue_recovery_completion(struct ocfs2_journal *journal, + int slot_num, + struct ocfs2_dinode *la_dinode, + struct ocfs2_dinode *tl_dinode, + struct ocfs2_quota_recovery *qrec); static inline int ocfs2_wait_on_mount(struct ocfs2_super *osb) { @@ -77,6 +82,96 @@ static inline int ocfs2_wa...

...journal.c index 57d7d25..cb1ec7f 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c @@ -65,6 +65,11 @@ static int ocfs2_trylock_journal(struct ocfs2_super *osb, static int ocfs2_recover_orphans(struct ocfs2_super *osb, int slot); static int ocfs2_commit_thread(void *arg); +static void ocfs2_queue_recovery_completion(struct ocfs2_journal *journal, + int slot_num, + struct ocfs2_dinode *la_dinode, + struct ocfs2_dinode *tl_dinode, + struct ocfs2_quota_recovery *qrec); static inline int ocfs2_wait_on_mount(struct ocfs2_super *osb) { @@ -77,6 +82,96 @@ static inline int ocfs2_wa...

This patch is against ocfs2-1.4 and also applies to ocfs2-1.2. ocfs2 mainline requires only the first portion of the patch and hence will make a separate patch for that.

...ays run recovery on our own orphan dir - the dead - * node(s) may have disallowd a previos inode delete. Re-processing + /* We always run recovery on our own and offline orphan slots - the dead + * node(s) may have disallowed a previous inode delete. Re-processing * is therefore required. */ - ocfs2_queue_recovery_completion(osb->journal, osb->slot_num, NULL, - NULL, NULL); + for (i = 0; i < osb->slot_info->si_num_slots; i++) + if ((!slot_arr[i]) || osb->slot_num == i) + ocfs2_queue_recovery_completion(osb->journal, i, + NULL, NULL, NULL); bail: mutex_lock(&osb->recovery_lo...

...ad, or a timer. I don't see why a timer doesn't work. When the timer fires, you do this: 1. Take EX on a new orphan_scan lock. 2. check the LVB for the last scan time. If it's less than the scan timeout, reset the timer for (timeout - last scan), drop the EX, and exit. 3. Call ocfs2_queue_recovery_completion() for all slots with NULL, NULL, NULL on the non-orphan-dir arguments. This sets up the orphan recovery. 4. Update the LVB with the current scan time. 5. Drop the EX to an NL. 6. Reset the timer for the scan timeout. Points about this scheme: - Doesn't need a process. - Don't need...

...a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c @@ -1181,19 +1181,14 @@ void ocfs2_complete_mount_recovery(struct ocfs2_super *osb) { struct ocfs2_journal *journal = osb->journal; - if (osb->dirty) { - /* No need to queue up our truncate_log as regular - * cleanup will catch that. */ - ocfs2_queue_recovery_completion(journal, - osb->slot_num, - osb->local_alloc_copy, - NULL, - NULL); - ocfs2_schedule_truncate_log_flush(osb, 0); - - osb->local_alloc_copy = NULL; - osb->dirty = 0; - } + /* No need to queue up our truncate_log as regular cleanup will + * catch that. */ + ocfs2_q...

Resending after implementing review comments.

Next two patches are backport of orphan scan timer patches to ocfs2-1.4

Resending after implementing review comments.

Resending after adding another patch to display delayed orphan scan statistics.

...;ip_lock); out: - if (new_emi) - kfree(new_emi); + kfree(new_emi); } static int ocfs2_last_eb_is_empty(struct inode *inode, diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index 57d7d25..195af61 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c @@ -1150,11 +1150,9 @@ static void ocfs2_queue_recovery_completion(struct ocfs2_journal *journal, /* Though we wish to avoid it, we are in fact safe in * skipping local alloc cleanup as fsck.ocfs2 is more * than capable of reclaiming unused space. */ - if (la_dinode) - kfree(la_dinode); + kfree(la_dinode); - if (tl_dinode) - kfree(tl_dinode); +...

...< 0) { + if (status != -EAGAIN) + mlog_errno(status); + goto out; + } + + ocfs2_get_meta_lvb_mtime(&scan_time, &ds->ds_lockres); + if (ds->ds_time.tv_sec != scan_time.tv_sec) { + ds->ds_time = scan_time; + goto unlock; + } + + for (i = 0; i < osb->max_slots; i++) + ocfs2_queue_recovery_completion(osb->journal, i, NULL, NULL, + NULL); + + now = CURRENT_TIME; + ocfs2_stuff_meta_lvb_mtime(&now, &ds->ds_lockres); +unlock: + ocfs2_orphan_scan_unlock(osb, level); +out: + return; +} + +/* Queue timer to recover orphans after ORPHAN_SCAN_SCHEDULE_TIMEOUT */ +void ocfs2_delayed_or...

Please review the list of patches being applied to the ocfs2 1.4 tree. All patches list the mainline commit hash. Thanks Sunil

All, Please review the patches backported to 1.4 from mainline. Sunil

Hi, The following patches comprise the bulk of Ocfs2 updates for the 2.6.30 merge window. Aside from larger, more involved fixes, we're adding the following features, which I will describe in the order their patches are mailed. Sunil's exported some more state to our debugfs files, and consolidated some other aspects of our debugfs infrastructure. This will further aid us in debugging

Hi, This is the second batch of Ocfs2 patches intended for the merge window. The 1st batch were sent out previously: http://lkml.org/lkml/2008/12/19/280 The bulk of this set is comprised of Jan Kara's patches to add quota support to Ocfs2. Many of the quota patches are to generic code, which I carried to make merging of the Ocfs2 support easier. All of the non-ocfs2 patches should have