diff options
Diffstat (limited to 'fs/nilfs2/the_nilfs.h')
-rw-r--r-- | fs/nilfs2/the_nilfs.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/fs/nilfs2/the_nilfs.h b/fs/nilfs2/the_nilfs.h index cae56f338b64..bbbc1c748aac 100644 --- a/fs/nilfs2/the_nilfs.h +++ b/fs/nilfs2/the_nilfs.h | |||
@@ -48,9 +48,7 @@ enum { | |||
48 | * @ns_flags: flags | 48 | * @ns_flags: flags |
49 | * @ns_bdev: block device | 49 | * @ns_bdev: block device |
50 | * @ns_bdi: backing dev info | 50 | * @ns_bdi: backing dev info |
51 | * @ns_writer: back pointer to writable nilfs_sb_info | ||
52 | * @ns_sem: semaphore for shared states | 51 | * @ns_sem: semaphore for shared states |
53 | * @ns_writer_sem: semaphore protecting ns_writer attach/detach | ||
54 | * @ns_sbh: buffer heads of on-disk super blocks | 52 | * @ns_sbh: buffer heads of on-disk super blocks |
55 | * @ns_sbp: pointers to super block data | 53 | * @ns_sbp: pointers to super block data |
56 | * @ns_sbwtime: previous write time of super block | 54 | * @ns_sbwtime: previous write time of super block |
@@ -93,9 +91,7 @@ struct the_nilfs { | |||
93 | 91 | ||
94 | struct block_device *ns_bdev; | 92 | struct block_device *ns_bdev; |
95 | struct backing_dev_info *ns_bdi; | 93 | struct backing_dev_info *ns_bdi; |
96 | struct nilfs_sb_info *ns_writer; | ||
97 | struct rw_semaphore ns_sem; | 94 | struct rw_semaphore ns_sem; |
98 | struct rw_semaphore ns_writer_sem; | ||
99 | 95 | ||
100 | /* | 96 | /* |
101 | * used for | 97 | * used for |
@@ -252,23 +248,6 @@ static inline void nilfs_get_root(struct nilfs_root *root) | |||
252 | atomic_inc(&root->count); | 248 | atomic_inc(&root->count); |
253 | } | 249 | } |
254 | 250 | ||
255 | static inline void | ||
256 | nilfs_attach_writer(struct the_nilfs *nilfs, struct nilfs_sb_info *sbi) | ||
257 | { | ||
258 | down_write(&nilfs->ns_writer_sem); | ||
259 | nilfs->ns_writer = sbi; | ||
260 | up_write(&nilfs->ns_writer_sem); | ||
261 | } | ||
262 | |||
263 | static inline void | ||
264 | nilfs_detach_writer(struct the_nilfs *nilfs, struct nilfs_sb_info *sbi) | ||
265 | { | ||
266 | down_write(&nilfs->ns_writer_sem); | ||
267 | if (sbi == nilfs->ns_writer) | ||
268 | nilfs->ns_writer = NULL; | ||
269 | up_write(&nilfs->ns_writer_sem); | ||
270 | } | ||
271 | |||
272 | static inline int nilfs_valid_fs(struct the_nilfs *nilfs) | 251 | static inline int nilfs_valid_fs(struct the_nilfs *nilfs) |
273 | { | 252 | { |
274 | unsigned valid_fs; | 253 | unsigned valid_fs; |