mirror of
https://github.com/bobranten/Ext4Fsd.git
synced 2025-10-30 05:18:31 -05:00
removed DbgPrints used during development
This commit is contained in:
@@ -24,15 +24,15 @@
|
|||||||
|
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
//#include <linux/blkdev.h>
|
//#include <linux/blkdev.h>
|
||||||
#include <linux/magic.h>
|
//#include <linux/magic.h>
|
||||||
#include <linux/jbd2.h>
|
#include <linux/jbd2.h>
|
||||||
//#include <linux/quota.h>
|
//#include <linux/quota.h>
|
||||||
//#include <linux/rwsem.h>
|
//#include <linux/rwsem.h>
|
||||||
#include <linux/rbtree.h>
|
#include <linux/rbtree.h>
|
||||||
//#include <linux/seqlock.h>
|
//#include <linux/seqlock.h>
|
||||||
#include <linux/mutex.h>
|
//#include <linux/mutex.h>
|
||||||
#include <linux/timer.h>
|
//#include <linux/timer.h>
|
||||||
#include <linux/version.h>
|
//#include <linux/version.h>
|
||||||
//#include <linux/wait.h>
|
//#include <linux/wait.h>
|
||||||
//#include <linux/sched/signal.h>
|
//#include <linux/sched/signal.h>
|
||||||
//#include <linux/blockgroup_lock.h>
|
//#include <linux/blockgroup_lock.h>
|
||||||
|
|||||||
@@ -24,15 +24,15 @@
|
|||||||
#else
|
#else
|
||||||
|
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/buffer_head.h>
|
//#include <linux/buffer_head.h>
|
||||||
#include <linux/journal-head.h>
|
#include <linux/journal-head.h>
|
||||||
#include <linux/stddef.h>
|
#include <linux/stddef.h>
|
||||||
#include <linux/bit_spinlock.h>
|
#include <linux/bit_spinlock.h>
|
||||||
#include <linux/mutex.h>
|
//#include <linux/mutex.h>
|
||||||
#include <linux/timer.h>
|
//#include <linux/timer.h>
|
||||||
#include <linux/lockdep.h>
|
//#include <linux/lockdep.h>
|
||||||
|
|
||||||
#include <asm/semaphore.h>
|
//#include <asm/semaphore.h>
|
||||||
|
|
||||||
#define journal_oom_retry 1
|
#define journal_oom_retry 1
|
||||||
|
|
||||||
|
|||||||
@@ -23,12 +23,12 @@
|
|||||||
#else
|
#else
|
||||||
|
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/buffer_head.h>
|
//#include <linux/buffer_head.h>
|
||||||
#include <linux/journal-head.h>
|
#include <linux/journal-head.h>
|
||||||
#include <linux/stddef.h>
|
#include <linux/stddef.h>
|
||||||
#include <linux/mutex.h>
|
//#include <linux/mutex.h>
|
||||||
#include <linux/timer.h>
|
//#include <linux/timer.h>
|
||||||
#include <linux/slab.h>
|
//#include <linux/slab.h>
|
||||||
#include <linux/bit_spinlock.h>
|
#include <linux/bit_spinlock.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
3308
Ext4Fsd/jbd/replay.c
3308
Ext4Fsd/jbd/replay.c
File diff suppressed because it is too large
Load Diff
1412
Ext4Fsd/jbd/revoke.c
1412
Ext4Fsd/jbd/revoke.c
File diff suppressed because it is too large
Load Diff
@@ -20,18 +20,18 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/time.h>
|
//#include <linux/time.h>
|
||||||
#include <linux/fs.h>
|
#include <linux/fs.h>
|
||||||
#include <linux/jbd2.h>
|
#include <linux/jbd2.h>
|
||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
#include <linux/slab.h>
|
//#include <linux/slab.h>
|
||||||
#include <linux/init.h>
|
//#include <linux/init.h>
|
||||||
#include <linux/mm.h>
|
//#include <linux/mm.h>
|
||||||
#include <linux/freezer.h>
|
//#include <linux/freezer.h>
|
||||||
#include <linux/pagemap.h>
|
//#include <linux/pagemap.h>
|
||||||
#include <linux/kthread.h>
|
//#include <linux/kthread.h>
|
||||||
#include <linux/poison.h>
|
//#include <linux/poison.h>
|
||||||
#include <linux/proc_fs.h>
|
//#include <linux/proc_fs.h>
|
||||||
//#include <linux/seq_file.h>
|
//#include <linux/seq_file.h>
|
||||||
//#include <linux/math64.h>
|
//#include <linux/math64.h>
|
||||||
//#include <linux/hash.h>
|
//#include <linux/hash.h>
|
||||||
@@ -1259,7 +1259,7 @@ journal_t *jbd2_journal_init_inode(struct inode *inode)
|
|||||||
char *p;
|
char *p;
|
||||||
unsigned long long blocknr;
|
unsigned long long blocknr;
|
||||||
|
|
||||||
DbgPrint("jbd2_journal_init_inode: begin\n");
|
//DbgPrint("jbd2_journal_init_inode: begin\n");
|
||||||
blocknr = bmap(inode, 0);
|
blocknr = bmap(inode, 0);
|
||||||
if (!blocknr) {
|
if (!blocknr) {
|
||||||
/*pr_err("%s: Cannot locate journal superblock\n",
|
/*pr_err("%s: Cannot locate journal superblock\n",
|
||||||
@@ -1282,7 +1282,7 @@ journal_t *jbd2_journal_init_inode(struct inode *inode)
|
|||||||
p = strreplace(journal->j_devname, '/', '!');
|
p = strreplace(journal->j_devname, '/', '!');
|
||||||
sprintf(p, "-%lu", journal->j_inode->i_ino);*/
|
sprintf(p, "-%lu", journal->j_inode->i_ino);*/
|
||||||
jbd2_stats_proc_init(journal);
|
jbd2_stats_proc_init(journal);
|
||||||
DbgPrint("jbd2_journal_init_inode: end\n");
|
//DbgPrint("jbd2_journal_init_inode: end\n");
|
||||||
|
|
||||||
return journal;
|
return journal;
|
||||||
}
|
}
|
||||||
@@ -1461,7 +1461,7 @@ static void jbd2_mark_journal_empty(journal_t *journal, int write_op)
|
|||||||
{
|
{
|
||||||
journal_superblock_t *sb = journal->j_superblock;
|
journal_superblock_t *sb = journal->j_superblock;
|
||||||
|
|
||||||
DbgPrint("jbd2_mark_journal_empty: begin\n");
|
//DbgPrint("jbd2_mark_journal_empty: begin\n");
|
||||||
|
|
||||||
//BUG_ON(!mutex_is_locked(&journal->j_checkpoint_mutex));
|
//BUG_ON(!mutex_is_locked(&journal->j_checkpoint_mutex));
|
||||||
//read_lock(&journal->j_state_lock);
|
//read_lock(&journal->j_state_lock);
|
||||||
@@ -1483,7 +1483,7 @@ static void jbd2_mark_journal_empty(journal_t *journal, int write_op)
|
|||||||
//write_lock(&journal->j_state_lock);
|
//write_lock(&journal->j_state_lock);
|
||||||
journal->j_flags |= JBD2_FLUSHED;
|
journal->j_flags |= JBD2_FLUSHED;
|
||||||
//write_unlock(&journal->j_state_lock);
|
//write_unlock(&journal->j_state_lock);
|
||||||
DbgPrint("jbd2_mark_journal_empty: end\n");
|
//DbgPrint("jbd2_mark_journal_empty: end\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1665,7 +1665,7 @@ int jbd2_journal_load(journal_t *journal)
|
|||||||
int err;
|
int err;
|
||||||
journal_superblock_t *sb;
|
journal_superblock_t *sb;
|
||||||
|
|
||||||
DbgPrint("jbd2_journal_load: begin\n");
|
//DbgPrint("jbd2_journal_load: begin\n");
|
||||||
err = load_superblock(journal);
|
err = load_superblock(journal);
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
@@ -1712,7 +1712,7 @@ int jbd2_journal_load(journal_t *journal)
|
|||||||
|
|
||||||
journal->j_flags &= ~JBD2_ABORT;
|
journal->j_flags &= ~JBD2_ABORT;
|
||||||
journal->j_flags |= JBD2_LOADED;
|
journal->j_flags |= JBD2_LOADED;
|
||||||
DbgPrint("jbd2_journal_load: end\n");
|
//DbgPrint("jbd2_journal_load: end\n");
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
recovery_error:
|
recovery_error:
|
||||||
@@ -1731,7 +1731,7 @@ recovery_error:
|
|||||||
int jbd2_journal_destroy(journal_t *journal)
|
int jbd2_journal_destroy(journal_t *journal)
|
||||||
{
|
{
|
||||||
int err = 0;
|
int err = 0;
|
||||||
DbgPrint("jbd2_journal_destroy: begin\n");
|
//DbgPrint("jbd2_journal_destroy: begin\n");
|
||||||
#if 0
|
#if 0
|
||||||
/* Wait for the commit thread to wake up and die. */
|
/* Wait for the commit thread to wake up and die. */
|
||||||
journal_kill_thread(journal);
|
journal_kill_thread(journal);
|
||||||
@@ -1795,7 +1795,7 @@ int jbd2_journal_destroy(journal_t *journal)
|
|||||||
crypto_free_shash(journal->j_chksum_driver);*/
|
crypto_free_shash(journal->j_chksum_driver);*/
|
||||||
kfree(journal->j_wbuf);
|
kfree(journal->j_wbuf);
|
||||||
kfree(journal);
|
kfree(journal);
|
||||||
DbgPrint("jbd2_journal_destroy: end\n");
|
//DbgPrint("jbd2_journal_destroy: end\n");
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
@@ -2069,7 +2069,7 @@ int jbd2_journal_wipe(journal_t *journal, int write)
|
|||||||
{
|
{
|
||||||
int err = 0;
|
int err = 0;
|
||||||
|
|
||||||
DbgPrint("jbd2_journal_wipe: begin\n");
|
//DbgPrint("jbd2_journal_wipe: begin\n");
|
||||||
|
|
||||||
J_ASSERT (!(journal->j_flags & JBD2_LOADED));
|
J_ASSERT (!(journal->j_flags & JBD2_LOADED));
|
||||||
|
|
||||||
@@ -2078,7 +2078,7 @@ int jbd2_journal_wipe(journal_t *journal, int write)
|
|||||||
return err;
|
return err;
|
||||||
|
|
||||||
if (!journal->j_tail) {
|
if (!journal->j_tail) {
|
||||||
DbgPrint("jbd2_journal_wipe: journal is clean\n");
|
//DbgPrint("jbd2_journal_wipe: journal is clean\n");
|
||||||
goto no_recovery;
|
goto no_recovery;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2094,7 +2094,7 @@ int jbd2_journal_wipe(journal_t *journal, int write)
|
|||||||
}
|
}
|
||||||
|
|
||||||
no_recovery:
|
no_recovery:
|
||||||
DbgPrint("jbd2_journal_wipe end:\n");
|
//DbgPrint("jbd2_journal_wipe end:\n");
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2722,7 +2722,7 @@ static int __init journal_init(void)
|
|||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
DbgPrint("journal_init: begin\n");
|
//DbgPrint("journal_init: begin\n");
|
||||||
|
|
||||||
/*BUILD_BUG_ON(sizeof(struct journal_superblock_s) != 1024);*/
|
/*BUILD_BUG_ON(sizeof(struct journal_superblock_s) != 1024);*/
|
||||||
|
|
||||||
@@ -2732,7 +2732,7 @@ static int __init journal_init(void)
|
|||||||
} else {
|
} else {
|
||||||
jbd2_journal_destroy_caches();
|
jbd2_journal_destroy_caches();
|
||||||
}
|
}
|
||||||
DbgPrint("journal_init: end\n");
|
//DbgPrint("journal_init: end\n");
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2743,10 +2743,10 @@ static void __exit journal_exit(void)
|
|||||||
if (n)
|
if (n)
|
||||||
printk(KERN_ERR "JBD2: leaked %d journal_heads!\n", n);
|
printk(KERN_ERR "JBD2: leaked %d journal_heads!\n", n);
|
||||||
#endif
|
#endif
|
||||||
DbgPrint("journal_exit: begin\n");
|
//DbgPrint("journal_exit: begin\n");
|
||||||
jbd2_remove_jbd_stats_proc_entry();
|
jbd2_remove_jbd_stats_proc_entry();
|
||||||
jbd2_journal_destroy_caches();
|
jbd2_journal_destroy_caches();
|
||||||
DbgPrint("journal_exit: end\n");
|
//DbgPrint("journal_exit: end\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
#ifndef __KERNEL__
|
#ifndef __KERNEL__
|
||||||
#include "jfs_user.h"
|
#include "jfs_user.h"
|
||||||
#else
|
#else
|
||||||
#include <linux/time.h>
|
//#include <linux/time.h>
|
||||||
#include <linux/fs.h>
|
#include <linux/fs.h>
|
||||||
#include <linux/jbd2.h>
|
#include <linux/jbd2.h>
|
||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
@@ -311,7 +311,7 @@ int jbd2_journal_skip_recovery(journal_t *journal)
|
|||||||
|
|
||||||
struct recovery_info info;
|
struct recovery_info info;
|
||||||
|
|
||||||
DbgPrint("jbd2_journal_skip_recovery: begin\n");
|
//DbgPrint("jbd2_journal_skip_recovery: begin\n");
|
||||||
|
|
||||||
memset (&info, 0, sizeof(info));
|
memset (&info, 0, sizeof(info));
|
||||||
|
|
||||||
@@ -332,7 +332,7 @@ int jbd2_journal_skip_recovery(journal_t *journal)
|
|||||||
}
|
}
|
||||||
|
|
||||||
journal->j_tail = 0;
|
journal->j_tail = 0;
|
||||||
DbgPrint("jbd2_journal_skip_recovery: end\n");
|
//DbgPrint("jbd2_journal_skip_recovery: end\n");
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -80,13 +80,13 @@
|
|||||||
#ifndef __KERNEL__
|
#ifndef __KERNEL__
|
||||||
#include "jfs_user.h"
|
#include "jfs_user.h"
|
||||||
#else
|
#else
|
||||||
#include <linux/time.h>
|
//#include <linux/time.h>
|
||||||
#include <linux/fs.h>
|
#include <linux/fs.h>
|
||||||
#include <linux/jbd2.h>
|
#include <linux/jbd2.h>
|
||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
#include <linux/slab.h>
|
//#include <linux/slab.h>
|
||||||
#include <linux/list.h>
|
#include <linux/list.h>
|
||||||
#include <linux/init.h>
|
//#include <linux/init.h>
|
||||||
//#include <linux/bio.h>
|
//#include <linux/bio.h>
|
||||||
#include <linux/log2.h>
|
#include <linux/log2.h>
|
||||||
//#include <linux/hash.h>
|
//#include <linux/hash.h>
|
||||||
|
|||||||
@@ -14,14 +14,14 @@
|
|||||||
* filesystem).
|
* filesystem).
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/time.h>
|
//#include <linux/time.h>
|
||||||
#include <linux/fs.h>
|
#include <linux/fs.h>
|
||||||
#include <linux/jbd2.h>
|
#include <linux/jbd2.h>
|
||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
#include <linux/slab.h>
|
//#include <linux/slab.h>
|
||||||
#include <linux/timer.h>
|
//#include <linux/timer.h>
|
||||||
#include <linux/mm.h>
|
//#include <linux/mm.h>
|
||||||
#include <linux/highmem.h>
|
//#include <linux/highmem.h>
|
||||||
//#include <linux/hrtimer.h>
|
//#include <linux/hrtimer.h>
|
||||||
//#include <linux/backing-dev.h>
|
//#include <linux/backing-dev.h>
|
||||||
//#include <linux/bug.h>
|
//#include <linux/bug.h>
|
||||||
|
|||||||
Reference in New Issue
Block a user