ext4: remove ext4_test_journal function
authorgkostka <kostka.grzegorz@gmail.com>
Sat, 16 Jan 2016 19:31:10 +0000 (20:31 +0100)
committergkostka <kostka.grzegorz@gmail.com>
Sat, 16 Jan 2016 19:40:44 +0000 (20:40 +0100)
This function should not be in standard lwext4 API

lwext4/ext4.c
lwext4/ext4.h

index 9028c3d08d8de541fe3fb96fd8d82aaea3920d1d..d7af585d8180c12957125b7684ef8fc8f522bd93 100644 (file)
@@ -2926,106 +2926,6 @@ void ext4_dir_entry_rewind(ext4_dir *d)
        d->next_off = 0;
 }
 
-#if CONFIG_JOURNALING_ENABLE
-int ext4_test_journal(const char *mount_point)
-{
-       struct ext4_mountpoint *mp = ext4_get_mount(mount_point);
-       if (!mp)
-               return ENOENT;
-
-       int r = ENOTSUP;
-       EXT4_MP_LOCK(mp);
-       ext4_block_cache_write_back(mp->fs.bdev, 1);
-       if (ext4_sb_feature_com(&mp->fs.sb, EXT4_FCOM_HAS_JOURNAL)) {
-               struct jbd_fs *jbd_fs = calloc(1, sizeof(struct jbd_fs));
-               struct jbd_journal *journal;
-               if (!jbd_fs) {
-                        r = ENOMEM;
-                        goto Finish;
-               }
-               journal = calloc(1, sizeof(struct jbd_journal));
-               if (!journal) {
-                       free(jbd_fs);
-                       r = ENOMEM;
-                       goto Finish;
-               }
-
-               r = jbd_get_fs(&mp->fs, jbd_fs);
-               if (r != EOK) {
-                       free(jbd_fs);
-                       goto Finish;
-               }
-               r = jbd_journal_start(jbd_fs, journal);
-               if (r != EOK) {
-                       jbd_put_fs(jbd_fs);
-                       free(journal);
-                       free(jbd_fs);
-                       goto Finish;
-               }
-
-               int i;
-               for (i = 0;i < 50;i++) {
-                       ext4_fsblk_t rand_block = rand() % 4096;
-                       if (!rand_block)
-                               rand_block = 1;
-                       struct ext4_block block;
-                       r = ext4_block_get(mp->fs.bdev, &block, rand_block);
-                       if (r != EOK)
-                               goto out;
-
-                       struct jbd_trans *t = jbd_journal_new_trans(journal);
-                       if (!t) {
-                               ext4_block_set(mp->fs.bdev, &block);
-                               r = ENOMEM;
-                               goto out;
-                       }
-
-                       switch (rand() % 2) {
-                       case 0:
-                               r = jbd_trans_get_access(journal, t, &block);
-                               if (r != EOK) {
-                                       jbd_journal_free_trans(journal, t,
-                                                              true);
-                                       ext4_block_set(mp->fs.bdev, &block);
-                                       r = ENOMEM;
-                                       goto out;
-                               }
-                               r = jbd_trans_set_block_dirty(t, &block);
-                               if (r != EOK) {
-                                       jbd_journal_free_trans(journal, t,
-                                                              true);
-                                       ext4_block_set(mp->fs.bdev, &block);
-                                       r = ENOMEM;
-                                       goto out;
-                               }
-                               break;
-                       case 1:
-                               r = jbd_trans_try_revoke_block(t, rand_block);
-                               if (r != EOK) {
-                                       jbd_journal_free_trans(journal, t,
-                                                              true);
-                                       ext4_block_set(mp->fs.bdev, &block);
-                                       r = ENOMEM;
-                                       goto out;
-                               }
-                       }
-                       ext4_block_set(mp->fs.bdev, &block);
-                       jbd_journal_submit_trans(journal, t);
-                       jbd_journal_commit_one(journal);
-               }
-out:
-               jbd_journal_stop(journal);
-               jbd_put_fs(jbd_fs);
-               free(journal);
-               free(jbd_fs);
-       }
-
-Finish:
-       ext4_block_cache_write_back(mp->fs.bdev, 0);
-       EXT4_MP_UNLOCK(mp);
-       return r;
-}
-#endif
 /**
  * @}
  */
index 4971c922384c5abfb2847729b48a0c2aed57584c..ed106d79c5b6b0c3501d594321316f191f44c664 100644 (file)
@@ -498,14 +498,6 @@ const ext4_direntry *ext4_dir_entry_next(ext4_dir *d);
  * @param   d directory handle*/
 void ext4_dir_entry_rewind(ext4_dir *d);
 
-/**@brief   Test journal functionality
- * @param   mount_point mount point, for example
- *          -   /
- *          -   /my_partition/
- *          -   /my_second_partition/
- *
- * @return standard error code */
-int ext4_test_journal(const char *mount_point);
 
 #ifdef __cplusplus
 }