← Back to branch summary

~daniel-mehrmann/e2fsprogs/master

« back to all changes in this revision

Viewing changes to lib/ext2fs/alloc_tables.c

  • Committer: Daniel Mehrmann
  • Date: 2014-12-16 09:16:59 UTC
  • mfrom: (1.2.25)
  • Revision ID: daniel.mehrmann@gmx.de-20141216091659-ymhbl4ualba43vuc
Tags: 1.43-SN-2014-12-16-0ubuntu1
* Merge in snapshot from the maint branch 

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/ext2fs/alloc_tables.c
241
241
        dgrp_t          i;
242
242
        struct ext2fs_numeric_progress_struct progress;
243
243
 
244
 
        ext2fs_numeric_progress_init(fs, &progress, NULL,
245
 
                                     fs->group_desc_count);
 
244
        if (fs->progress_ops && fs->progress_ops->init)
 
245
                (fs->progress_ops->init)(fs, &progress, NULL,
 
246
                                         fs->group_desc_count);
246
247
 
247
248
        for (i = 0; i < fs->group_desc_count; i++) {
248
 
                ext2fs_numeric_progress_update(fs, &progress, i);
 
249
                if (fs->progress_ops && fs->progress_ops->update)
 
250
                        (fs->progress_ops->update)(fs, &progress, i);
249
251
                retval = ext2fs_allocate_group_table(fs, i, fs->block_map);
250
252
                if (retval)
251
253
                        return retval;
252
254
        }
253
 
        ext2fs_numeric_progress_close(fs, &progress, NULL);
 
255
        if (fs->progress_ops && fs->progress_ops->close)
 
256
                (fs->progress_ops->close)(fs, &progress, NULL);
254
257
        return 0;
255
258
}
256
259