diff options
Diffstat (limited to 'fs/hfs/hfs_fs.h')
-rw-r--r-- | fs/hfs/hfs_fs.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/fs/hfs/hfs_fs.h b/fs/hfs/hfs_fs.h index 1bf967c6bfdc..8275175acf6e 100644 --- a/fs/hfs/hfs_fs.h +++ b/fs/hfs/hfs_fs.h | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/mutex.h> | 14 | #include <linux/mutex.h> |
15 | #include <linux/buffer_head.h> | 15 | #include <linux/buffer_head.h> |
16 | #include <linux/fs.h> | 16 | #include <linux/fs.h> |
17 | #include <linux/workqueue.h> | ||
17 | 18 | ||
18 | #include <asm/byteorder.h> | 19 | #include <asm/byteorder.h> |
19 | #include <asm/uaccess.h> | 20 | #include <asm/uaccess.h> |
@@ -137,16 +138,15 @@ struct hfs_sb_info { | |||
137 | gid_t s_gid; /* The gid of all files */ | 138 | gid_t s_gid; /* The gid of all files */ |
138 | 139 | ||
139 | int session, part; | 140 | int session, part; |
140 | |||
141 | struct nls_table *nls_io, *nls_disk; | 141 | struct nls_table *nls_io, *nls_disk; |
142 | |||
143 | struct mutex bitmap_lock; | 142 | struct mutex bitmap_lock; |
144 | |||
145 | unsigned long flags; | 143 | unsigned long flags; |
146 | |||
147 | u16 blockoffset; | 144 | u16 blockoffset; |
148 | |||
149 | int fs_div; | 145 | int fs_div; |
146 | struct super_block *sb; | ||
147 | int work_queued; /* non-zero delayed work is queued */ | ||
148 | struct delayed_work mdb_work; /* MDB flush delayed work */ | ||
149 | spinlock_t work_lock; /* protects mdb_work and work_queued */ | ||
150 | }; | 150 | }; |
151 | 151 | ||
152 | #define HFS_FLG_BITMAP_DIRTY 0 | 152 | #define HFS_FLG_BITMAP_DIRTY 0 |
@@ -226,6 +226,9 @@ extern int hfs_compare_dentry(const struct dentry *parent, | |||
226 | extern void hfs_asc2mac(struct super_block *, struct hfs_name *, struct qstr *); | 226 | extern void hfs_asc2mac(struct super_block *, struct hfs_name *, struct qstr *); |
227 | extern int hfs_mac2asc(struct super_block *, char *, const struct hfs_name *); | 227 | extern int hfs_mac2asc(struct super_block *, char *, const struct hfs_name *); |
228 | 228 | ||
229 | /* super.c */ | ||
230 | extern void hfs_mark_mdb_dirty(struct super_block *sb); | ||
231 | |||
229 | extern struct timezone sys_tz; | 232 | extern struct timezone sys_tz; |
230 | 233 | ||
231 | /* | 234 | /* |
@@ -253,7 +256,7 @@ static inline const char *hfs_mdb_name(struct super_block *sb) | |||
253 | static inline void hfs_bitmap_dirty(struct super_block *sb) | 256 | static inline void hfs_bitmap_dirty(struct super_block *sb) |
254 | { | 257 | { |
255 | set_bit(HFS_FLG_BITMAP_DIRTY, &HFS_SB(sb)->flags); | 258 | set_bit(HFS_FLG_BITMAP_DIRTY, &HFS_SB(sb)->flags); |
256 | sb->s_dirt = 1; | 259 | hfs_mark_mdb_dirty(sb); |
257 | } | 260 | } |
258 | 261 | ||
259 | #define sb_bread512(sb, sec, data) ({ \ | 262 | #define sb_bread512(sb, sec, data) ({ \ |