1 // SPDX-License-Identifier: GPL-2.0-only 1 // SPDX-License-Identifier: GPL-2.0-only
2 /* 2 /*
3 * linux/fs/hpfs/super.c 3 * linux/fs/hpfs/super.c
4 * 4 *
5 * Mikulas Patocka (mikulas@artax.karlin.mff. 5 * Mikulas Patocka (mikulas@artax.karlin.mff.cuni.cz), 1998-1999
6 * 6 *
7 * mounting, unmounting, error handling 7 * mounting, unmounting, error handling
8 */ 8 */
9 9
10 #include "hpfs_fn.h" 10 #include "hpfs_fn.h"
11 #include <linux/module.h> 11 #include <linux/module.h>
12 #include <linux/parser.h> 12 #include <linux/parser.h>
13 #include <linux/init.h> 13 #include <linux/init.h>
14 #include <linux/statfs.h> 14 #include <linux/statfs.h>
15 #include <linux/magic.h> 15 #include <linux/magic.h>
16 #include <linux/sched.h> 16 #include <linux/sched.h>
17 #include <linux/bitmap.h> 17 #include <linux/bitmap.h>
18 #include <linux/slab.h> 18 #include <linux/slab.h>
19 #include <linux/seq_file.h> 19 #include <linux/seq_file.h>
20 20
21 /* Mark the filesystem dirty, so that chkdsk c 21 /* Mark the filesystem dirty, so that chkdsk checks it when os/2 booted */
22 22
23 static void mark_dirty(struct super_block *s, 23 static void mark_dirty(struct super_block *s, int remount)
24 { 24 {
25 if (hpfs_sb(s)->sb_chkdsk && (remount 25 if (hpfs_sb(s)->sb_chkdsk && (remount || !sb_rdonly(s))) {
26 struct buffer_head *bh; 26 struct buffer_head *bh;
27 struct hpfs_spare_block *sb; 27 struct hpfs_spare_block *sb;
28 if ((sb = hpfs_map_sector(s, 1 28 if ((sb = hpfs_map_sector(s, 17, &bh, 0))) {
29 sb->dirty = 1; 29 sb->dirty = 1;
30 sb->old_wrote = 0; 30 sb->old_wrote = 0;
31 mark_buffer_dirty(bh); 31 mark_buffer_dirty(bh);
32 sync_dirty_buffer(bh); 32 sync_dirty_buffer(bh);
33 brelse(bh); 33 brelse(bh);
34 } 34 }
35 } 35 }
36 } 36 }
37 37
38 /* Mark the filesystem clean (mark it dirty fo 38 /* Mark the filesystem clean (mark it dirty for chkdsk if chkdsk==2 or if there
39 were errors) */ 39 were errors) */
40 40
41 static void unmark_dirty(struct super_block *s 41 static void unmark_dirty(struct super_block *s)
42 { 42 {
43 struct buffer_head *bh; 43 struct buffer_head *bh;
44 struct hpfs_spare_block *sb; 44 struct hpfs_spare_block *sb;
45 if (sb_rdonly(s)) return; 45 if (sb_rdonly(s)) return;
46 sync_blockdev(s->s_bdev); 46 sync_blockdev(s->s_bdev);
47 if ((sb = hpfs_map_sector(s, 17, &bh, 47 if ((sb = hpfs_map_sector(s, 17, &bh, 0))) {
48 sb->dirty = hpfs_sb(s)->sb_chk 48 sb->dirty = hpfs_sb(s)->sb_chkdsk > 1 - hpfs_sb(s)->sb_was_error;
49 sb->old_wrote = hpfs_sb(s)->sb 49 sb->old_wrote = hpfs_sb(s)->sb_chkdsk >= 2 && !hpfs_sb(s)->sb_was_error;
50 mark_buffer_dirty(bh); 50 mark_buffer_dirty(bh);
51 sync_dirty_buffer(bh); 51 sync_dirty_buffer(bh);
52 brelse(bh); 52 brelse(bh);
53 } 53 }
54 } 54 }
55 55
56 /* Filesystem error... */ 56 /* Filesystem error... */
57 void hpfs_error(struct super_block *s, const c 57 void hpfs_error(struct super_block *s, const char *fmt, ...)
58 { 58 {
59 struct va_format vaf; 59 struct va_format vaf;
60 va_list args; 60 va_list args;
61 61
62 va_start(args, fmt); 62 va_start(args, fmt);
63 63
64 vaf.fmt = fmt; 64 vaf.fmt = fmt;
65 vaf.va = &args; 65 vaf.va = &args;
66 66
67 pr_err("filesystem error: %pV", &vaf); 67 pr_err("filesystem error: %pV", &vaf);
68 68
69 va_end(args); 69 va_end(args);
70 70
71 if (!hpfs_sb(s)->sb_was_error) { 71 if (!hpfs_sb(s)->sb_was_error) {
72 if (hpfs_sb(s)->sb_err == 2) { 72 if (hpfs_sb(s)->sb_err == 2) {
73 pr_cont("; crashing th 73 pr_cont("; crashing the system because you wanted it\n");
74 mark_dirty(s, 0); 74 mark_dirty(s, 0);
75 panic("HPFS panic"); 75 panic("HPFS panic");
76 } else if (hpfs_sb(s)->sb_err 76 } else if (hpfs_sb(s)->sb_err == 1) {
77 if (sb_rdonly(s)) 77 if (sb_rdonly(s))
78 pr_cont("; alr 78 pr_cont("; already mounted read-only\n");
79 else { 79 else {
80 pr_cont("; rem 80 pr_cont("; remounting read-only\n");
81 mark_dirty(s, 81 mark_dirty(s, 0);
82 s->s_flags |= 82 s->s_flags |= SB_RDONLY;
83 } 83 }
84 } else if (sb_rdonly(s)) 84 } else if (sb_rdonly(s))
85 pr_cont("; goi 85 pr_cont("; going on - but anything won't be destroyed because it's read-only\n");
86 else 86 else
87 pr_cont("; corrupted f 87 pr_cont("; corrupted filesystem mounted read/write - your computer will explode within 20 seconds ... but you wanted it so!\n");
88 } else 88 } else
89 pr_cont("\n"); 89 pr_cont("\n");
90 hpfs_sb(s)->sb_was_error = 1; 90 hpfs_sb(s)->sb_was_error = 1;
91 } 91 }
92 92
93 /* 93 /*
94 * A little trick to detect cycles in many hpf 94 * A little trick to detect cycles in many hpfs structures and don't let the
95 * kernel crash on corrupted filesystem. When 95 * kernel crash on corrupted filesystem. When first called, set c2 to 0.
96 * 96 *
97 * BTW. chkdsk doesn't detect cycles correctly 97 * BTW. chkdsk doesn't detect cycles correctly. When I had 2 lost directories
98 * nested each in other, chkdsk locked up happ 98 * nested each in other, chkdsk locked up happilly.
99 */ 99 */
100 100
101 int hpfs_stop_cycles(struct super_block *s, in 101 int hpfs_stop_cycles(struct super_block *s, int key, int *c1, int *c2,
102 char *msg) 102 char *msg)
103 { 103 {
104 if (*c2 && *c1 == key) { 104 if (*c2 && *c1 == key) {
105 hpfs_error(s, "cycle detected 105 hpfs_error(s, "cycle detected on key %08x in %s", key, msg);
106 return 1; 106 return 1;
107 } 107 }
108 (*c2)++; 108 (*c2)++;
109 if (!((*c2 - 1) & *c2)) *c1 = key; 109 if (!((*c2 - 1) & *c2)) *c1 = key;
110 return 0; 110 return 0;
111 } 111 }
112 112
113 static void free_sbi(struct hpfs_sb_info *sbi) 113 static void free_sbi(struct hpfs_sb_info *sbi)
114 { 114 {
115 kfree(sbi->sb_cp_table); 115 kfree(sbi->sb_cp_table);
116 kfree(sbi->sb_bmp_dir); 116 kfree(sbi->sb_bmp_dir);
117 kfree(sbi); 117 kfree(sbi);
118 } 118 }
119 119
120 static void lazy_free_sbi(struct rcu_head *rcu 120 static void lazy_free_sbi(struct rcu_head *rcu)
121 { 121 {
122 free_sbi(container_of(rcu, struct hpfs 122 free_sbi(container_of(rcu, struct hpfs_sb_info, rcu));
123 } 123 }
124 124
125 static void hpfs_put_super(struct super_block 125 static void hpfs_put_super(struct super_block *s)
126 { 126 {
127 hpfs_lock(s); 127 hpfs_lock(s);
128 unmark_dirty(s); 128 unmark_dirty(s);
129 hpfs_unlock(s); 129 hpfs_unlock(s);
130 call_rcu(&hpfs_sb(s)->rcu, lazy_free_s 130 call_rcu(&hpfs_sb(s)->rcu, lazy_free_sbi);
131 } 131 }
132 132
133 static unsigned hpfs_count_one_bitmap(struct s 133 static unsigned hpfs_count_one_bitmap(struct super_block *s, secno secno)
134 { 134 {
135 struct quad_buffer_head qbh; 135 struct quad_buffer_head qbh;
136 unsigned long *bits; 136 unsigned long *bits;
137 unsigned count; 137 unsigned count;
138 138
139 bits = hpfs_map_4sectors(s, secno, &qb 139 bits = hpfs_map_4sectors(s, secno, &qbh, 0);
140 if (!bits) 140 if (!bits)
141 return (unsigned)-1; 141 return (unsigned)-1;
142 count = bitmap_weight(bits, 2048 * BIT 142 count = bitmap_weight(bits, 2048 * BITS_PER_BYTE);
143 hpfs_brelse4(&qbh); 143 hpfs_brelse4(&qbh);
144 return count; 144 return count;
145 } 145 }
146 146
147 static unsigned count_bitmaps(struct super_blo 147 static unsigned count_bitmaps(struct super_block *s)
148 { 148 {
149 unsigned n, count, n_bands; 149 unsigned n, count, n_bands;
150 n_bands = (hpfs_sb(s)->sb_fs_size + 0x 150 n_bands = (hpfs_sb(s)->sb_fs_size + 0x3fff) >> 14;
151 count = 0; 151 count = 0;
152 for (n = 0; n < COUNT_RD_AHEAD; n++) { 152 for (n = 0; n < COUNT_RD_AHEAD; n++) {
153 hpfs_prefetch_bitmap(s, n); 153 hpfs_prefetch_bitmap(s, n);
154 } 154 }
155 for (n = 0; n < n_bands; n++) { 155 for (n = 0; n < n_bands; n++) {
156 unsigned c; 156 unsigned c;
157 hpfs_prefetch_bitmap(s, n + CO 157 hpfs_prefetch_bitmap(s, n + COUNT_RD_AHEAD);
158 c = hpfs_count_one_bitmap(s, l 158 c = hpfs_count_one_bitmap(s, le32_to_cpu(hpfs_sb(s)->sb_bmp_dir[n]));
159 if (c != (unsigned)-1) 159 if (c != (unsigned)-1)
160 count += c; 160 count += c;
161 } 161 }
162 return count; 162 return count;
163 } 163 }
164 164
165 unsigned hpfs_get_free_dnodes(struct super_blo 165 unsigned hpfs_get_free_dnodes(struct super_block *s)
166 { 166 {
167 struct hpfs_sb_info *sbi = hpfs_sb(s); 167 struct hpfs_sb_info *sbi = hpfs_sb(s);
168 if (sbi->sb_n_free_dnodes == (unsigned 168 if (sbi->sb_n_free_dnodes == (unsigned)-1) {
169 unsigned c = hpfs_count_one_bi 169 unsigned c = hpfs_count_one_bitmap(s, sbi->sb_dmap);
170 if (c == (unsigned)-1) 170 if (c == (unsigned)-1)
171 return 0; 171 return 0;
172 sbi->sb_n_free_dnodes = c; 172 sbi->sb_n_free_dnodes = c;
173 } 173 }
174 return sbi->sb_n_free_dnodes; 174 return sbi->sb_n_free_dnodes;
175 } 175 }
176 176
177 static int hpfs_statfs(struct dentry *dentry, 177 static int hpfs_statfs(struct dentry *dentry, struct kstatfs *buf)
178 { 178 {
179 struct super_block *s = dentry->d_sb; 179 struct super_block *s = dentry->d_sb;
180 struct hpfs_sb_info *sbi = hpfs_sb(s); 180 struct hpfs_sb_info *sbi = hpfs_sb(s);
181 u64 id = huge_encode_dev(s->s_bdev->bd 181 u64 id = huge_encode_dev(s->s_bdev->bd_dev);
182 182
183 hpfs_lock(s); 183 hpfs_lock(s);
184 184
185 if (sbi->sb_n_free == (unsigned)-1) 185 if (sbi->sb_n_free == (unsigned)-1)
186 sbi->sb_n_free = count_bitmaps 186 sbi->sb_n_free = count_bitmaps(s);
187 187
188 buf->f_type = s->s_magic; 188 buf->f_type = s->s_magic;
189 buf->f_bsize = 512; 189 buf->f_bsize = 512;
190 buf->f_blocks = sbi->sb_fs_size; 190 buf->f_blocks = sbi->sb_fs_size;
191 buf->f_bfree = sbi->sb_n_free; 191 buf->f_bfree = sbi->sb_n_free;
192 buf->f_bavail = sbi->sb_n_free; 192 buf->f_bavail = sbi->sb_n_free;
193 buf->f_files = sbi->sb_dirband_size / 193 buf->f_files = sbi->sb_dirband_size / 4;
194 buf->f_ffree = hpfs_get_free_dnodes(s) 194 buf->f_ffree = hpfs_get_free_dnodes(s);
195 buf->f_fsid = u64_to_fsid(id); 195 buf->f_fsid = u64_to_fsid(id);
196 buf->f_namelen = 254; 196 buf->f_namelen = 254;
197 197
198 hpfs_unlock(s); 198 hpfs_unlock(s);
199 199
200 return 0; 200 return 0;
201 } 201 }
202 202
203 203
204 long hpfs_ioctl(struct file *file, unsigned cm 204 long hpfs_ioctl(struct file *file, unsigned cmd, unsigned long arg)
205 { 205 {
206 switch (cmd) { 206 switch (cmd) {
207 case FITRIM: { 207 case FITRIM: {
208 struct fstrim_range ra 208 struct fstrim_range range;
209 secno n_trimmed; 209 secno n_trimmed;
210 int r; 210 int r;
211 if (!capable(CAP_SYS_A 211 if (!capable(CAP_SYS_ADMIN))
212 return -EPERM; 212 return -EPERM;
213 if (copy_from_user(&ra 213 if (copy_from_user(&range, (struct fstrim_range __user *)arg, sizeof(range)))
214 return -EFAULT 214 return -EFAULT;
215 r = hpfs_trim_fs(file_ 215 r = hpfs_trim_fs(file_inode(file)->i_sb, range.start >> 9, (range.start + range.len) >> 9, (range.minlen + 511) >> 9, &n_trimmed);
216 if (r) 216 if (r)
217 return r; 217 return r;
218 range.len = (u64)n_tri 218 range.len = (u64)n_trimmed << 9;
219 if (copy_to_user((stru 219 if (copy_to_user((struct fstrim_range __user *)arg, &range, sizeof(range)))
220 return -EFAULT 220 return -EFAULT;
221 return 0; 221 return 0;
222 } 222 }
223 default: { 223 default: {
224 return -ENOIOCTLCMD; 224 return -ENOIOCTLCMD;
225 } 225 }
226 } 226 }
227 } 227 }
228 228
229 229
230 static struct kmem_cache * hpfs_inode_cachep; 230 static struct kmem_cache * hpfs_inode_cachep;
231 231
232 static struct inode *hpfs_alloc_inode(struct s 232 static struct inode *hpfs_alloc_inode(struct super_block *sb)
233 { 233 {
234 struct hpfs_inode_info *ei; 234 struct hpfs_inode_info *ei;
235 ei = alloc_inode_sb(sb, hpfs_inode_cac 235 ei = alloc_inode_sb(sb, hpfs_inode_cachep, GFP_NOFS);
236 if (!ei) 236 if (!ei)
237 return NULL; 237 return NULL;
238 return &ei->vfs_inode; 238 return &ei->vfs_inode;
239 } 239 }
240 240
241 static void hpfs_free_inode(struct inode *inod 241 static void hpfs_free_inode(struct inode *inode)
242 { 242 {
243 kmem_cache_free(hpfs_inode_cachep, hpf 243 kmem_cache_free(hpfs_inode_cachep, hpfs_i(inode));
244 } 244 }
245 245
246 static void init_once(void *foo) 246 static void init_once(void *foo)
247 { 247 {
248 struct hpfs_inode_info *ei = (struct h 248 struct hpfs_inode_info *ei = (struct hpfs_inode_info *) foo;
249 249
250 inode_init_once(&ei->vfs_inode); 250 inode_init_once(&ei->vfs_inode);
251 } 251 }
252 252
253 static int init_inodecache(void) 253 static int init_inodecache(void)
254 { 254 {
255 hpfs_inode_cachep = kmem_cache_create( 255 hpfs_inode_cachep = kmem_cache_create("hpfs_inode_cache",
256 s 256 sizeof(struct hpfs_inode_info),
257 0 257 0, (SLAB_RECLAIM_ACCOUNT|
258 258 SLAB_ACCOUNT),
259 i 259 init_once);
260 if (hpfs_inode_cachep == NULL) 260 if (hpfs_inode_cachep == NULL)
261 return -ENOMEM; 261 return -ENOMEM;
262 return 0; 262 return 0;
263 } 263 }
264 264
265 static void destroy_inodecache(void) 265 static void destroy_inodecache(void)
266 { 266 {
267 /* 267 /*
268 * Make sure all delayed rcu free inod 268 * Make sure all delayed rcu free inodes are flushed before we
269 * destroy cache. 269 * destroy cache.
270 */ 270 */
271 rcu_barrier(); 271 rcu_barrier();
272 kmem_cache_destroy(hpfs_inode_cachep); 272 kmem_cache_destroy(hpfs_inode_cachep);
273 } 273 }
274 274
275 /* 275 /*
276 * A tiny parser for option strings, stolen fr 276 * A tiny parser for option strings, stolen from dosfs.
277 * Stolen again from read-only hpfs. 277 * Stolen again from read-only hpfs.
278 * And updated for table-driven option parsing 278 * And updated for table-driven option parsing.
279 */ 279 */
280 280
281 enum { 281 enum {
282 Opt_help, Opt_uid, Opt_gid, Opt_umask, 282 Opt_help, Opt_uid, Opt_gid, Opt_umask, Opt_case_lower, Opt_case_asis,
283 Opt_check_none, Opt_check_normal, Opt_ 283 Opt_check_none, Opt_check_normal, Opt_check_strict,
284 Opt_err_cont, Opt_err_ro, Opt_err_pani 284 Opt_err_cont, Opt_err_ro, Opt_err_panic,
285 Opt_eas_no, Opt_eas_ro, Opt_eas_rw, 285 Opt_eas_no, Opt_eas_ro, Opt_eas_rw,
286 Opt_chkdsk_no, Opt_chkdsk_errors, Opt_ 286 Opt_chkdsk_no, Opt_chkdsk_errors, Opt_chkdsk_always,
287 Opt_timeshift, Opt_err, 287 Opt_timeshift, Opt_err,
288 }; 288 };
289 289
290 static const match_table_t tokens = { 290 static const match_table_t tokens = {
291 {Opt_help, "help"}, 291 {Opt_help, "help"},
292 {Opt_uid, "uid=%u"}, 292 {Opt_uid, "uid=%u"},
293 {Opt_gid, "gid=%u"}, 293 {Opt_gid, "gid=%u"},
294 {Opt_umask, "umask=%o"}, 294 {Opt_umask, "umask=%o"},
295 {Opt_case_lower, "case=lower"}, 295 {Opt_case_lower, "case=lower"},
296 {Opt_case_asis, "case=asis"}, 296 {Opt_case_asis, "case=asis"},
297 {Opt_check_none, "check=none"}, 297 {Opt_check_none, "check=none"},
298 {Opt_check_normal, "check=normal"}, 298 {Opt_check_normal, "check=normal"},
299 {Opt_check_strict, "check=strict"}, 299 {Opt_check_strict, "check=strict"},
300 {Opt_err_cont, "errors=continue"}, 300 {Opt_err_cont, "errors=continue"},
301 {Opt_err_ro, "errors=remount-ro"}, 301 {Opt_err_ro, "errors=remount-ro"},
302 {Opt_err_panic, "errors=panic"}, 302 {Opt_err_panic, "errors=panic"},
303 {Opt_eas_no, "eas=no"}, 303 {Opt_eas_no, "eas=no"},
304 {Opt_eas_ro, "eas=ro"}, 304 {Opt_eas_ro, "eas=ro"},
305 {Opt_eas_rw, "eas=rw"}, 305 {Opt_eas_rw, "eas=rw"},
306 {Opt_chkdsk_no, "chkdsk=no"}, 306 {Opt_chkdsk_no, "chkdsk=no"},
307 {Opt_chkdsk_errors, "chkdsk=errors"}, 307 {Opt_chkdsk_errors, "chkdsk=errors"},
308 {Opt_chkdsk_always, "chkdsk=always"}, 308 {Opt_chkdsk_always, "chkdsk=always"},
309 {Opt_timeshift, "timeshift=%d"}, 309 {Opt_timeshift, "timeshift=%d"},
310 {Opt_err, NULL}, 310 {Opt_err, NULL},
311 }; 311 };
312 312
313 static int parse_opts(char *opts, kuid_t *uid, 313 static int parse_opts(char *opts, kuid_t *uid, kgid_t *gid, umode_t *umask,
314 int *lowercase, int *eas 314 int *lowercase, int *eas, int *chk, int *errs,
315 int *chkdsk, int *timesh 315 int *chkdsk, int *timeshift)
316 { 316 {
317 char *p; 317 char *p;
318 int option; 318 int option;
319 319
320 if (!opts) 320 if (!opts)
321 return 1; 321 return 1;
322 322
323 /*pr_info("Parsing opts: '%s'\n",opts) 323 /*pr_info("Parsing opts: '%s'\n",opts);*/
324 324
325 while ((p = strsep(&opts, ",")) != NUL 325 while ((p = strsep(&opts, ",")) != NULL) {
326 substring_t args[MAX_OPT_ARGS] 326 substring_t args[MAX_OPT_ARGS];
327 int token; 327 int token;
328 if (!*p) 328 if (!*p)
329 continue; 329 continue;
330 330
331 token = match_token(p, tokens, 331 token = match_token(p, tokens, args);
332 switch (token) { 332 switch (token) {
333 case Opt_help: 333 case Opt_help:
334 return 2; 334 return 2;
335 case Opt_uid: 335 case Opt_uid:
336 if (match_int(args, &o 336 if (match_int(args, &option))
337 return 0; 337 return 0;
338 *uid = make_kuid(curre 338 *uid = make_kuid(current_user_ns(), option);
339 if (!uid_valid(*uid)) 339 if (!uid_valid(*uid))
340 return 0; 340 return 0;
341 break; 341 break;
342 case Opt_gid: 342 case Opt_gid:
343 if (match_int(args, &o 343 if (match_int(args, &option))
344 return 0; 344 return 0;
345 *gid = make_kgid(curre 345 *gid = make_kgid(current_user_ns(), option);
346 if (!gid_valid(*gid)) 346 if (!gid_valid(*gid))
347 return 0; 347 return 0;
348 break; 348 break;
349 case Opt_umask: 349 case Opt_umask:
350 if (match_octal(args, 350 if (match_octal(args, &option))
351 return 0; 351 return 0;
352 *umask = option; 352 *umask = option;
353 break; 353 break;
354 case Opt_case_lower: 354 case Opt_case_lower:
355 *lowercase = 1; 355 *lowercase = 1;
356 break; 356 break;
357 case Opt_case_asis: 357 case Opt_case_asis:
358 *lowercase = 0; 358 *lowercase = 0;
359 break; 359 break;
360 case Opt_check_none: 360 case Opt_check_none:
361 *chk = 0; 361 *chk = 0;
362 break; 362 break;
363 case Opt_check_normal: 363 case Opt_check_normal:
364 *chk = 1; 364 *chk = 1;
365 break; 365 break;
366 case Opt_check_strict: 366 case Opt_check_strict:
367 *chk = 2; 367 *chk = 2;
368 break; 368 break;
369 case Opt_err_cont: 369 case Opt_err_cont:
370 *errs = 0; 370 *errs = 0;
371 break; 371 break;
372 case Opt_err_ro: 372 case Opt_err_ro:
373 *errs = 1; 373 *errs = 1;
374 break; 374 break;
375 case Opt_err_panic: 375 case Opt_err_panic:
376 *errs = 2; 376 *errs = 2;
377 break; 377 break;
378 case Opt_eas_no: 378 case Opt_eas_no:
379 *eas = 0; 379 *eas = 0;
380 break; 380 break;
381 case Opt_eas_ro: 381 case Opt_eas_ro:
382 *eas = 1; 382 *eas = 1;
383 break; 383 break;
384 case Opt_eas_rw: 384 case Opt_eas_rw:
385 *eas = 2; 385 *eas = 2;
386 break; 386 break;
387 case Opt_chkdsk_no: 387 case Opt_chkdsk_no:
388 *chkdsk = 0; 388 *chkdsk = 0;
389 break; 389 break;
390 case Opt_chkdsk_errors: 390 case Opt_chkdsk_errors:
391 *chkdsk = 1; 391 *chkdsk = 1;
392 break; 392 break;
393 case Opt_chkdsk_always: 393 case Opt_chkdsk_always:
394 *chkdsk = 2; 394 *chkdsk = 2;
395 break; 395 break;
396 case Opt_timeshift: 396 case Opt_timeshift:
397 { 397 {
398 int m = 1; 398 int m = 1;
399 char *rhs = args[0].fr 399 char *rhs = args[0].from;
400 if (!rhs || !*rhs) 400 if (!rhs || !*rhs)
401 return 0; 401 return 0;
402 if (*rhs == '-') m = - 402 if (*rhs == '-') m = -1;
403 if (*rhs == '+' || *rh 403 if (*rhs == '+' || *rhs == '-') rhs++;
404 *timeshift = simple_st 404 *timeshift = simple_strtoul(rhs, &rhs, 0) * m;
405 if (*rhs) 405 if (*rhs)
406 return 0; 406 return 0;
407 break; 407 break;
408 } 408 }
409 default: 409 default:
410 return 0; 410 return 0;
411 } 411 }
412 } 412 }
413 return 1; 413 return 1;
414 } 414 }
415 415
416 static inline void hpfs_help(void) 416 static inline void hpfs_help(void)
417 { 417 {
418 pr_info("\n\ 418 pr_info("\n\
419 HPFS filesystem options:\n\ 419 HPFS filesystem options:\n\
420 help do not mount and displ 420 help do not mount and display this text\n\
421 uid=xxx set uid of files that 421 uid=xxx set uid of files that don't have uid specified in eas\n\
422 gid=xxx set gid of files that 422 gid=xxx set gid of files that don't have gid specified in eas\n\
423 umask=xxx set mode of files that 423 umask=xxx set mode of files that don't have mode specified in eas\n\
424 case=lower lowercase all files\n\ 424 case=lower lowercase all files\n\
425 case=asis do not lowercase files 425 case=asis do not lowercase files (default)\n\
426 check=none no fs checks - kernel 426 check=none no fs checks - kernel may crash on corrupted filesystem\n\
427 check=normal do some checks - it sh 427 check=normal do some checks - it should not crash (default)\n\
428 check=strict do extra time-consumin 428 check=strict do extra time-consuming checks, used for debugging\n\
429 errors=continue continue on errors\n\ 429 errors=continue continue on errors\n\
430 errors=remount-ro remount read-only if e 430 errors=remount-ro remount read-only if errors found (default)\n\
431 errors=panic panic on errors\n\ 431 errors=panic panic on errors\n\
432 chkdsk=no do not mark fs for chk 432 chkdsk=no do not mark fs for chkdsking even if there were errors\n\
433 chkdsk=errors mark fs dirty if error 433 chkdsk=errors mark fs dirty if errors found (default)\n\
434 chkdsk=always always mark fs dirty - 434 chkdsk=always always mark fs dirty - used for debugging\n\
435 eas=no ignore extended attrib 435 eas=no ignore extended attributes\n\
436 eas=ro read but do not write 436 eas=ro read but do not write extended attributes\n\
437 eas=rw r/w eas => enables chm 437 eas=rw r/w eas => enables chmod, chown, mknod, ln -s (default)\n\
438 timeshift=nnn add nnn seconds to fil 438 timeshift=nnn add nnn seconds to file times\n\
439 \n"); 439 \n");
440 } 440 }
441 441
442 static int hpfs_remount_fs(struct super_block 442 static int hpfs_remount_fs(struct super_block *s, int *flags, char *data)
443 { 443 {
444 kuid_t uid; 444 kuid_t uid;
445 kgid_t gid; 445 kgid_t gid;
446 umode_t umask; 446 umode_t umask;
447 int lowercase, eas, chk, errs, chkdsk, 447 int lowercase, eas, chk, errs, chkdsk, timeshift;
448 int o; 448 int o;
449 struct hpfs_sb_info *sbi = hpfs_sb(s); 449 struct hpfs_sb_info *sbi = hpfs_sb(s);
450 450
451 sync_filesystem(s); 451 sync_filesystem(s);
452 452
453 *flags |= SB_NOATIME; 453 *flags |= SB_NOATIME;
454 454
455 hpfs_lock(s); 455 hpfs_lock(s);
456 uid = sbi->sb_uid; gid = sbi->sb_gid; 456 uid = sbi->sb_uid; gid = sbi->sb_gid;
457 umask = 0777 & ~sbi->sb_mode; 457 umask = 0777 & ~sbi->sb_mode;
458 lowercase = sbi->sb_lowercase; 458 lowercase = sbi->sb_lowercase;
459 eas = sbi->sb_eas; chk = sbi->sb_chk; 459 eas = sbi->sb_eas; chk = sbi->sb_chk; chkdsk = sbi->sb_chkdsk;
460 errs = sbi->sb_err; timeshift = sbi->s 460 errs = sbi->sb_err; timeshift = sbi->sb_timeshift;
461 461
462 if (!(o = parse_opts(data, &uid, &gid, 462 if (!(o = parse_opts(data, &uid, &gid, &umask, &lowercase,
463 &eas, &chk, &errs, &chkdsk, × 463 &eas, &chk, &errs, &chkdsk, ×hift))) {
464 pr_err("bad mount options.\n") 464 pr_err("bad mount options.\n");
465 goto out_err; 465 goto out_err;
466 } 466 }
467 if (o == 2) { 467 if (o == 2) {
468 hpfs_help(); 468 hpfs_help();
469 goto out_err; 469 goto out_err;
470 } 470 }
471 if (timeshift != sbi->sb_timeshift) { 471 if (timeshift != sbi->sb_timeshift) {
472 pr_err("timeshift can't be cha 472 pr_err("timeshift can't be changed using remount.\n");
473 goto out_err; 473 goto out_err;
474 } 474 }
475 475
476 unmark_dirty(s); 476 unmark_dirty(s);
477 477
478 sbi->sb_uid = uid; sbi->sb_gid = gid; 478 sbi->sb_uid = uid; sbi->sb_gid = gid;
479 sbi->sb_mode = 0777 & ~umask; 479 sbi->sb_mode = 0777 & ~umask;
480 sbi->sb_lowercase = lowercase; 480 sbi->sb_lowercase = lowercase;
481 sbi->sb_eas = eas; sbi->sb_chk = chk; 481 sbi->sb_eas = eas; sbi->sb_chk = chk; sbi->sb_chkdsk = chkdsk;
482 sbi->sb_err = errs; sbi->sb_timeshift 482 sbi->sb_err = errs; sbi->sb_timeshift = timeshift;
483 483
484 if (!(*flags & SB_RDONLY)) mark_dirty( 484 if (!(*flags & SB_RDONLY)) mark_dirty(s, 1);
485 485
486 hpfs_unlock(s); 486 hpfs_unlock(s);
487 return 0; 487 return 0;
488 488
489 out_err: 489 out_err:
490 hpfs_unlock(s); 490 hpfs_unlock(s);
491 return -EINVAL; 491 return -EINVAL;
492 } 492 }
493 493
494 static int hpfs_show_options(struct seq_file * 494 static int hpfs_show_options(struct seq_file *seq, struct dentry *root)
495 { 495 {
496 struct hpfs_sb_info *sbi = hpfs_sb(roo 496 struct hpfs_sb_info *sbi = hpfs_sb(root->d_sb);
497 497
498 seq_printf(seq, ",uid=%u", from_kuid_m 498 seq_printf(seq, ",uid=%u", from_kuid_munged(&init_user_ns, sbi->sb_uid));
499 seq_printf(seq, ",gid=%u", from_kgid_m 499 seq_printf(seq, ",gid=%u", from_kgid_munged(&init_user_ns, sbi->sb_gid));
500 seq_printf(seq, ",umask=%03o", (~sbi-> 500 seq_printf(seq, ",umask=%03o", (~sbi->sb_mode & 0777));
501 if (sbi->sb_lowercase) 501 if (sbi->sb_lowercase)
502 seq_printf(seq, ",case=lower") 502 seq_printf(seq, ",case=lower");
503 if (!sbi->sb_chk) 503 if (!sbi->sb_chk)
504 seq_printf(seq, ",check=none") 504 seq_printf(seq, ",check=none");
505 if (sbi->sb_chk == 2) 505 if (sbi->sb_chk == 2)
506 seq_printf(seq, ",check=strict 506 seq_printf(seq, ",check=strict");
507 if (!sbi->sb_err) 507 if (!sbi->sb_err)
508 seq_printf(seq, ",errors=conti 508 seq_printf(seq, ",errors=continue");
509 if (sbi->sb_err == 2) 509 if (sbi->sb_err == 2)
510 seq_printf(seq, ",errors=panic 510 seq_printf(seq, ",errors=panic");
511 if (!sbi->sb_chkdsk) 511 if (!sbi->sb_chkdsk)
512 seq_printf(seq, ",chkdsk=no"); 512 seq_printf(seq, ",chkdsk=no");
513 if (sbi->sb_chkdsk == 2) 513 if (sbi->sb_chkdsk == 2)
514 seq_printf(seq, ",chkdsk=alway 514 seq_printf(seq, ",chkdsk=always");
515 if (!sbi->sb_eas) 515 if (!sbi->sb_eas)
516 seq_printf(seq, ",eas=no"); 516 seq_printf(seq, ",eas=no");
517 if (sbi->sb_eas == 1) 517 if (sbi->sb_eas == 1)
518 seq_printf(seq, ",eas=ro"); 518 seq_printf(seq, ",eas=ro");
519 if (sbi->sb_timeshift) 519 if (sbi->sb_timeshift)
520 seq_printf(seq, ",timeshift=%d 520 seq_printf(seq, ",timeshift=%d", sbi->sb_timeshift);
521 return 0; 521 return 0;
522 } 522 }
523 523
524 /* Super operations */ 524 /* Super operations */
525 525
526 static const struct super_operations hpfs_sops 526 static const struct super_operations hpfs_sops =
527 { 527 {
528 .alloc_inode = hpfs_alloc_inode, 528 .alloc_inode = hpfs_alloc_inode,
529 .free_inode = hpfs_free_inode, 529 .free_inode = hpfs_free_inode,
530 .evict_inode = hpfs_evict_inode, 530 .evict_inode = hpfs_evict_inode,
531 .put_super = hpfs_put_super, 531 .put_super = hpfs_put_super,
532 .statfs = hpfs_statfs, 532 .statfs = hpfs_statfs,
533 .remount_fs = hpfs_remount_fs, 533 .remount_fs = hpfs_remount_fs,
534 .show_options = hpfs_show_options, 534 .show_options = hpfs_show_options,
535 }; 535 };
536 536
537 static int hpfs_fill_super(struct super_block 537 static int hpfs_fill_super(struct super_block *s, void *options, int silent)
538 { 538 {
539 struct buffer_head *bh0, *bh1, *bh2; 539 struct buffer_head *bh0, *bh1, *bh2;
540 struct hpfs_boot_block *bootblock; 540 struct hpfs_boot_block *bootblock;
541 struct hpfs_super_block *superblock; 541 struct hpfs_super_block *superblock;
542 struct hpfs_spare_block *spareblock; 542 struct hpfs_spare_block *spareblock;
543 struct hpfs_sb_info *sbi; 543 struct hpfs_sb_info *sbi;
544 struct inode *root; 544 struct inode *root;
545 545
546 kuid_t uid; 546 kuid_t uid;
547 kgid_t gid; 547 kgid_t gid;
548 umode_t umask; 548 umode_t umask;
549 int lowercase, eas, chk, errs, chkdsk, 549 int lowercase, eas, chk, errs, chkdsk, timeshift;
550 550
551 dnode_secno root_dno; 551 dnode_secno root_dno;
552 struct hpfs_dirent *de = NULL; 552 struct hpfs_dirent *de = NULL;
553 struct quad_buffer_head qbh; 553 struct quad_buffer_head qbh;
554 554
555 int o; 555 int o;
556 556
557 sbi = kzalloc(sizeof(*sbi), GFP_KERNEL 557 sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
558 if (!sbi) { 558 if (!sbi) {
559 return -ENOMEM; 559 return -ENOMEM;
560 } 560 }
561 s->s_fs_info = sbi; 561 s->s_fs_info = sbi;
562 562
563 mutex_init(&sbi->hpfs_mutex); 563 mutex_init(&sbi->hpfs_mutex);
564 hpfs_lock(s); 564 hpfs_lock(s);
565 565
566 uid = current_uid(); 566 uid = current_uid();
567 gid = current_gid(); 567 gid = current_gid();
568 umask = current_umask(); 568 umask = current_umask();
569 lowercase = 0; 569 lowercase = 0;
570 eas = 2; 570 eas = 2;
571 chk = 1; 571 chk = 1;
572 errs = 1; 572 errs = 1;
573 chkdsk = 1; 573 chkdsk = 1;
574 timeshift = 0; 574 timeshift = 0;
575 575
576 if (!(o = parse_opts(options, &uid, &g 576 if (!(o = parse_opts(options, &uid, &gid, &umask, &lowercase,
577 &eas, &chk, &errs, &chkdsk, × 577 &eas, &chk, &errs, &chkdsk, ×hift))) {
578 pr_err("bad mount options.\n") 578 pr_err("bad mount options.\n");
579 goto bail0; 579 goto bail0;
580 } 580 }
581 if (o==2) { 581 if (o==2) {
582 hpfs_help(); 582 hpfs_help();
583 goto bail0; 583 goto bail0;
584 } 584 }
585 585
586 /*sbi->sb_mounting = 1;*/ 586 /*sbi->sb_mounting = 1;*/
587 sb_set_blocksize(s, 512); 587 sb_set_blocksize(s, 512);
588 sbi->sb_fs_size = -1; 588 sbi->sb_fs_size = -1;
589 if (!(bootblock = hpfs_map_sector(s, 0 589 if (!(bootblock = hpfs_map_sector(s, 0, &bh0, 0))) goto bail1;
590 if (!(superblock = hpfs_map_sector(s, 590 if (!(superblock = hpfs_map_sector(s, 16, &bh1, 1))) goto bail2;
591 if (!(spareblock = hpfs_map_sector(s, 591 if (!(spareblock = hpfs_map_sector(s, 17, &bh2, 0))) goto bail3;
592 592
593 /* Check magics */ 593 /* Check magics */
594 if (/*le16_to_cpu(bootblock->magic) != 594 if (/*le16_to_cpu(bootblock->magic) != BB_MAGIC
595 ||*/ le32_to_cpu(superblock->magic 595 ||*/ le32_to_cpu(superblock->magic) != SB_MAGIC
596 || le32_to_cpu(spareblock->magic) 596 || le32_to_cpu(spareblock->magic) != SP_MAGIC) {
597 if (!silent) 597 if (!silent)
598 pr_err("Bad magic ... 598 pr_err("Bad magic ... probably not HPFS\n");
599 goto bail4; 599 goto bail4;
600 } 600 }
601 601
602 /* Check version */ 602 /* Check version */
603 if (!sb_rdonly(s) && superblock->funcv 603 if (!sb_rdonly(s) && superblock->funcversion != 2 && superblock->funcversion != 3) {
604 pr_err("Bad version %d,%d. Mou 604 pr_err("Bad version %d,%d. Mount readonly to go around\n",
605 (int)superblock->versi 605 (int)superblock->version, (int)superblock->funcversion);
606 pr_err("please try recent vers 606 pr_err("please try recent version of HPFS driver at http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi and if it still can't understand this format, contact author - mikulas@artax.karlin.mff.cuni.cz\n");
607 goto bail4; 607 goto bail4;
608 } 608 }
609 609
610 s->s_flags |= SB_NOATIME; 610 s->s_flags |= SB_NOATIME;
611 611
612 /* Fill superblock stuff */ 612 /* Fill superblock stuff */
613 s->s_magic = HPFS_SUPER_MAGIC; 613 s->s_magic = HPFS_SUPER_MAGIC;
614 s->s_op = &hpfs_sops; 614 s->s_op = &hpfs_sops;
615 s->s_d_op = &hpfs_dentry_operations; 615 s->s_d_op = &hpfs_dentry_operations;
616 s->s_time_min = local_to_gmt(s, 0); 616 s->s_time_min = local_to_gmt(s, 0);
617 s->s_time_max = local_to_gmt(s, U32_M 617 s->s_time_max = local_to_gmt(s, U32_MAX);
618 618
619 sbi->sb_root = le32_to_cpu(superblock- 619 sbi->sb_root = le32_to_cpu(superblock->root);
620 sbi->sb_fs_size = le32_to_cpu(superblo 620 sbi->sb_fs_size = le32_to_cpu(superblock->n_sectors);
621 sbi->sb_bitmaps = le32_to_cpu(superblo 621 sbi->sb_bitmaps = le32_to_cpu(superblock->bitmaps);
622 sbi->sb_dirband_start = le32_to_cpu(su 622 sbi->sb_dirband_start = le32_to_cpu(superblock->dir_band_start);
623 sbi->sb_dirband_size = le32_to_cpu(sup 623 sbi->sb_dirband_size = le32_to_cpu(superblock->n_dir_band);
624 sbi->sb_dmap = le32_to_cpu(superblock- 624 sbi->sb_dmap = le32_to_cpu(superblock->dir_band_bitmap);
625 sbi->sb_uid = uid; 625 sbi->sb_uid = uid;
626 sbi->sb_gid = gid; 626 sbi->sb_gid = gid;
627 sbi->sb_mode = 0777 & ~umask; 627 sbi->sb_mode = 0777 & ~umask;
628 sbi->sb_n_free = -1; 628 sbi->sb_n_free = -1;
629 sbi->sb_n_free_dnodes = -1; 629 sbi->sb_n_free_dnodes = -1;
630 sbi->sb_lowercase = lowercase; 630 sbi->sb_lowercase = lowercase;
631 sbi->sb_eas = eas; 631 sbi->sb_eas = eas;
632 sbi->sb_chk = chk; 632 sbi->sb_chk = chk;
633 sbi->sb_chkdsk = chkdsk; 633 sbi->sb_chkdsk = chkdsk;
634 sbi->sb_err = errs; 634 sbi->sb_err = errs;
635 sbi->sb_timeshift = timeshift; 635 sbi->sb_timeshift = timeshift;
636 sbi->sb_was_error = 0; 636 sbi->sb_was_error = 0;
637 sbi->sb_cp_table = NULL; 637 sbi->sb_cp_table = NULL;
638 sbi->sb_c_bitmap = -1; 638 sbi->sb_c_bitmap = -1;
639 sbi->sb_max_fwd_alloc = 0xffffff; 639 sbi->sb_max_fwd_alloc = 0xffffff;
640 640
641 if (sbi->sb_fs_size >= 0x80000000) { 641 if (sbi->sb_fs_size >= 0x80000000) {
642 hpfs_error(s, "invalid size in 642 hpfs_error(s, "invalid size in superblock: %08x",
643 (unsigned)sbi->sb_fs_s 643 (unsigned)sbi->sb_fs_size);
644 goto bail4; 644 goto bail4;
645 } 645 }
646 646
647 if (spareblock->n_spares_used) 647 if (spareblock->n_spares_used)
648 hpfs_load_hotfix_map(s, spareb 648 hpfs_load_hotfix_map(s, spareblock);
649 649
650 /* Load bitmap directory */ 650 /* Load bitmap directory */
651 if (!(sbi->sb_bmp_dir = hpfs_load_bitm 651 if (!(sbi->sb_bmp_dir = hpfs_load_bitmap_directory(s, le32_to_cpu(superblock->bitmaps))))
652 goto bail4; 652 goto bail4;
653 653
654 /* Check for general fs errors*/ 654 /* Check for general fs errors*/
655 if (spareblock->dirty && !spareblock-> 655 if (spareblock->dirty && !spareblock->old_wrote) {
656 if (errs == 2) { 656 if (errs == 2) {
657 pr_err("Improperly sto 657 pr_err("Improperly stopped, not mounted\n");
658 goto bail4; 658 goto bail4;
659 } 659 }
660 hpfs_error(s, "improperly stop 660 hpfs_error(s, "improperly stopped");
661 } 661 }
662 662
663 if (!sb_rdonly(s)) { 663 if (!sb_rdonly(s)) {
664 spareblock->dirty = 1; 664 spareblock->dirty = 1;
665 spareblock->old_wrote = 0; 665 spareblock->old_wrote = 0;
666 mark_buffer_dirty(bh2); 666 mark_buffer_dirty(bh2);
667 } 667 }
668 668
669 if (le32_to_cpu(spareblock->n_dnode_sp 669 if (le32_to_cpu(spareblock->n_dnode_spares) != le32_to_cpu(spareblock->n_dnode_spares_free)) {
670 if (errs >= 2) { 670 if (errs >= 2) {
671 pr_err("Spare dnodes u 671 pr_err("Spare dnodes used, try chkdsk\n");
672 mark_dirty(s, 0); 672 mark_dirty(s, 0);
673 goto bail4; 673 goto bail4;
674 } 674 }
675 hpfs_error(s, "warning: spare 675 hpfs_error(s, "warning: spare dnodes used, try chkdsk");
676 if (errs == 0) 676 if (errs == 0)
677 pr_err("Proceeding, bu 677 pr_err("Proceeding, but your filesystem could be corrupted if you delete files or directories\n");
678 } 678 }
679 if (chk) { 679 if (chk) {
680 unsigned a; 680 unsigned a;
681 if (le32_to_cpu(superblock->di 681 if (le32_to_cpu(superblock->dir_band_end) - le32_to_cpu(superblock->dir_band_start) + 1 != le32_to_cpu(superblock->n_dir_band) ||
682 le32_to_cpu(superblock->di 682 le32_to_cpu(superblock->dir_band_end) < le32_to_cpu(superblock->dir_band_start) || le32_to_cpu(superblock->n_dir_band) > 0x4000) {
683 hpfs_error(s, "dir ban 683 hpfs_error(s, "dir band size mismatch: dir_band_start==%08x, dir_band_end==%08x, n_dir_band==%08x",
684 le32_to_cpu(su 684 le32_to_cpu(superblock->dir_band_start), le32_to_cpu(superblock->dir_band_end), le32_to_cpu(superblock->n_dir_band));
685 goto bail4; 685 goto bail4;
686 } 686 }
687 a = sbi->sb_dirband_size; 687 a = sbi->sb_dirband_size;
688 sbi->sb_dirband_size = 0; 688 sbi->sb_dirband_size = 0;
689 if (hpfs_chk_sectors(s, le32_t 689 if (hpfs_chk_sectors(s, le32_to_cpu(superblock->dir_band_start), le32_to_cpu(superblock->n_dir_band), "dir_band") ||
690 hpfs_chk_sectors(s, le32_t 690 hpfs_chk_sectors(s, le32_to_cpu(superblock->dir_band_bitmap), 4, "dir_band_bitmap") ||
691 hpfs_chk_sectors(s, le32_t 691 hpfs_chk_sectors(s, le32_to_cpu(superblock->bitmaps), 4, "bitmaps")) {
692 mark_dirty(s, 0); 692 mark_dirty(s, 0);
693 goto bail4; 693 goto bail4;
694 } 694 }
695 sbi->sb_dirband_size = a; 695 sbi->sb_dirband_size = a;
696 } else 696 } else
697 pr_err("You really don't want 697 pr_err("You really don't want any checks? You are crazy...\n");
698 698
699 /* Load code page table */ 699 /* Load code page table */
700 if (le32_to_cpu(spareblock->n_code_pag 700 if (le32_to_cpu(spareblock->n_code_pages))
701 if (!(sbi->sb_cp_table = hpfs_ 701 if (!(sbi->sb_cp_table = hpfs_load_code_page(s, le32_to_cpu(spareblock->code_page_dir))))
702 pr_err("code page supp 702 pr_err("code page support is disabled\n");
703 703
704 brelse(bh2); 704 brelse(bh2);
705 brelse(bh1); 705 brelse(bh1);
706 brelse(bh0); 706 brelse(bh0);
707 707
708 root = iget_locked(s, sbi->sb_root); 708 root = iget_locked(s, sbi->sb_root);
709 if (!root) 709 if (!root)
710 goto bail0; 710 goto bail0;
711 hpfs_init_inode(root); 711 hpfs_init_inode(root);
712 hpfs_read_inode(root); 712 hpfs_read_inode(root);
713 unlock_new_inode(root); 713 unlock_new_inode(root);
714 s->s_root = d_make_root(root); 714 s->s_root = d_make_root(root);
715 if (!s->s_root) 715 if (!s->s_root)
716 goto bail0; 716 goto bail0;
717 717
718 /* 718 /*
719 * find the root directory's . pointer 719 * find the root directory's . pointer & finish filling in the inode
720 */ 720 */
721 721
722 root_dno = hpfs_fnode_dno(s, sbi->sb_r 722 root_dno = hpfs_fnode_dno(s, sbi->sb_root);
723 if (root_dno) 723 if (root_dno)
724 de = map_dirent(root, root_dno 724 de = map_dirent(root, root_dno, "\001\001", 2, NULL, &qbh);
725 if (!de) 725 if (!de)
726 hpfs_error(s, "unable to find 726 hpfs_error(s, "unable to find root dir");
727 else { 727 else {
728 inode_set_atime(root, 728 inode_set_atime(root,
729 local_to_gmt(s 729 local_to_gmt(s, le32_to_cpu(de->read_date)),
730 0); 730 0);
731 inode_set_mtime(root, 731 inode_set_mtime(root,
732 local_to_gmt(s 732 local_to_gmt(s, le32_to_cpu(de->write_date)),
733 0); 733 0);
734 inode_set_ctime(root, 734 inode_set_ctime(root,
735 local_to_gmt(s 735 local_to_gmt(s, le32_to_cpu(de->creation_date)),
736 0); 736 0);
737 hpfs_i(root)->i_ea_size = le32 737 hpfs_i(root)->i_ea_size = le32_to_cpu(de->ea_size);
738 hpfs_i(root)->i_parent_dir = r 738 hpfs_i(root)->i_parent_dir = root->i_ino;
739 if (root->i_size == -1) 739 if (root->i_size == -1)
740 root->i_size = 2048; 740 root->i_size = 2048;
741 if (root->i_blocks == -1) 741 if (root->i_blocks == -1)
742 root->i_blocks = 5; 742 root->i_blocks = 5;
743 hpfs_brelse4(&qbh); 743 hpfs_brelse4(&qbh);
744 } 744 }
745 hpfs_unlock(s); 745 hpfs_unlock(s);
746 return 0; 746 return 0;
747 747
748 bail4: brelse(bh2); 748 bail4: brelse(bh2);
749 bail3: brelse(bh1); 749 bail3: brelse(bh1);
750 bail2: brelse(bh0); 750 bail2: brelse(bh0);
751 bail1: 751 bail1:
752 bail0: 752 bail0:
753 hpfs_unlock(s); 753 hpfs_unlock(s);
754 free_sbi(sbi); 754 free_sbi(sbi);
755 return -EINVAL; 755 return -EINVAL;
756 } 756 }
757 757
758 static struct dentry *hpfs_mount(struct file_s 758 static struct dentry *hpfs_mount(struct file_system_type *fs_type,
759 int flags, const char *dev_name, void 759 int flags, const char *dev_name, void *data)
760 { 760 {
761 return mount_bdev(fs_type, flags, dev_ 761 return mount_bdev(fs_type, flags, dev_name, data, hpfs_fill_super);
762 } 762 }
763 763
764 static struct file_system_type hpfs_fs_type = 764 static struct file_system_type hpfs_fs_type = {
765 .owner = THIS_MODULE, 765 .owner = THIS_MODULE,
766 .name = "hpfs", 766 .name = "hpfs",
767 .mount = hpfs_mount, 767 .mount = hpfs_mount,
768 .kill_sb = kill_block_super, 768 .kill_sb = kill_block_super,
769 .fs_flags = FS_REQUIRES_DEV, 769 .fs_flags = FS_REQUIRES_DEV,
770 }; 770 };
771 MODULE_ALIAS_FS("hpfs"); 771 MODULE_ALIAS_FS("hpfs");
772 772
773 static int __init init_hpfs_fs(void) 773 static int __init init_hpfs_fs(void)
774 { 774 {
775 int err = init_inodecache(); 775 int err = init_inodecache();
776 if (err) 776 if (err)
777 goto out1; 777 goto out1;
778 err = register_filesystem(&hpfs_fs_typ 778 err = register_filesystem(&hpfs_fs_type);
779 if (err) 779 if (err)
780 goto out; 780 goto out;
781 return 0; 781 return 0;
782 out: 782 out:
783 destroy_inodecache(); 783 destroy_inodecache();
784 out1: 784 out1:
785 return err; 785 return err;
786 } 786 }
787 787
788 static void __exit exit_hpfs_fs(void) 788 static void __exit exit_hpfs_fs(void)
789 { 789 {
790 unregister_filesystem(&hpfs_fs_type); 790 unregister_filesystem(&hpfs_fs_type);
791 destroy_inodecache(); 791 destroy_inodecache();
792 } 792 }
793 793
794 module_init(init_hpfs_fs) 794 module_init(init_hpfs_fs)
795 module_exit(exit_hpfs_fs) 795 module_exit(exit_hpfs_fs)
796 MODULE_DESCRIPTION("OS/2 HPFS file system supp 796 MODULE_DESCRIPTION("OS/2 HPFS file system support");
797 MODULE_LICENSE("GPL"); 797 MODULE_LICENSE("GPL");
798 798
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.