Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion

[net-next-2.6.git] / fs / nilfs2 / the_nilfs.h

diff --git a/fs/nilfs2/the_nilfs.h b/fs/nilfs2/the_nilfs.h
index cae56f338b648f53005426137eda467233c2d04a..69226e14b7450384a0db42c5d8d7fc5eb5156fb4 100644 (file)
--- a/fs/nilfs2/the_nilfs.h
+++ b/fs/nilfs2/the_nilfs.h
@@ -47,10 +47,7 @@ enum {
  * struct the_nilfs - struct to supervise multiple nilfs mount points
  * @ns_flags: flags
  * @ns_bdev: block device
- * @ns_bdi: backing dev info
- * @ns_writer: back pointer to writable nilfs_sb_info
  * @ns_sem: semaphore for shared states
- * @ns_writer_sem: semaphore protecting ns_writer attach/detach
  * @ns_sbh: buffer heads of on-disk super blocks
  * @ns_sbp: pointers to super block data
  * @ns_sbwtime: previous write time of super block
@@ -92,10 +89,7 @@ struct the_nilfs {
        unsigned long           ns_flags;
 
        struct block_device    *ns_bdev;
-       struct backing_dev_info *ns_bdi;
-       struct nilfs_sb_info   *ns_writer;
        struct rw_semaphore     ns_sem;
-       struct rw_semaphore     ns_writer_sem;
 
        /*
         * used for
@@ -252,23 +246,6 @@ static inline void nilfs_get_root(struct nilfs_root *root)
        atomic_inc(&root->count);
 }
 
-static inline void
-nilfs_attach_writer(struct the_nilfs *nilfs, struct nilfs_sb_info *sbi)
-{
-       down_write(&nilfs->ns_writer_sem);
-       nilfs->ns_writer = sbi;
-       up_write(&nilfs->ns_writer_sem);
-}
-
-static inline void
-nilfs_detach_writer(struct the_nilfs *nilfs, struct nilfs_sb_info *sbi)
-{
-       down_write(&nilfs->ns_writer_sem);
-       if (sbi == nilfs->ns_writer)
-               nilfs->ns_writer = NULL;
-       up_write(&nilfs->ns_writer_sem);
-}
-
 static inline int nilfs_valid_fs(struct the_nilfs *nilfs)
 {
        unsigned valid_fs;