Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[deliverable/linux.git] / fs / nilfs2 / mdt.h

diff --git a/fs/nilfs2/mdt.h b/fs/nilfs2/mdt.h
index 54e3b7fd783c68f756a328185c72bee53b08f21a..3f67f3932097b408fd6d7161a90e62170992a71a 100644 (file)
--- a/fs/nilfs2/mdt.h
+++ b/fs/nilfs2/mdt.h
@@ -53,8 +53,8 @@ struct nilfs_shadow_map {
 struct nilfs_mdt_info {
        struct rw_semaphore     mi_sem;
        struct blockgroup_lock *mi_bgl;
-       unsigned                mi_entry_size;
-       unsigned                mi_first_entry_offset;
+       unsigned int            mi_entry_size;
+       unsigned int            mi_first_entry_offset;
        unsigned long           mi_entries_per_block;
        struct nilfs_palloc_cache *mi_palloc_cache;
        struct nilfs_shadow_map *mi_shadow;
@@ -67,6 +67,11 @@ static inline struct nilfs_mdt_info *NILFS_MDT(const struct inode *inode)
        return inode->i_private;
 }
 
+static inline int nilfs_is_metadata_file_inode(const struct inode *inode)
+{
+       return inode->i_private != NULL;
+}
+
 /* Default GFP flags using highmem */
 #define NILFS_MDT_GFP      (__GFP_RECLAIM | __GFP_IO | __GFP_HIGHMEM)
 
@@ -79,11 +84,13 @@ int nilfs_mdt_find_block(struct inode *inode, unsigned long start,
                         struct buffer_head **out_bh);
 int nilfs_mdt_delete_block(struct inode *, unsigned long);
 int nilfs_mdt_forget_block(struct inode *, unsigned long);
-int nilfs_mdt_mark_block_dirty(struct inode *, unsigned long);
 int nilfs_mdt_fetch_dirty(struct inode *);
 
 int nilfs_mdt_init(struct inode *inode, gfp_t gfp_mask, size_t objsz);
-void nilfs_mdt_set_entry_size(struct inode *, unsigned, unsigned);
+void nilfs_mdt_clear(struct inode *inode);
+void nilfs_mdt_destroy(struct inode *inode);
+
+void nilfs_mdt_set_entry_size(struct inode *, unsigned int, unsigned int);
 
 int nilfs_mdt_setup_shadow_map(struct inode *inode,
                               struct nilfs_shadow_map *shadow);