search for: rm_quota_us

...2/journal.c b/fs/ocfs2/journal.c index 71b2ea4..5434eb4 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c @@ -1209,8 +1209,9 @@ static int __ocfs2_recovery_thread(void *arg) struct ocfs2_super *osb = arg; struct ocfs2_recovery_map *rm = osb->recovery_map; int *rm_quota = NULL; - int rm_quota_used = 0, i; + int rm_quota_used = 0, i, saveslots = 1; struct ocfs2_quota_recovery *qrec; + int slot_arr[OCFS2_MAX_SLOTS]; mlog_entry_void(); @@ -1224,6 +1225,7 @@ static int __ocfs2_recovery_thread(void *arg) status = -ENOMEM; goto bail; } + restart: status = ocfs2_super_lock(osb,...

...- } + osb->local_alloc_copy = NULL; + osb->dirty = 0; + + /* queue recovery for offline slots */ + ocfs2_queue_replay_slots(osb); } void ocfs2_complete_quota_recovery(struct ocfs2_super *osb) @@ -1216,6 +1275,7 @@ static int __ocfs2_recovery_thread(void *arg) int *rm_quota = NULL; int rm_quota_used = 0, i; struct ocfs2_quota_recovery *qrec; + int queued_offline_orphan_dirs = 0; mlog_entry_void(); @@ -1236,6 +1296,20 @@ restart: goto bail; } + if (!queued_offline_orphan_dirs) { + status = ocfs2_compute_replay_slots(osb); + if (status < 0) + mlog_errno(status); + + /* q...

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