1 // SPDX-License-Identifier: GPL-2.0-only <<
2 /* 1 /*
3 * linux/fs/msdos/namei.c 2 * linux/fs/msdos/namei.c
4 * 3 *
5 * Written 1992,1993 by Werner Almesberger 4 * Written 1992,1993 by Werner Almesberger
6 * Hidden files 1995 by Albert Cahalan <alber 5 * Hidden files 1995 by Albert Cahalan <albert@ccs.neu.edu> <adc@coe.neu.edu>
7 * Rewritten for constant inumbers 1999 by Al 6 * Rewritten for constant inumbers 1999 by Al Viro
8 */ 7 */
9 8
10 #include <linux/module.h> 9 #include <linux/module.h>
11 #include <linux/iversion.h> !! 10 #include <linux/time.h>
>> 11 #include <linux/buffer_head.h>
12 #include "fat.h" 12 #include "fat.h"
13 13
14 /* Characters that are undesirable in an MS-DO 14 /* Characters that are undesirable in an MS-DOS file name */
15 static unsigned char bad_chars[] = "*?<>|\""; 15 static unsigned char bad_chars[] = "*?<>|\"";
16 static unsigned char bad_if_strict[] = "+=,; " 16 static unsigned char bad_if_strict[] = "+=,; ";
17 17
18 /***** Formats an MS-DOS file name. Rejects in 18 /***** Formats an MS-DOS file name. Rejects invalid names. */
19 static int msdos_format_name(const unsigned ch 19 static int msdos_format_name(const unsigned char *name, int len,
20 unsigned char *re 20 unsigned char *res, struct fat_mount_options *opts)
21 /* 21 /*
22 * name is the proposed name, len is i 22 * name is the proposed name, len is its length, res is
23 * the resulting name, opts->name_chec 23 * the resulting name, opts->name_check is either (r)elaxed,
24 * (n)ormal or (s)trict, opts->dotsOK 24 * (n)ormal or (s)trict, opts->dotsOK allows dots at the
25 * beginning of name (for hidden files 25 * beginning of name (for hidden files)
26 */ 26 */
27 { 27 {
28 unsigned char *walk; 28 unsigned char *walk;
29 unsigned char c; 29 unsigned char c;
30 int space; 30 int space;
31 31
32 if (name[0] == '.') { /* dotfile bec 32 if (name[0] == '.') { /* dotfile because . and .. already done */
33 if (opts->dotsOK) { 33 if (opts->dotsOK) {
34 /* Get rid of dot - te 34 /* Get rid of dot - test for it elsewhere */
35 name++; 35 name++;
36 len--; 36 len--;
37 } else 37 } else
38 return -EINVAL; 38 return -EINVAL;
39 } 39 }
40 /* 40 /*
41 * disallow names that _really_ start 41 * disallow names that _really_ start with a dot
42 */ 42 */
43 space = 1; 43 space = 1;
44 c = 0; 44 c = 0;
45 for (walk = res; len && walk - res < 8 45 for (walk = res; len && walk - res < 8; walk++) {
46 c = *name++; 46 c = *name++;
47 len--; 47 len--;
48 if (opts->name_check != 'r' && 48 if (opts->name_check != 'r' && strchr(bad_chars, c))
49 return -EINVAL; 49 return -EINVAL;
50 if (opts->name_check == 's' && 50 if (opts->name_check == 's' && strchr(bad_if_strict, c))
51 return -EINVAL; 51 return -EINVAL;
52 if (c >= 'A' && c <= 'Z' && op 52 if (c >= 'A' && c <= 'Z' && opts->name_check == 's')
53 return -EINVAL; 53 return -EINVAL;
54 if (c < ' ' || c == ':' || c = 54 if (c < ' ' || c == ':' || c == '\\')
55 return -EINVAL; 55 return -EINVAL;
56 /* 56 /*
57 * 0xE5 is legal as a first character, 57 * 0xE5 is legal as a first character, but we must substitute
58 * 0x05 because 0xE5 marks deleted fil 58 * 0x05 because 0xE5 marks deleted files. Yes, DOS really
59 * does this. 59 * does this.
60 * It seems that Microsoft hacked DOS 60 * It seems that Microsoft hacked DOS to support non-US
61 * characters after the 0xE5 character 61 * characters after the 0xE5 character was already in use to
62 * mark deleted files. 62 * mark deleted files.
63 */ 63 */
64 if ((res == walk) && (c == 0xE 64 if ((res == walk) && (c == 0xE5))
65 c = 0x05; 65 c = 0x05;
66 if (c == '.') 66 if (c == '.')
67 break; 67 break;
68 space = (c == ' '); 68 space = (c == ' ');
69 *walk = (!opts->nocase && c >= 69 *walk = (!opts->nocase && c >= 'a' && c <= 'z') ? c - 32 : c;
70 } 70 }
71 if (space) 71 if (space)
72 return -EINVAL; 72 return -EINVAL;
73 if (opts->name_check == 's' && len && 73 if (opts->name_check == 's' && len && c != '.') {
74 c = *name++; 74 c = *name++;
75 len--; 75 len--;
76 if (c != '.') 76 if (c != '.')
77 return -EINVAL; 77 return -EINVAL;
78 } 78 }
79 while (c != '.' && len--) 79 while (c != '.' && len--)
80 c = *name++; 80 c = *name++;
81 if (c == '.') { 81 if (c == '.') {
82 while (walk - res < 8) 82 while (walk - res < 8)
83 *walk++ = ' '; 83 *walk++ = ' ';
84 while (len > 0 && walk - res < 84 while (len > 0 && walk - res < MSDOS_NAME) {
85 c = *name++; 85 c = *name++;
86 len--; 86 len--;
87 if (opts->name_check ! 87 if (opts->name_check != 'r' && strchr(bad_chars, c))
88 return -EINVAL 88 return -EINVAL;
89 if (opts->name_check = 89 if (opts->name_check == 's' &&
90 strchr(bad_if_stri 90 strchr(bad_if_strict, c))
91 return -EINVAL 91 return -EINVAL;
92 if (c < ' ' || c == ': 92 if (c < ' ' || c == ':' || c == '\\')
93 return -EINVAL 93 return -EINVAL;
94 if (c == '.') { 94 if (c == '.') {
95 if (opts->name 95 if (opts->name_check == 's')
96 return 96 return -EINVAL;
97 break; 97 break;
98 } 98 }
99 if (c >= 'A' && c <= ' 99 if (c >= 'A' && c <= 'Z' && opts->name_check == 's')
100 return -EINVAL 100 return -EINVAL;
101 space = c == ' '; 101 space = c == ' ';
102 if (!opts->nocase && c 102 if (!opts->nocase && c >= 'a' && c <= 'z')
103 *walk++ = c - 103 *walk++ = c - 32;
104 else 104 else
105 *walk++ = c; 105 *walk++ = c;
106 } 106 }
107 if (space) 107 if (space)
108 return -EINVAL; 108 return -EINVAL;
109 if (opts->name_check == 's' && 109 if (opts->name_check == 's' && len)
110 return -EINVAL; 110 return -EINVAL;
111 } 111 }
112 while (walk - res < MSDOS_NAME) 112 while (walk - res < MSDOS_NAME)
113 *walk++ = ' '; 113 *walk++ = ' ';
114 114
115 return 0; 115 return 0;
116 } 116 }
117 117
118 /***** Locates a directory entry. Uses unform 118 /***** Locates a directory entry. Uses unformatted name. */
119 static int msdos_find(struct inode *dir, const 119 static int msdos_find(struct inode *dir, const unsigned char *name, int len,
120 struct fat_slot_info *si 120 struct fat_slot_info *sinfo)
121 { 121 {
122 struct msdos_sb_info *sbi = MSDOS_SB(d 122 struct msdos_sb_info *sbi = MSDOS_SB(dir->i_sb);
123 unsigned char msdos_name[MSDOS_NAME]; 123 unsigned char msdos_name[MSDOS_NAME];
124 int err; 124 int err;
125 125
126 err = msdos_format_name(name, len, msd 126 err = msdos_format_name(name, len, msdos_name, &sbi->options);
127 if (err) 127 if (err)
128 return -ENOENT; 128 return -ENOENT;
129 129
130 err = fat_scan(dir, msdos_name, sinfo) 130 err = fat_scan(dir, msdos_name, sinfo);
131 if (!err && sbi->options.dotsOK) { 131 if (!err && sbi->options.dotsOK) {
132 if (name[0] == '.') { 132 if (name[0] == '.') {
133 if (!(sinfo->de->attr 133 if (!(sinfo->de->attr & ATTR_HIDDEN))
134 err = -ENOENT; 134 err = -ENOENT;
135 } else { 135 } else {
136 if (sinfo->de->attr & 136 if (sinfo->de->attr & ATTR_HIDDEN)
137 err = -ENOENT; 137 err = -ENOENT;
138 } 138 }
139 if (err) 139 if (err)
140 brelse(sinfo->bh); 140 brelse(sinfo->bh);
141 } 141 }
142 return err; 142 return err;
143 } 143 }
144 144
145 /* 145 /*
146 * Compute the hash for the msdos name corresp 146 * Compute the hash for the msdos name corresponding to the dentry.
147 * Note: if the name is invalid, we leave the 147 * Note: if the name is invalid, we leave the hash code unchanged so
148 * that the existing dentry can be used. The m 148 * that the existing dentry can be used. The msdos fs routines will
149 * return ENOENT or EINVAL as appropriate. 149 * return ENOENT or EINVAL as appropriate.
150 */ 150 */
151 static int msdos_hash(const struct dentry *den !! 151 static int msdos_hash(struct dentry *dentry, struct qstr *qstr)
152 { 152 {
153 struct fat_mount_options *options = &M 153 struct fat_mount_options *options = &MSDOS_SB(dentry->d_sb)->options;
154 unsigned char msdos_name[MSDOS_NAME]; 154 unsigned char msdos_name[MSDOS_NAME];
155 int error; 155 int error;
156 156
157 error = msdos_format_name(qstr->name, 157 error = msdos_format_name(qstr->name, qstr->len, msdos_name, options);
158 if (!error) 158 if (!error)
159 qstr->hash = full_name_hash(de !! 159 qstr->hash = full_name_hash(msdos_name, MSDOS_NAME);
160 return 0; 160 return 0;
161 } 161 }
162 162
163 /* 163 /*
164 * Compare two msdos names. If either of the n 164 * Compare two msdos names. If either of the names are invalid,
165 * we fall back to doing the standard name com 165 * we fall back to doing the standard name comparison.
166 */ 166 */
167 static int msdos_cmp(const struct dentry *dent !! 167 static int msdos_cmp(struct dentry *dentry, struct qstr *a, struct qstr *b)
168 unsigned int len, const char * <<
169 { 168 {
170 struct fat_mount_options *options = &M 169 struct fat_mount_options *options = &MSDOS_SB(dentry->d_sb)->options;
171 unsigned char a_msdos_name[MSDOS_NAME] 170 unsigned char a_msdos_name[MSDOS_NAME], b_msdos_name[MSDOS_NAME];
172 int error; 171 int error;
173 172
174 error = msdos_format_name(name->name, !! 173 error = msdos_format_name(a->name, a->len, a_msdos_name, options);
175 if (error) 174 if (error)
176 goto old_compare; 175 goto old_compare;
177 error = msdos_format_name(str, len, b_ !! 176 error = msdos_format_name(b->name, b->len, b_msdos_name, options);
178 if (error) 177 if (error)
179 goto old_compare; 178 goto old_compare;
180 error = memcmp(a_msdos_name, b_msdos_n 179 error = memcmp(a_msdos_name, b_msdos_name, MSDOS_NAME);
181 out: 180 out:
182 return error; 181 return error;
183 182
184 old_compare: 183 old_compare:
185 error = 1; 184 error = 1;
186 if (name->len == len) !! 185 if (a->len == b->len)
187 error = memcmp(name->name, str !! 186 error = memcmp(a->name, b->name, a->len);
188 goto out; 187 goto out;
189 } 188 }
190 189
191 static const struct dentry_operations msdos_de 190 static const struct dentry_operations msdos_dentry_operations = {
192 .d_hash = msdos_hash, 191 .d_hash = msdos_hash,
193 .d_compare = msdos_cmp, 192 .d_compare = msdos_cmp,
194 }; 193 };
195 194
196 /* 195 /*
197 * AV. Wrappers for FAT sb operations. Is it w 196 * AV. Wrappers for FAT sb operations. Is it wise?
198 */ 197 */
199 198
200 /***** Get inode using directory and name */ 199 /***** Get inode using directory and name */
201 static struct dentry *msdos_lookup(struct inod 200 static struct dentry *msdos_lookup(struct inode *dir, struct dentry *dentry,
202 unsigned in !! 201 struct nameidata *nd)
203 { 202 {
204 struct super_block *sb = dir->i_sb; 203 struct super_block *sb = dir->i_sb;
205 struct fat_slot_info sinfo; 204 struct fat_slot_info sinfo;
206 struct inode *inode; 205 struct inode *inode;
207 int err; 206 int err;
208 207
209 mutex_lock(&MSDOS_SB(sb)->s_lock); !! 208 lock_super(sb);
>> 209
210 err = msdos_find(dir, dentry->d_name.n 210 err = msdos_find(dir, dentry->d_name.name, dentry->d_name.len, &sinfo);
211 switch (err) { !! 211 if (err) {
212 case -ENOENT: !! 212 if (err == -ENOENT) {
213 inode = NULL; !! 213 inode = NULL;
214 break; !! 214 goto out;
215 case 0: !! 215 }
216 inode = fat_build_inode(sb, si !! 216 goto error;
217 brelse(sinfo.bh); !! 217 }
218 break; !! 218
219 default: !! 219 inode = fat_build_inode(sb, sinfo.de, sinfo.i_pos);
220 inode = ERR_PTR(err); !! 220 brelse(sinfo.bh);
>> 221 if (IS_ERR(inode)) {
>> 222 err = PTR_ERR(inode);
>> 223 goto error;
221 } 224 }
222 mutex_unlock(&MSDOS_SB(sb)->s_lock); !! 225 out:
223 return d_splice_alias(inode, dentry); !! 226 unlock_super(sb);
>> 227 dentry->d_op = &msdos_dentry_operations;
>> 228 dentry = d_splice_alias(inode, dentry);
>> 229 if (dentry)
>> 230 dentry->d_op = &msdos_dentry_operations;
>> 231 return dentry;
>> 232
>> 233 error:
>> 234 unlock_super(sb);
>> 235 return ERR_PTR(err);
224 } 236 }
225 237
226 /***** Creates a directory entry (name is alre 238 /***** Creates a directory entry (name is already formatted). */
227 static int msdos_add_entry(struct inode *dir, 239 static int msdos_add_entry(struct inode *dir, const unsigned char *name,
228 int is_dir, int is_ 240 int is_dir, int is_hid, int cluster,
229 struct timespec64 * !! 241 struct timespec *ts, struct fat_slot_info *sinfo)
230 { 242 {
231 struct msdos_sb_info *sbi = MSDOS_SB(d 243 struct msdos_sb_info *sbi = MSDOS_SB(dir->i_sb);
232 struct msdos_dir_entry de; 244 struct msdos_dir_entry de;
233 __le16 time, date; 245 __le16 time, date;
234 int err; 246 int err;
235 247
236 memcpy(de.name, name, MSDOS_NAME); 248 memcpy(de.name, name, MSDOS_NAME);
237 de.attr = is_dir ? ATTR_DIR : ATTR_ARC 249 de.attr = is_dir ? ATTR_DIR : ATTR_ARCH;
238 if (is_hid) 250 if (is_hid)
239 de.attr |= ATTR_HIDDEN; 251 de.attr |= ATTR_HIDDEN;
240 de.lcase = 0; 252 de.lcase = 0;
241 fat_time_unix2fat(sbi, ts, &time, &dat 253 fat_time_unix2fat(sbi, ts, &time, &date, NULL);
242 de.cdate = de.adate = 0; 254 de.cdate = de.adate = 0;
243 de.ctime = 0; 255 de.ctime = 0;
244 de.ctime_cs = 0; 256 de.ctime_cs = 0;
245 de.time = time; 257 de.time = time;
246 de.date = date; 258 de.date = date;
247 fat_set_start(&de, cluster); !! 259 de.start = cpu_to_le16(cluster);
>> 260 de.starthi = cpu_to_le16(cluster >> 16);
248 de.size = 0; 261 de.size = 0;
249 262
250 err = fat_add_entries(dir, &de, 1, sin 263 err = fat_add_entries(dir, &de, 1, sinfo);
251 if (err) 264 if (err)
252 return err; 265 return err;
253 266
254 fat_truncate_time(dir, ts, S_CTIME|S_M !! 267 dir->i_ctime = dir->i_mtime = *ts;
255 if (IS_DIRSYNC(dir)) 268 if (IS_DIRSYNC(dir))
256 (void)fat_sync_inode(dir); 269 (void)fat_sync_inode(dir);
257 else 270 else
258 mark_inode_dirty(dir); 271 mark_inode_dirty(dir);
259 272
260 return 0; 273 return 0;
261 } 274 }
262 275
263 /***** Create a file */ 276 /***** Create a file */
264 static int msdos_create(struct mnt_idmap *idma !! 277 static int msdos_create(struct inode *dir, struct dentry *dentry, int mode,
265 struct dentry *dentry, !! 278 struct nameidata *nd)
266 { 279 {
267 struct super_block *sb = dir->i_sb; 280 struct super_block *sb = dir->i_sb;
268 struct inode *inode = NULL; 281 struct inode *inode = NULL;
269 struct fat_slot_info sinfo; 282 struct fat_slot_info sinfo;
270 struct timespec64 ts; !! 283 struct timespec ts;
271 unsigned char msdos_name[MSDOS_NAME]; 284 unsigned char msdos_name[MSDOS_NAME];
272 int err, is_hid; 285 int err, is_hid;
273 286
274 mutex_lock(&MSDOS_SB(sb)->s_lock); !! 287 lock_super(sb);
275 288
276 err = msdos_format_name(dentry->d_name 289 err = msdos_format_name(dentry->d_name.name, dentry->d_name.len,
277 msdos_name, &M 290 msdos_name, &MSDOS_SB(sb)->options);
278 if (err) 291 if (err)
279 goto out; 292 goto out;
280 is_hid = (dentry->d_name.name[0] == '. 293 is_hid = (dentry->d_name.name[0] == '.') && (msdos_name[0] != '.');
281 /* Have to do it due to foo vs. .foo c 294 /* Have to do it due to foo vs. .foo conflicts */
282 if (!fat_scan(dir, msdos_name, &sinfo) 295 if (!fat_scan(dir, msdos_name, &sinfo)) {
283 brelse(sinfo.bh); 296 brelse(sinfo.bh);
284 err = -EINVAL; 297 err = -EINVAL;
285 goto out; 298 goto out;
286 } 299 }
287 300
288 ts = current_time(dir); !! 301 ts = CURRENT_TIME_SEC;
289 err = msdos_add_entry(dir, msdos_name, 302 err = msdos_add_entry(dir, msdos_name, 0, is_hid, 0, &ts, &sinfo);
290 if (err) 303 if (err)
291 goto out; 304 goto out;
292 inode = fat_build_inode(sb, sinfo.de, 305 inode = fat_build_inode(sb, sinfo.de, sinfo.i_pos);
293 brelse(sinfo.bh); 306 brelse(sinfo.bh);
294 if (IS_ERR(inode)) { 307 if (IS_ERR(inode)) {
295 err = PTR_ERR(inode); 308 err = PTR_ERR(inode);
296 goto out; 309 goto out;
297 } 310 }
298 fat_truncate_time(inode, &ts, S_ATIME| !! 311 inode->i_mtime = inode->i_atime = inode->i_ctime = ts;
299 /* timestamp is already written, so ma 312 /* timestamp is already written, so mark_inode_dirty() is unneeded. */
300 313
301 d_instantiate(dentry, inode); 314 d_instantiate(dentry, inode);
302 out: 315 out:
303 mutex_unlock(&MSDOS_SB(sb)->s_lock); !! 316 unlock_super(sb);
304 if (!err) 317 if (!err)
305 err = fat_flush_inodes(sb, dir 318 err = fat_flush_inodes(sb, dir, inode);
306 return err; 319 return err;
307 } 320 }
308 321
309 /***** Remove a directory */ 322 /***** Remove a directory */
310 static int msdos_rmdir(struct inode *dir, stru 323 static int msdos_rmdir(struct inode *dir, struct dentry *dentry)
311 { 324 {
312 struct super_block *sb = dir->i_sb; 325 struct super_block *sb = dir->i_sb;
313 struct inode *inode = d_inode(dentry); !! 326 struct inode *inode = dentry->d_inode;
314 struct fat_slot_info sinfo; 327 struct fat_slot_info sinfo;
315 int err; 328 int err;
316 329
317 mutex_lock(&MSDOS_SB(sb)->s_lock); !! 330 lock_super(sb);
>> 331 /*
>> 332 * Check whether the directory is not in use, then check
>> 333 * whether it is empty.
>> 334 */
318 err = fat_dir_empty(inode); 335 err = fat_dir_empty(inode);
319 if (err) 336 if (err)
320 goto out; 337 goto out;
321 err = msdos_find(dir, dentry->d_name.n 338 err = msdos_find(dir, dentry->d_name.name, dentry->d_name.len, &sinfo);
322 if (err) 339 if (err)
323 goto out; 340 goto out;
324 341
325 err = fat_remove_entries(dir, &sinfo); 342 err = fat_remove_entries(dir, &sinfo); /* and releases bh */
326 if (err) 343 if (err)
327 goto out; 344 goto out;
328 drop_nlink(dir); 345 drop_nlink(dir);
329 346
330 clear_nlink(inode); 347 clear_nlink(inode);
331 fat_truncate_time(inode, NULL, S_CTIME !! 348 inode->i_ctime = CURRENT_TIME_SEC;
332 fat_detach(inode); 349 fat_detach(inode);
333 out: 350 out:
334 mutex_unlock(&MSDOS_SB(sb)->s_lock); !! 351 unlock_super(sb);
335 if (!err) 352 if (!err)
336 err = fat_flush_inodes(sb, dir 353 err = fat_flush_inodes(sb, dir, inode);
337 354
338 return err; 355 return err;
339 } 356 }
340 357
341 /***** Make a directory */ 358 /***** Make a directory */
342 static int msdos_mkdir(struct mnt_idmap *idmap !! 359 static int msdos_mkdir(struct inode *dir, struct dentry *dentry, int mode)
343 struct dentry *dentry, <<
344 { 360 {
345 struct super_block *sb = dir->i_sb; 361 struct super_block *sb = dir->i_sb;
346 struct fat_slot_info sinfo; 362 struct fat_slot_info sinfo;
347 struct inode *inode; 363 struct inode *inode;
348 unsigned char msdos_name[MSDOS_NAME]; 364 unsigned char msdos_name[MSDOS_NAME];
349 struct timespec64 ts; !! 365 struct timespec ts;
350 int err, is_hid, cluster; 366 int err, is_hid, cluster;
351 367
352 mutex_lock(&MSDOS_SB(sb)->s_lock); !! 368 lock_super(sb);
353 369
354 err = msdos_format_name(dentry->d_name 370 err = msdos_format_name(dentry->d_name.name, dentry->d_name.len,
355 msdos_name, &M 371 msdos_name, &MSDOS_SB(sb)->options);
356 if (err) 372 if (err)
357 goto out; 373 goto out;
358 is_hid = (dentry->d_name.name[0] == '. 374 is_hid = (dentry->d_name.name[0] == '.') && (msdos_name[0] != '.');
359 /* foo vs .foo situation */ 375 /* foo vs .foo situation */
360 if (!fat_scan(dir, msdos_name, &sinfo) 376 if (!fat_scan(dir, msdos_name, &sinfo)) {
361 brelse(sinfo.bh); 377 brelse(sinfo.bh);
362 err = -EINVAL; 378 err = -EINVAL;
363 goto out; 379 goto out;
364 } 380 }
365 381
366 ts = current_time(dir); !! 382 ts = CURRENT_TIME_SEC;
367 cluster = fat_alloc_new_dir(dir, &ts); 383 cluster = fat_alloc_new_dir(dir, &ts);
368 if (cluster < 0) { 384 if (cluster < 0) {
369 err = cluster; 385 err = cluster;
370 goto out; 386 goto out;
371 } 387 }
372 err = msdos_add_entry(dir, msdos_name, 388 err = msdos_add_entry(dir, msdos_name, 1, is_hid, cluster, &ts, &sinfo);
373 if (err) 389 if (err)
374 goto out_free; 390 goto out_free;
375 inc_nlink(dir); 391 inc_nlink(dir);
376 392
377 inode = fat_build_inode(sb, sinfo.de, 393 inode = fat_build_inode(sb, sinfo.de, sinfo.i_pos);
378 brelse(sinfo.bh); 394 brelse(sinfo.bh);
379 if (IS_ERR(inode)) { 395 if (IS_ERR(inode)) {
380 err = PTR_ERR(inode); 396 err = PTR_ERR(inode);
381 /* the directory was completed 397 /* the directory was completed, just return a error */
382 goto out; 398 goto out;
383 } 399 }
384 set_nlink(inode, 2); !! 400 inode->i_nlink = 2;
385 fat_truncate_time(inode, &ts, S_ATIME| !! 401 inode->i_mtime = inode->i_atime = inode->i_ctime = ts;
386 /* timestamp is already written, so ma 402 /* timestamp is already written, so mark_inode_dirty() is unneeded. */
387 403
388 d_instantiate(dentry, inode); 404 d_instantiate(dentry, inode);
389 405
390 mutex_unlock(&MSDOS_SB(sb)->s_lock); !! 406 unlock_super(sb);
391 fat_flush_inodes(sb, dir, inode); 407 fat_flush_inodes(sb, dir, inode);
392 return 0; 408 return 0;
393 409
394 out_free: 410 out_free:
395 fat_free_clusters(dir, cluster); 411 fat_free_clusters(dir, cluster);
396 out: 412 out:
397 mutex_unlock(&MSDOS_SB(sb)->s_lock); !! 413 unlock_super(sb);
398 return err; 414 return err;
399 } 415 }
400 416
401 /***** Unlink a file */ 417 /***** Unlink a file */
402 static int msdos_unlink(struct inode *dir, str 418 static int msdos_unlink(struct inode *dir, struct dentry *dentry)
403 { 419 {
404 struct inode *inode = d_inode(dentry); !! 420 struct inode *inode = dentry->d_inode;
405 struct super_block *sb = inode->i_sb; !! 421 struct super_block *sb= inode->i_sb;
406 struct fat_slot_info sinfo; 422 struct fat_slot_info sinfo;
407 int err; 423 int err;
408 424
409 mutex_lock(&MSDOS_SB(sb)->s_lock); !! 425 lock_super(sb);
410 err = msdos_find(dir, dentry->d_name.n 426 err = msdos_find(dir, dentry->d_name.name, dentry->d_name.len, &sinfo);
411 if (err) 427 if (err)
412 goto out; 428 goto out;
413 429
414 err = fat_remove_entries(dir, &sinfo); 430 err = fat_remove_entries(dir, &sinfo); /* and releases bh */
415 if (err) 431 if (err)
416 goto out; 432 goto out;
417 clear_nlink(inode); 433 clear_nlink(inode);
418 fat_truncate_time(inode, NULL, S_CTIME !! 434 inode->i_ctime = CURRENT_TIME_SEC;
419 fat_detach(inode); 435 fat_detach(inode);
420 out: 436 out:
421 mutex_unlock(&MSDOS_SB(sb)->s_lock); !! 437 unlock_super(sb);
422 if (!err) 438 if (!err)
423 err = fat_flush_inodes(sb, dir 439 err = fat_flush_inodes(sb, dir, inode);
424 440
425 return err; 441 return err;
426 } 442 }
427 443
428 static int do_msdos_rename(struct inode *old_d 444 static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name,
429 struct dentry *old_ 445 struct dentry *old_dentry,
430 struct inode *new_d 446 struct inode *new_dir, unsigned char *new_name,
431 struct dentry *new_ 447 struct dentry *new_dentry, int is_hid)
432 { 448 {
433 struct buffer_head *dotdot_bh; 449 struct buffer_head *dotdot_bh;
434 struct msdos_dir_entry *dotdot_de; 450 struct msdos_dir_entry *dotdot_de;
435 struct inode *old_inode, *new_inode; 451 struct inode *old_inode, *new_inode;
436 struct fat_slot_info old_sinfo, sinfo; 452 struct fat_slot_info old_sinfo, sinfo;
437 struct timespec64 ts; !! 453 struct timespec ts;
438 loff_t new_i_pos; !! 454 loff_t dotdot_i_pos, new_i_pos;
439 int err, old_attrs, is_dir, update_dot 455 int err, old_attrs, is_dir, update_dotdot, corrupt = 0;
440 456
441 old_sinfo.bh = sinfo.bh = dotdot_bh = 457 old_sinfo.bh = sinfo.bh = dotdot_bh = NULL;
442 old_inode = d_inode(old_dentry); !! 458 old_inode = old_dentry->d_inode;
443 new_inode = d_inode(new_dentry); !! 459 new_inode = new_dentry->d_inode;
444 460
445 err = fat_scan(old_dir, old_name, &old 461 err = fat_scan(old_dir, old_name, &old_sinfo);
446 if (err) { 462 if (err) {
447 err = -EIO; 463 err = -EIO;
448 goto out; 464 goto out;
449 } 465 }
450 466
451 is_dir = S_ISDIR(old_inode->i_mode); 467 is_dir = S_ISDIR(old_inode->i_mode);
452 update_dotdot = (is_dir && old_dir != 468 update_dotdot = (is_dir && old_dir != new_dir);
453 if (update_dotdot) { 469 if (update_dotdot) {
454 if (fat_get_dotdot_entry(old_i !! 470 if (fat_get_dotdot_entry(old_inode, &dotdot_bh, &dotdot_de,
>> 471 &dotdot_i_pos) < 0) {
455 err = -EIO; 472 err = -EIO;
456 goto out; 473 goto out;
457 } 474 }
458 } 475 }
459 476
460 old_attrs = MSDOS_I(old_inode)->i_attr 477 old_attrs = MSDOS_I(old_inode)->i_attrs;
461 err = fat_scan(new_dir, new_name, &sin 478 err = fat_scan(new_dir, new_name, &sinfo);
462 if (!err) { 479 if (!err) {
463 if (!new_inode) { 480 if (!new_inode) {
464 /* "foo" -> ".foo" cas 481 /* "foo" -> ".foo" case. just change the ATTR_HIDDEN */
465 if (sinfo.de != old_si 482 if (sinfo.de != old_sinfo.de) {
466 err = -EINVAL; 483 err = -EINVAL;
467 goto out; 484 goto out;
468 } 485 }
469 if (is_hid) 486 if (is_hid)
470 MSDOS_I(old_in 487 MSDOS_I(old_inode)->i_attrs |= ATTR_HIDDEN;
471 else 488 else
472 MSDOS_I(old_in 489 MSDOS_I(old_inode)->i_attrs &= ~ATTR_HIDDEN;
473 if (IS_DIRSYNC(old_dir 490 if (IS_DIRSYNC(old_dir)) {
474 err = fat_sync 491 err = fat_sync_inode(old_inode);
475 if (err) { 492 if (err) {
476 MSDOS_ 493 MSDOS_I(old_inode)->i_attrs = old_attrs;
477 goto o 494 goto out;
478 } 495 }
479 } else 496 } else
480 mark_inode_dir 497 mark_inode_dirty(old_inode);
481 498
482 inode_inc_iversion(old !! 499 old_dir->i_version++;
483 fat_truncate_time(old_ !! 500 old_dir->i_ctime = old_dir->i_mtime = CURRENT_TIME_SEC;
484 if (IS_DIRSYNC(old_dir 501 if (IS_DIRSYNC(old_dir))
485 (void)fat_sync 502 (void)fat_sync_inode(old_dir);
486 else 503 else
487 mark_inode_dir 504 mark_inode_dirty(old_dir);
488 goto out; 505 goto out;
489 } 506 }
490 } 507 }
491 508
492 ts = current_time(old_inode); !! 509 ts = CURRENT_TIME_SEC;
493 if (new_inode) { 510 if (new_inode) {
494 if (err) 511 if (err)
495 goto out; 512 goto out;
496 if (is_dir) { 513 if (is_dir) {
497 err = fat_dir_empty(ne 514 err = fat_dir_empty(new_inode);
498 if (err) 515 if (err)
499 goto out; 516 goto out;
500 } 517 }
501 new_i_pos = MSDOS_I(new_inode) 518 new_i_pos = MSDOS_I(new_inode)->i_pos;
502 fat_detach(new_inode); 519 fat_detach(new_inode);
503 } else { 520 } else {
504 err = msdos_add_entry(new_dir, 521 err = msdos_add_entry(new_dir, new_name, is_dir, is_hid, 0,
505 &ts, &si 522 &ts, &sinfo);
506 if (err) 523 if (err)
507 goto out; 524 goto out;
508 new_i_pos = sinfo.i_pos; 525 new_i_pos = sinfo.i_pos;
509 } 526 }
510 inode_inc_iversion(new_dir); !! 527 new_dir->i_version++;
511 528
512 fat_detach(old_inode); 529 fat_detach(old_inode);
513 fat_attach(old_inode, new_i_pos); 530 fat_attach(old_inode, new_i_pos);
514 if (is_hid) 531 if (is_hid)
515 MSDOS_I(old_inode)->i_attrs |= 532 MSDOS_I(old_inode)->i_attrs |= ATTR_HIDDEN;
516 else 533 else
517 MSDOS_I(old_inode)->i_attrs &= 534 MSDOS_I(old_inode)->i_attrs &= ~ATTR_HIDDEN;
518 if (IS_DIRSYNC(new_dir)) { 535 if (IS_DIRSYNC(new_dir)) {
519 err = fat_sync_inode(old_inode 536 err = fat_sync_inode(old_inode);
520 if (err) 537 if (err)
521 goto error_inode; 538 goto error_inode;
522 } else 539 } else
523 mark_inode_dirty(old_inode); 540 mark_inode_dirty(old_inode);
524 541
525 if (update_dotdot) { 542 if (update_dotdot) {
526 fat_set_start(dotdot_de, MSDOS !! 543 int start = MSDOS_I(new_dir)->i_logstart;
>> 544 dotdot_de->start = cpu_to_le16(start);
>> 545 dotdot_de->starthi = cpu_to_le16(start >> 16);
527 mark_buffer_dirty_inode(dotdot 546 mark_buffer_dirty_inode(dotdot_bh, old_inode);
528 if (IS_DIRSYNC(new_dir)) { 547 if (IS_DIRSYNC(new_dir)) {
529 err = sync_dirty_buffe 548 err = sync_dirty_buffer(dotdot_bh);
530 if (err) 549 if (err)
531 goto error_dot 550 goto error_dotdot;
532 } 551 }
533 drop_nlink(old_dir); 552 drop_nlink(old_dir);
534 if (!new_inode) 553 if (!new_inode)
535 inc_nlink(new_dir); 554 inc_nlink(new_dir);
536 } 555 }
537 556
538 err = fat_remove_entries(old_dir, &old 557 err = fat_remove_entries(old_dir, &old_sinfo); /* and releases bh */
539 old_sinfo.bh = NULL; 558 old_sinfo.bh = NULL;
540 if (err) 559 if (err)
541 goto error_dotdot; 560 goto error_dotdot;
542 inode_inc_iversion(old_dir); !! 561 old_dir->i_version++;
543 fat_truncate_time(old_dir, &ts, S_CTIM !! 562 old_dir->i_ctime = old_dir->i_mtime = ts;
544 if (IS_DIRSYNC(old_dir)) 563 if (IS_DIRSYNC(old_dir))
545 (void)fat_sync_inode(old_dir); 564 (void)fat_sync_inode(old_dir);
546 else 565 else
547 mark_inode_dirty(old_dir); 566 mark_inode_dirty(old_dir);
548 567
549 if (new_inode) { 568 if (new_inode) {
550 drop_nlink(new_inode); 569 drop_nlink(new_inode);
551 if (is_dir) 570 if (is_dir)
552 drop_nlink(new_inode); 571 drop_nlink(new_inode);
553 fat_truncate_time(new_inode, & !! 572 new_inode->i_ctime = ts;
554 } 573 }
555 out: 574 out:
556 brelse(sinfo.bh); 575 brelse(sinfo.bh);
557 brelse(dotdot_bh); 576 brelse(dotdot_bh);
558 brelse(old_sinfo.bh); 577 brelse(old_sinfo.bh);
559 return err; 578 return err;
560 579
561 error_dotdot: 580 error_dotdot:
562 /* data cluster is shared, serious cor 581 /* data cluster is shared, serious corruption */
563 corrupt = 1; 582 corrupt = 1;
564 583
565 if (update_dotdot) { 584 if (update_dotdot) {
566 fat_set_start(dotdot_de, MSDOS !! 585 int start = MSDOS_I(old_dir)->i_logstart;
>> 586 dotdot_de->start = cpu_to_le16(start);
>> 587 dotdot_de->starthi = cpu_to_le16(start >> 16);
567 mark_buffer_dirty_inode(dotdot 588 mark_buffer_dirty_inode(dotdot_bh, old_inode);
568 corrupt |= sync_dirty_buffer(d 589 corrupt |= sync_dirty_buffer(dotdot_bh);
569 } 590 }
570 error_inode: 591 error_inode:
571 fat_detach(old_inode); 592 fat_detach(old_inode);
572 fat_attach(old_inode, old_sinfo.i_pos) 593 fat_attach(old_inode, old_sinfo.i_pos);
573 MSDOS_I(old_inode)->i_attrs = old_attr 594 MSDOS_I(old_inode)->i_attrs = old_attrs;
574 if (new_inode) { 595 if (new_inode) {
575 fat_attach(new_inode, new_i_po 596 fat_attach(new_inode, new_i_pos);
576 if (corrupt) 597 if (corrupt)
577 corrupt |= fat_sync_in 598 corrupt |= fat_sync_inode(new_inode);
578 } else { 599 } else {
579 /* 600 /*
580 * If new entry was not sharin 601 * If new entry was not sharing the data cluster, it
581 * shouldn't be serious corrup 602 * shouldn't be serious corruption.
582 */ 603 */
583 int err2 = fat_remove_entries( 604 int err2 = fat_remove_entries(new_dir, &sinfo);
584 if (corrupt) 605 if (corrupt)
585 corrupt |= err2; 606 corrupt |= err2;
586 sinfo.bh = NULL; 607 sinfo.bh = NULL;
587 } 608 }
588 if (corrupt < 0) { 609 if (corrupt < 0) {
589 fat_fs_error(new_dir->i_sb, 610 fat_fs_error(new_dir->i_sb,
590 "%s: Filesystem c 611 "%s: Filesystem corrupted (i_pos %lld)",
591 __func__, sinfo.i 612 __func__, sinfo.i_pos);
592 } 613 }
593 goto out; 614 goto out;
594 } 615 }
595 616
596 /***** Rename, a wrapper for rename_same_dir & 617 /***** Rename, a wrapper for rename_same_dir & rename_diff_dir */
597 static int msdos_rename(struct mnt_idmap *idma !! 618 static int msdos_rename(struct inode *old_dir, struct dentry *old_dentry,
598 struct inode *old_dir, !! 619 struct inode *new_dir, struct dentry *new_dentry)
599 struct inode *new_dir, <<
600 unsigned int flags) <<
601 { 620 {
602 struct super_block *sb = old_dir->i_sb 621 struct super_block *sb = old_dir->i_sb;
603 unsigned char old_msdos_name[MSDOS_NAM 622 unsigned char old_msdos_name[MSDOS_NAME], new_msdos_name[MSDOS_NAME];
604 int err, is_hid; 623 int err, is_hid;
605 624
606 if (flags & ~RENAME_NOREPLACE) !! 625 lock_super(sb);
607 return -EINVAL; <<
608 <<
609 mutex_lock(&MSDOS_SB(sb)->s_lock); <<
610 626
611 err = msdos_format_name(old_dentry->d_ 627 err = msdos_format_name(old_dentry->d_name.name,
612 old_dentry->d_ 628 old_dentry->d_name.len, old_msdos_name,
613 &MSDOS_SB(old_ 629 &MSDOS_SB(old_dir->i_sb)->options);
614 if (err) 630 if (err)
615 goto out; 631 goto out;
616 err = msdos_format_name(new_dentry->d_ 632 err = msdos_format_name(new_dentry->d_name.name,
617 new_dentry->d_ 633 new_dentry->d_name.len, new_msdos_name,
618 &MSDOS_SB(new_ 634 &MSDOS_SB(new_dir->i_sb)->options);
619 if (err) 635 if (err)
620 goto out; 636 goto out;
621 637
622 is_hid = 638 is_hid =
623 (new_dentry->d_name.name[0] == '. 639 (new_dentry->d_name.name[0] == '.') && (new_msdos_name[0] != '.');
624 640
625 err = do_msdos_rename(old_dir, old_msd 641 err = do_msdos_rename(old_dir, old_msdos_name, old_dentry,
626 new_dir, new_msd 642 new_dir, new_msdos_name, new_dentry, is_hid);
627 out: 643 out:
628 mutex_unlock(&MSDOS_SB(sb)->s_lock); !! 644 unlock_super(sb);
629 if (!err) 645 if (!err)
630 err = fat_flush_inodes(sb, old 646 err = fat_flush_inodes(sb, old_dir, new_dir);
631 return err; 647 return err;
632 } 648 }
633 649
634 static const struct inode_operations msdos_dir 650 static const struct inode_operations msdos_dir_inode_operations = {
635 .create = msdos_create, 651 .create = msdos_create,
636 .lookup = msdos_lookup, 652 .lookup = msdos_lookup,
637 .unlink = msdos_unlink, 653 .unlink = msdos_unlink,
638 .mkdir = msdos_mkdir, 654 .mkdir = msdos_mkdir,
639 .rmdir = msdos_rmdir, 655 .rmdir = msdos_rmdir,
640 .rename = msdos_rename, 656 .rename = msdos_rename,
641 .setattr = fat_setattr, 657 .setattr = fat_setattr,
642 .getattr = fat_getattr, 658 .getattr = fat_getattr,
643 .update_time = fat_update_time, <<
644 }; 659 };
645 660
646 static void setup(struct super_block *sb) !! 661 static int msdos_fill_super(struct super_block *sb, void *data, int silent)
647 { 662 {
648 MSDOS_SB(sb)->dir_ops = &msdos_dir_ino !! 663 int res;
649 sb->s_d_op = &msdos_dentry_operations; <<
650 sb->s_flags |= SB_NOATIME; <<
651 } <<
652 <<
653 static int msdos_fill_super(struct super_block <<
654 { <<
655 return fat_fill_super(sb, fc, setup); <<
656 } <<
657 664
658 static int msdos_get_tree(struct fs_context *f !! 665 res = fat_fill_super(sb, data, silent, &msdos_dir_inode_operations, 0);
659 { !! 666 if (res)
660 return get_tree_bdev(fc, msdos_fill_su !! 667 return res;
661 } <<
662 668
663 static int msdos_parse_param(struct fs_context !! 669 sb->s_flags |= MS_NOATIME;
664 { !! 670 sb->s_root->d_op = &msdos_dentry_operations;
665 return fat_parse_param(fc, param, fals !! 671 return 0;
666 } 672 }
667 673
668 static const struct fs_context_operations msdo !! 674 static int msdos_get_sb(struct file_system_type *fs_type,
669 .parse_param = msdos_parse_param, !! 675 int flags, const char *dev_name,
670 .get_tree = msdos_get_tree, !! 676 void *data, struct vfsmount *mnt)
671 .reconfigure = fat_reconfigure, <<
672 .free = fat_free_fc, <<
673 }; <<
674 <<
675 static int msdos_init_fs_context(struct fs_con <<
676 { 677 {
677 int err; !! 678 return get_sb_bdev(fs_type, flags, dev_name, data, msdos_fill_super,
678 !! 679 mnt);
679 /* Initialize with is_vfat == false */ <<
680 err = fat_init_fs_context(fc, false); <<
681 if (err) <<
682 return err; <<
683 <<
684 fc->ops = &msdos_context_ops; <<
685 return 0; <<
686 } 680 }
687 681
688 static struct file_system_type msdos_fs_type = 682 static struct file_system_type msdos_fs_type = {
689 .owner = THIS_MODULE, 683 .owner = THIS_MODULE,
690 .name = "msdos", 684 .name = "msdos",
>> 685 .get_sb = msdos_get_sb,
691 .kill_sb = kill_block_super, 686 .kill_sb = kill_block_super,
692 .fs_flags = FS_REQUIRES_DEV | FS !! 687 .fs_flags = FS_REQUIRES_DEV,
693 .init_fs_context = msdos_init_fs_conte <<
694 .parameters = fat_param_spec, <<
695 }; 688 };
696 MODULE_ALIAS_FS("msdos"); <<
697 689
698 static int __init init_msdos_fs(void) 690 static int __init init_msdos_fs(void)
699 { 691 {
700 return register_filesystem(&msdos_fs_t 692 return register_filesystem(&msdos_fs_type);
701 } 693 }
702 694
703 static void __exit exit_msdos_fs(void) 695 static void __exit exit_msdos_fs(void)
704 { 696 {
705 unregister_filesystem(&msdos_fs_type); 697 unregister_filesystem(&msdos_fs_type);
706 } 698 }
707 699
708 MODULE_LICENSE("GPL"); 700 MODULE_LICENSE("GPL");
709 MODULE_AUTHOR("Werner Almesberger"); 701 MODULE_AUTHOR("Werner Almesberger");
710 MODULE_DESCRIPTION("MS-DOS filesystem support" 702 MODULE_DESCRIPTION("MS-DOS filesystem support");
711 703
712 module_init(init_msdos_fs) 704 module_init(init_msdos_fs)
713 module_exit(exit_msdos_fs) 705 module_exit(exit_msdos_fs)
714 706
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.