git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dm table: remove unused dm_get_device range parameters
[safe/jmp/linux-2.6]
/
include
/
linux
/
jbd2.h
diff --git
a/include/linux/jbd2.h
b/include/linux/jbd2.h
index
cc02393
..
638ce45
100644
(file)
--- a/
include/linux/jbd2.h
+++ b/
include/linux/jbd2.h
@@
-464,9
+464,9
@@
struct handle_s
*/
struct transaction_chp_stats_s {
unsigned long cs_chp_time;
*/
struct transaction_chp_stats_s {
unsigned long cs_chp_time;
-
unsigned long
cs_forced_to_close;
-
unsigned long
cs_written;
-
unsigned long
cs_dropped;
+
__u32
cs_forced_to_close;
+
__u32
cs_written;
+
__u32
cs_dropped;
};
/* The transaction_t type is the guts of the journaling mechanism. It
};
/* The transaction_t type is the guts of the journaling mechanism. It
@@
-652,7
+652,8
@@
struct transaction_s
* This transaction is being forced and some process is
* waiting for it to finish.
*/
* This transaction is being forced and some process is
* waiting for it to finish.
*/
- int t_synchronous_commit:1;
+ unsigned int t_synchronous_commit:1;
+ unsigned int t_flushed_data_blocks:1;
/*
* For use by the filesystem to store fs-specific data
/*
* For use by the filesystem to store fs-specific data
@@
-668,23
+669,16
@@
struct transaction_run_stats_s {
unsigned long rs_flushing;
unsigned long rs_logging;
unsigned long rs_flushing;
unsigned long rs_logging;
-
unsigned long
rs_handle_count;
-
unsigned long
rs_blocks;
-
unsigned long
rs_blocks_logged;
+
__u32
rs_handle_count;
+
__u32
rs_blocks;
+
__u32
rs_blocks_logged;
};
struct transaction_stats_s {
};
struct transaction_stats_s {
- int ts_type;
unsigned long ts_tid;
unsigned long ts_tid;
- union {
- struct transaction_run_stats_s run;
- struct transaction_chp_stats_s chp;
- } u;
+ struct transaction_run_stats_s run;
};
};
-#define JBD2_STATS_RUN 1
-#define JBD2_STATS_CHECKPOINT 2
-
static inline unsigned long
jbd2_time_diff(unsigned long start, unsigned long end)
{
static inline unsigned long
jbd2_time_diff(unsigned long start, unsigned long end)
{
@@
-988,12
+982,6
@@
struct journal_s
/*
* Journal statistics
*/
/*
* Journal statistics
*/
- struct transaction_stats_s *j_history;
- int j_history_max;
- int j_history_cur;
- /*
- * Protect the transactions statistics history
- */
spinlock_t j_history_lock;
struct proc_dir_entry *j_proc_entry;
struct transaction_stats_s j_stats;
spinlock_t j_history_lock;
struct proc_dir_entry *j_proc_entry;
struct transaction_stats_s j_stats;
@@
-1315,6
+1303,12
@@
extern int jbd_blocks_per_page(struct inode *inode);
#define BUFFER_TRACE2(bh, bh2, info) do {} while (0)
#define JBUFFER_TRACE(jh, info) do {} while (0)
#define BUFFER_TRACE2(bh, bh2, info) do {} while (0)
#define JBUFFER_TRACE(jh, info) do {} while (0)
+/*
+ * jbd2_dev_to_name is a utility function used by the jbd2 and ext4
+ * tracing infrastructure to map a dev_t to a device name.
+ */
+extern const char *jbd2_dev_to_name(dev_t device);
+
#endif /* __KERNEL__ */
#endif /* _LINUX_JBD2_H */
#endif /* __KERNEL__ */
#endif /* _LINUX_JBD2_H */