aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nilfs2/the_nilfs.h
diff options
context:
space:
mode:
authorRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>2011-03-08 21:05:08 -0500
committerRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>2011-03-08 21:05:08 -0500
commit3fd3fe5aeaa171a5638d2bb54a1a170eab7b7cdc (patch)
tree3feb95a18e045883b0af27da09be10f5e011776f /fs/nilfs2/the_nilfs.h
parent9b1fc4e4973469dd3fab27ba5d78eca1cd5c13fe (diff)
nilfs2: move log writer onto nilfs object
Log writer is held by the nilfs_sb_info structure. This moves it into nilfs object and replaces all uses of NILFS_SC() accessor. Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Diffstat (limited to 'fs/nilfs2/the_nilfs.h')
-rw-r--r--fs/nilfs2/the_nilfs.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/nilfs2/the_nilfs.h b/fs/nilfs2/the_nilfs.h
index 3ecc968f2123..10521b97ded6 100644
--- a/fs/nilfs2/the_nilfs.h
+++ b/fs/nilfs2/the_nilfs.h
@@ -33,6 +33,8 @@
33#include <linux/slab.h> 33#include <linux/slab.h>
34#include "sb.h" 34#include "sb.h"
35 35
36struct nilfs_sc_info;
37
36/* the_nilfs struct */ 38/* the_nilfs struct */
37enum { 39enum {
38 THE_NILFS_INIT = 0, /* Information from super_block is set */ 40 THE_NILFS_INIT = 0, /* Information from super_block is set */
@@ -65,7 +67,8 @@ enum {
65 * @ns_last_cno: checkpoint number of the latest segment 67 * @ns_last_cno: checkpoint number of the latest segment
66 * @ns_prot_seq: least sequence number of segments which must not be reclaimed 68 * @ns_prot_seq: least sequence number of segments which must not be reclaimed
67 * @ns_prev_seq: base sequence number used to decide if advance log cursor 69 * @ns_prev_seq: base sequence number used to decide if advance log cursor
68 * @ns_segctor_sem: segment constructor semaphore 70 * @ns_writer: log writer
71 * @ns_segctor_sem: semaphore protecting log write
69 * @ns_dat: DAT file inode 72 * @ns_dat: DAT file inode
70 * @ns_cpfile: checkpoint file inode 73 * @ns_cpfile: checkpoint file inode
71 * @ns_sufile: segusage file inode 74 * @ns_sufile: segusage file inode
@@ -140,6 +143,7 @@ struct the_nilfs {
140 u64 ns_prot_seq; 143 u64 ns_prot_seq;
141 u64 ns_prev_seq; 144 u64 ns_prev_seq;
142 145
146 struct nilfs_sc_info *ns_writer;
143 struct rw_semaphore ns_segctor_sem; 147 struct rw_semaphore ns_segctor_sem;
144 148
145 /* 149 /*