Diff markup
1 /* 1 /*
2 * linux/fs/ext2/dir.c 2 * linux/fs/ext2/dir.c
3 * 3 *
4 * Copyright (C) 1992, 1993, 1994, 1995 4 * Copyright (C) 1992, 1993, 1994, 1995
5 * Remy Card (card@masi.ibp.fr) 5 * Remy Card (card@masi.ibp.fr)
6 * Laboratoire MASI - Institut Blaise Pascal 6 * Laboratoire MASI - Institut Blaise Pascal
7 * Universite Pierre et Marie Curie (Paris VI) 7 * Universite Pierre et Marie Curie (Paris VI)
8 * 8 *
9 * from 9 * from
10 * 10 *
11 * linux/fs/minix/dir.c 11 * linux/fs/minix/dir.c
12 * 12 *
13 * Copyright (C) 1991, 1992 Linus Torvalds 13 * Copyright (C) 1991, 1992 Linus Torvalds
14 * 14 *
15 * ext2 directory handling functions 15 * ext2 directory handling functions
16 * 16 *
17 * Big-endian to little-endian byte-swapping/ 17 * Big-endian to little-endian byte-swapping/bitmaps by
18 * David S. Miller (davem@caip.rutgers. 18 * David S. Miller (davem@caip.rutgers.edu), 1995
19 * 19 *
20 * All code that works with directory layout h 20 * All code that works with directory layout had been switched to pagecache
21 * and moved here. AV 21 * and moved here. AV
22 */ 22 */
23 23
24 #include "ext2.h" 24 #include "ext2.h"
>> 25 #include <linux/buffer_head.h>
25 #include <linux/pagemap.h> 26 #include <linux/pagemap.h>
26 #include <linux/smp_lock.h> !! 27 #include <linux/swap.h>
27 28
28 typedef struct ext2_dir_entry_2 ext2_dirent; 29 typedef struct ext2_dir_entry_2 ext2_dirent;
29 30
>> 31 static inline unsigned ext2_rec_len_from_disk(__le16 dlen)
>> 32 {
>> 33 unsigned len = le16_to_cpu(dlen);
>> 34
>> 35 if (len == EXT2_MAX_REC_LEN)
>> 36 return 1 << 16;
>> 37 return len;
>> 38 }
>> 39
>> 40 static inline __le16 ext2_rec_len_to_disk(unsigned len)
>> 41 {
>> 42 if (len == (1 << 16))
>> 43 return cpu_to_le16(EXT2_MAX_REC_LEN);
>> 44 else if (len > (1 << 16))
>> 45 BUG();
>> 46 return cpu_to_le16(len);
>> 47 }
>> 48
30 /* 49 /*
31 * ext2 uses block-sized chunks. Arguably, sec 50 * ext2 uses block-sized chunks. Arguably, sector-sized ones would be
32 * more robust, but we have what we have 51 * more robust, but we have what we have
33 */ 52 */
34 static inline unsigned ext2_chunk_size(struct 53 static inline unsigned ext2_chunk_size(struct inode *inode)
35 { 54 {
36 return inode->i_sb->s_blocksize; 55 return inode->i_sb->s_blocksize;
37 } 56 }
38 57
39 static inline void ext2_put_page(struct page * 58 static inline void ext2_put_page(struct page *page)
40 { 59 {
41 kunmap(page); 60 kunmap(page);
42 page_cache_release(page); 61 page_cache_release(page);
43 } 62 }
44 63
45 static inline unsigned long dir_pages(struct i 64 static inline unsigned long dir_pages(struct inode *inode)
46 { 65 {
47 return (inode->i_size+PAGE_CACHE_SIZE- 66 return (inode->i_size+PAGE_CACHE_SIZE-1)>>PAGE_CACHE_SHIFT;
48 } 67 }
49 68
50 /* 69 /*
51 * Return the offset into page `page_nr' of th 70 * Return the offset into page `page_nr' of the last valid
52 * byte in that page, plus one. 71 * byte in that page, plus one.
53 */ 72 */
54 static unsigned 73 static unsigned
55 ext2_last_byte(struct inode *inode, unsigned l 74 ext2_last_byte(struct inode *inode, unsigned long page_nr)
56 { 75 {
57 unsigned last_byte = inode->i_size; 76 unsigned last_byte = inode->i_size;
58 77
59 last_byte -= page_nr << PAGE_CACHE_SHI 78 last_byte -= page_nr << PAGE_CACHE_SHIFT;
60 if (last_byte > PAGE_CACHE_SIZE) 79 if (last_byte > PAGE_CACHE_SIZE)
61 last_byte = PAGE_CACHE_SIZE; 80 last_byte = PAGE_CACHE_SIZE;
62 return last_byte; 81 return last_byte;
63 } 82 }
64 83
65 static int ext2_commit_chunk(struct page *page !! 84 static int ext2_commit_chunk(struct page *page, loff_t pos, unsigned len)
66 { 85 {
67 struct inode *dir = page->mapping->hos !! 86 struct address_space *mapping = page->mapping;
>> 87 struct inode *dir = mapping->host;
68 int err = 0; 88 int err = 0;
>> 89
69 dir->i_version++; 90 dir->i_version++;
70 page->mapping->a_ops->commit_write(NUL !! 91 block_write_end(NULL, mapping, pos, len, len, page, NULL);
>> 92
>> 93 if (pos+len > dir->i_size) {
>> 94 i_size_write(dir, pos+len);
>> 95 mark_inode_dirty(dir);
>> 96 }
>> 97
71 if (IS_DIRSYNC(dir)) 98 if (IS_DIRSYNC(dir))
72 err = write_one_page(page, 1); 99 err = write_one_page(page, 1);
73 else 100 else
74 unlock_page(page); 101 unlock_page(page);
>> 102
75 return err; 103 return err;
76 } 104 }
77 105
78 static void ext2_check_page(struct page *page) 106 static void ext2_check_page(struct page *page)
79 { 107 {
80 struct inode *dir = page->mapping->hos 108 struct inode *dir = page->mapping->host;
81 struct super_block *sb = dir->i_sb; 109 struct super_block *sb = dir->i_sb;
82 unsigned chunk_size = ext2_chunk_size( 110 unsigned chunk_size = ext2_chunk_size(dir);
83 char *kaddr = page_address(page); 111 char *kaddr = page_address(page);
84 u32 max_inumber = le32_to_cpu(EXT2_SB( 112 u32 max_inumber = le32_to_cpu(EXT2_SB(sb)->s_es->s_inodes_count);
85 unsigned offs, rec_len; 113 unsigned offs, rec_len;
86 unsigned limit = PAGE_CACHE_SIZE; 114 unsigned limit = PAGE_CACHE_SIZE;
87 ext2_dirent *p; 115 ext2_dirent *p;
88 char *error; 116 char *error;
89 117
90 if ((dir->i_size >> PAGE_CACHE_SHIFT) 118 if ((dir->i_size >> PAGE_CACHE_SHIFT) == page->index) {
91 limit = dir->i_size & ~PAGE_CA 119 limit = dir->i_size & ~PAGE_CACHE_MASK;
92 if (limit & (chunk_size - 1)) 120 if (limit & (chunk_size - 1))
93 goto Ebadsize; 121 goto Ebadsize;
94 if (!limit) 122 if (!limit)
95 goto out; 123 goto out;
96 } 124 }
97 for (offs = 0; offs <= limit - EXT2_DI 125 for (offs = 0; offs <= limit - EXT2_DIR_REC_LEN(1); offs += rec_len) {
98 p = (ext2_dirent *)(kaddr + of 126 p = (ext2_dirent *)(kaddr + offs);
99 rec_len = le16_to_cpu(p->rec_l !! 127 rec_len = ext2_rec_len_from_disk(p->rec_len);
100 128
101 if (rec_len < EXT2_DIR_REC_LEN 129 if (rec_len < EXT2_DIR_REC_LEN(1))
102 goto Eshort; 130 goto Eshort;
103 if (rec_len & 3) 131 if (rec_len & 3)
104 goto Ealign; 132 goto Ealign;
105 if (rec_len < EXT2_DIR_REC_LEN 133 if (rec_len < EXT2_DIR_REC_LEN(p->name_len))
106 goto Enamelen; 134 goto Enamelen;
107 if (((offs + rec_len - 1) ^ of 135 if (((offs + rec_len - 1) ^ offs) & ~(chunk_size-1))
108 goto Espan; 136 goto Espan;
109 if (le32_to_cpu(p->inode) > ma 137 if (le32_to_cpu(p->inode) > max_inumber)
110 goto Einumber; 138 goto Einumber;
111 } 139 }
112 if (offs != limit) 140 if (offs != limit)
113 goto Eend; 141 goto Eend;
114 out: 142 out:
115 SetPageChecked(page); 143 SetPageChecked(page);
116 return; 144 return;
117 145
118 /* Too bad, we had an error */ 146 /* Too bad, we had an error */
119 147
120 Ebadsize: 148 Ebadsize:
121 ext2_error(sb, "ext2_check_page", 149 ext2_error(sb, "ext2_check_page",
122 "size of directory #%lu is not 150 "size of directory #%lu is not a multiple of chunk size",
123 dir->i_ino 151 dir->i_ino
124 ); 152 );
125 goto fail; 153 goto fail;
126 Eshort: 154 Eshort:
127 error = "rec_len is smaller than minim 155 error = "rec_len is smaller than minimal";
128 goto bad_entry; 156 goto bad_entry;
129 Ealign: 157 Ealign:
130 error = "unaligned directory entry"; 158 error = "unaligned directory entry";
131 goto bad_entry; 159 goto bad_entry;
132 Enamelen: 160 Enamelen:
133 error = "rec_len is too small for name 161 error = "rec_len is too small for name_len";
134 goto bad_entry; 162 goto bad_entry;
135 Espan: 163 Espan:
136 error = "directory entry across blocks 164 error = "directory entry across blocks";
137 goto bad_entry; 165 goto bad_entry;
138 Einumber: 166 Einumber:
139 error = "inode out of bounds"; 167 error = "inode out of bounds";
140 bad_entry: 168 bad_entry:
141 ext2_error (sb, "ext2_check_page", "ba 169 ext2_error (sb, "ext2_check_page", "bad entry in directory #%lu: %s - "
142 "offset=%lu, inode=%lu, rec_le 170 "offset=%lu, inode=%lu, rec_len=%d, name_len=%d",
143 dir->i_ino, error, (page->inde 171 dir->i_ino, error, (page->index<<PAGE_CACHE_SHIFT)+offs,
144 (unsigned long) le32_to_cpu(p- 172 (unsigned long) le32_to_cpu(p->inode),
145 rec_len, p->name_len); 173 rec_len, p->name_len);
146 goto fail; 174 goto fail;
147 Eend: 175 Eend:
148 p = (ext2_dirent *)(kaddr + offs); 176 p = (ext2_dirent *)(kaddr + offs);
149 ext2_error (sb, "ext2_check_page", 177 ext2_error (sb, "ext2_check_page",
150 "entry in directory #%lu spans 178 "entry in directory #%lu spans the page boundary"
151 "offset=%lu, inode=%lu", 179 "offset=%lu, inode=%lu",
152 dir->i_ino, (page->index<<PAGE 180 dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs,
153 (unsigned long) le32_to_cpu(p- 181 (unsigned long) le32_to_cpu(p->inode));
154 fail: 182 fail:
155 SetPageChecked(page); 183 SetPageChecked(page);
156 SetPageError(page); 184 SetPageError(page);
157 } 185 }
158 186
159 static struct page * ext2_get_page(struct inod 187 static struct page * ext2_get_page(struct inode *dir, unsigned long n)
160 { 188 {
161 struct address_space *mapping = dir->i 189 struct address_space *mapping = dir->i_mapping;
162 struct page *page = read_cache_page(ma !! 190 struct page *page = read_mapping_page(mapping, n, NULL);
163 (filler_t*)map <<
164 if (!IS_ERR(page)) { 191 if (!IS_ERR(page)) {
165 wait_on_page_locked(page); <<
166 kmap(page); 192 kmap(page);
167 if (!PageUptodate(page)) <<
168 goto fail; <<
169 if (!PageChecked(page)) 193 if (!PageChecked(page))
170 ext2_check_page(page); 194 ext2_check_page(page);
171 if (PageError(page)) 195 if (PageError(page))
172 goto fail; 196 goto fail;
173 } 197 }
174 return page; 198 return page;
175 199
176 fail: 200 fail:
177 ext2_put_page(page); 201 ext2_put_page(page);
178 return ERR_PTR(-EIO); 202 return ERR_PTR(-EIO);
179 } 203 }
180 204
181 /* 205 /*
182 * NOTE! unlike strncmp, ext2_match returns 1 206 * NOTE! unlike strncmp, ext2_match returns 1 for success, 0 for failure.
183 * 207 *
184 * len <= EXT2_NAME_LEN and de != NULL are gua 208 * len <= EXT2_NAME_LEN and de != NULL are guaranteed by caller.
185 */ 209 */
186 static inline int ext2_match (int len, const c 210 static inline int ext2_match (int len, const char * const name,
187 struct 211 struct ext2_dir_entry_2 * de)
188 { 212 {
189 if (len != de->name_len) 213 if (len != de->name_len)
190 return 0; 214 return 0;
191 if (!de->inode) 215 if (!de->inode)
192 return 0; 216 return 0;
193 return !memcmp(name, de->name, len); 217 return !memcmp(name, de->name, len);
194 } 218 }
195 219
196 /* 220 /*
197 * p is at least 6 bytes before the end of pag 221 * p is at least 6 bytes before the end of page
198 */ 222 */
199 static inline ext2_dirent *ext2_next_entry(ext 223 static inline ext2_dirent *ext2_next_entry(ext2_dirent *p)
200 { 224 {
201 return (ext2_dirent *)((char*)p + le16 !! 225 return (ext2_dirent *)((char *)p +
>> 226 ext2_rec_len_from_disk(p->rec_len));
202 } 227 }
203 228
204 static inline unsigned 229 static inline unsigned
205 ext2_validate_entry(char *base, unsigned offse 230 ext2_validate_entry(char *base, unsigned offset, unsigned mask)
206 { 231 {
207 ext2_dirent *de = (ext2_dirent*)(base 232 ext2_dirent *de = (ext2_dirent*)(base + offset);
208 ext2_dirent *p = (ext2_dirent*)(base + 233 ext2_dirent *p = (ext2_dirent*)(base + (offset&mask));
209 while ((char*)p < (char*)de) { 234 while ((char*)p < (char*)de) {
210 if (p->rec_len == 0) 235 if (p->rec_len == 0)
211 break; 236 break;
212 p = ext2_next_entry(p); 237 p = ext2_next_entry(p);
213 } 238 }
214 return (char *)p - base; 239 return (char *)p - base;
215 } 240 }
216 241
217 static unsigned char ext2_filetype_table[EXT2_ 242 static unsigned char ext2_filetype_table[EXT2_FT_MAX] = {
218 [EXT2_FT_UNKNOWN] = DT_UNKNOWN, 243 [EXT2_FT_UNKNOWN] = DT_UNKNOWN,
219 [EXT2_FT_REG_FILE] = DT_REG, 244 [EXT2_FT_REG_FILE] = DT_REG,
220 [EXT2_FT_DIR] = DT_DIR, 245 [EXT2_FT_DIR] = DT_DIR,
221 [EXT2_FT_CHRDEV] = DT_CHR, 246 [EXT2_FT_CHRDEV] = DT_CHR,
222 [EXT2_FT_BLKDEV] = DT_BLK, 247 [EXT2_FT_BLKDEV] = DT_BLK,
223 [EXT2_FT_FIFO] = DT_FIFO, 248 [EXT2_FT_FIFO] = DT_FIFO,
224 [EXT2_FT_SOCK] = DT_SOCK, 249 [EXT2_FT_SOCK] = DT_SOCK,
225 [EXT2_FT_SYMLINK] = DT_LNK, 250 [EXT2_FT_SYMLINK] = DT_LNK,
226 }; 251 };
227 252
228 #define S_SHIFT 12 253 #define S_SHIFT 12
229 static unsigned char ext2_type_by_mode[S_IFMT 254 static unsigned char ext2_type_by_mode[S_IFMT >> S_SHIFT] = {
230 [S_IFREG >> S_SHIFT] = EXT2_FT_REG_ 255 [S_IFREG >> S_SHIFT] = EXT2_FT_REG_FILE,
231 [S_IFDIR >> S_SHIFT] = EXT2_FT_DIR, 256 [S_IFDIR >> S_SHIFT] = EXT2_FT_DIR,
232 [S_IFCHR >> S_SHIFT] = EXT2_FT_CHRD 257 [S_IFCHR >> S_SHIFT] = EXT2_FT_CHRDEV,
233 [S_IFBLK >> S_SHIFT] = EXT2_FT_BLKD 258 [S_IFBLK >> S_SHIFT] = EXT2_FT_BLKDEV,
234 [S_IFIFO >> S_SHIFT] = EXT2_FT_FIFO 259 [S_IFIFO >> S_SHIFT] = EXT2_FT_FIFO,
235 [S_IFSOCK >> S_SHIFT] = EXT2_FT_SOCK 260 [S_IFSOCK >> S_SHIFT] = EXT2_FT_SOCK,
236 [S_IFLNK >> S_SHIFT] = EXT2_FT_SYML 261 [S_IFLNK >> S_SHIFT] = EXT2_FT_SYMLINK,
237 }; 262 };
238 263
239 static inline void ext2_set_de_type(ext2_diren 264 static inline void ext2_set_de_type(ext2_dirent *de, struct inode *inode)
240 { 265 {
241 mode_t mode = inode->i_mode; 266 mode_t mode = inode->i_mode;
242 if (EXT2_HAS_INCOMPAT_FEATURE(inode->i 267 if (EXT2_HAS_INCOMPAT_FEATURE(inode->i_sb, EXT2_FEATURE_INCOMPAT_FILETYPE))
243 de->file_type = ext2_type_by_m 268 de->file_type = ext2_type_by_mode[(mode & S_IFMT)>>S_SHIFT];
244 else 269 else
245 de->file_type = 0; 270 de->file_type = 0;
246 } 271 }
247 272
248 static int 273 static int
249 ext2_readdir (struct file * filp, void * diren 274 ext2_readdir (struct file * filp, void * dirent, filldir_t filldir)
250 { 275 {
251 loff_t pos = filp->f_pos; 276 loff_t pos = filp->f_pos;
252 struct inode *inode = filp->f_dentry-> !! 277 struct inode *inode = filp->f_path.dentry->d_inode;
253 struct super_block *sb = inode->i_sb; 278 struct super_block *sb = inode->i_sb;
254 unsigned int offset = pos & ~PAGE_CACH 279 unsigned int offset = pos & ~PAGE_CACHE_MASK;
255 unsigned long n = pos >> PAGE_CACHE_SH 280 unsigned long n = pos >> PAGE_CACHE_SHIFT;
256 unsigned long npages = dir_pages(inode 281 unsigned long npages = dir_pages(inode);
257 unsigned chunk_mask = ~(ext2_chunk_siz 282 unsigned chunk_mask = ~(ext2_chunk_size(inode)-1);
258 unsigned char *types = NULL; 283 unsigned char *types = NULL;
259 int need_revalidate = (filp->f_version !! 284 int need_revalidate = filp->f_version != inode->i_version;
260 int ret; <<
261 285
262 if (pos > inode->i_size - EXT2_DIR_REC 286 if (pos > inode->i_size - EXT2_DIR_REC_LEN(1))
263 goto success; !! 287 return 0;
264 288
265 if (EXT2_HAS_INCOMPAT_FEATURE(sb, EXT2 289 if (EXT2_HAS_INCOMPAT_FEATURE(sb, EXT2_FEATURE_INCOMPAT_FILETYPE))
266 types = ext2_filetype_table; 290 types = ext2_filetype_table;
267 291
268 for ( ; n < npages; n++, offset = 0) { 292 for ( ; n < npages; n++, offset = 0) {
269 char *kaddr, *limit; 293 char *kaddr, *limit;
270 ext2_dirent *de; 294 ext2_dirent *de;
271 struct page *page = ext2_get_p 295 struct page *page = ext2_get_page(inode, n);
272 296
273 if (IS_ERR(page)) { 297 if (IS_ERR(page)) {
274 ext2_error(sb, __FUNCT 298 ext2_error(sb, __FUNCTION__,
275 "bad page i 299 "bad page in #%lu",
276 inode->i_in 300 inode->i_ino);
277 filp->f_pos += PAGE_CA 301 filp->f_pos += PAGE_CACHE_SIZE - offset;
278 ret = -EIO; !! 302 return -EIO;
279 goto done; <<
280 } 303 }
281 kaddr = page_address(page); 304 kaddr = page_address(page);
282 if (need_revalidate) { !! 305 if (unlikely(need_revalidate)) {
283 offset = ext2_validate !! 306 if (offset) {
>> 307 offset = ext2_validate_entry(kaddr, offset, chunk_mask);
>> 308 filp->f_pos = (n<<PAGE_CACHE_SHIFT) + offset;
>> 309 }
>> 310 filp->f_version = inode->i_version;
284 need_revalidate = 0; 311 need_revalidate = 0;
285 } 312 }
286 de = (ext2_dirent *)(kaddr+off 313 de = (ext2_dirent *)(kaddr+offset);
287 limit = kaddr + ext2_last_byte 314 limit = kaddr + ext2_last_byte(inode, n) - EXT2_DIR_REC_LEN(1);
288 for ( ;(char*)de <= limit; de 315 for ( ;(char*)de <= limit; de = ext2_next_entry(de)) {
289 if (de->rec_len == 0) 316 if (de->rec_len == 0) {
290 ext2_error(sb, 317 ext2_error(sb, __FUNCTION__,
291 "zero- 318 "zero-length directory entry");
292 ret = -EIO; <<
293 ext2_put_page( 319 ext2_put_page(page);
294 goto done; !! 320 return -EIO;
295 } 321 }
296 if (de->inode) { 322 if (de->inode) {
297 int over; 323 int over;
298 unsigned char 324 unsigned char d_type = DT_UNKNOWN;
299 325
300 if (types && d 326 if (types && de->file_type < EXT2_FT_MAX)
301 d_type 327 d_type = types[de->file_type];
302 328
303 offset = (char 329 offset = (char *)de - kaddr;
304 over = filldir 330 over = filldir(dirent, de->name, de->name_len,
305 331 (n<<PAGE_CACHE_SHIFT) | offset,
306 332 le32_to_cpu(de->inode), d_type);
307 if (over) { 333 if (over) {
308 ext2_p 334 ext2_put_page(page);
309 goto s !! 335 return 0;
310 } 336 }
311 } 337 }
312 filp->f_pos += le16_to !! 338 filp->f_pos += ext2_rec_len_from_disk(de->rec_len);
313 } 339 }
314 ext2_put_page(page); 340 ext2_put_page(page);
315 } 341 }
316 !! 342 return 0;
317 success: <<
318 ret = 0; <<
319 done: <<
320 filp->f_version = inode->i_version; <<
321 return ret; <<
322 } 343 }
323 344
324 /* 345 /*
325 * ext2_find_entry() 346 * ext2_find_entry()
326 * 347 *
327 * finds an entry in the specified directory w 348 * finds an entry in the specified directory with the wanted name. It
328 * returns the page in which the entry was fou 349 * returns the page in which the entry was found, and the entry itself
329 * (as a parameter - res_dir). Page is returne 350 * (as a parameter - res_dir). Page is returned mapped and unlocked.
330 * Entry is guaranteed to be valid. 351 * Entry is guaranteed to be valid.
331 */ 352 */
332 struct ext2_dir_entry_2 * ext2_find_entry (str 353 struct ext2_dir_entry_2 * ext2_find_entry (struct inode * dir,
333 struct dentry *dentry, 354 struct dentry *dentry, struct page ** res_page)
334 { 355 {
335 const char *name = dentry->d_name.name 356 const char *name = dentry->d_name.name;
336 int namelen = dentry->d_name.len; 357 int namelen = dentry->d_name.len;
337 unsigned reclen = EXT2_DIR_REC_LEN(nam 358 unsigned reclen = EXT2_DIR_REC_LEN(namelen);
338 unsigned long start, n; 359 unsigned long start, n;
339 unsigned long npages = dir_pages(dir); 360 unsigned long npages = dir_pages(dir);
340 struct page *page = NULL; 361 struct page *page = NULL;
341 struct ext2_inode_info *ei = EXT2_I(di 362 struct ext2_inode_info *ei = EXT2_I(dir);
342 ext2_dirent * de; 363 ext2_dirent * de;
343 364
344 if (npages == 0) 365 if (npages == 0)
345 goto out; 366 goto out;
346 367
347 /* OFFSET_CACHE */ 368 /* OFFSET_CACHE */
348 *res_page = NULL; 369 *res_page = NULL;
349 370
350 start = ei->i_dir_start_lookup; 371 start = ei->i_dir_start_lookup;
351 if (start >= npages) 372 if (start >= npages)
352 start = 0; 373 start = 0;
353 n = start; 374 n = start;
354 do { 375 do {
355 char *kaddr; 376 char *kaddr;
356 page = ext2_get_page(dir, n); 377 page = ext2_get_page(dir, n);
357 if (!IS_ERR(page)) { 378 if (!IS_ERR(page)) {
358 kaddr = page_address(p 379 kaddr = page_address(page);
359 de = (ext2_dirent *) k 380 de = (ext2_dirent *) kaddr;
360 kaddr += ext2_last_byt 381 kaddr += ext2_last_byte(dir, n) - reclen;
361 while ((char *) de <= 382 while ((char *) de <= kaddr) {
362 if (de->rec_le 383 if (de->rec_len == 0) {
363 ext2_e 384 ext2_error(dir->i_sb, __FUNCTION__,
364 385 "zero-length directory entry");
365 ext2_p 386 ext2_put_page(page);
366 goto o 387 goto out;
367 } 388 }
368 if (ext2_match 389 if (ext2_match (namelen, name, de))
369 goto f 390 goto found;
370 de = ext2_next 391 de = ext2_next_entry(de);
371 } 392 }
372 ext2_put_page(page); 393 ext2_put_page(page);
373 } 394 }
374 if (++n >= npages) 395 if (++n >= npages)
375 n = 0; 396 n = 0;
>> 397 /* next page is past the blocks we've got */
>> 398 if (unlikely(n > (dir->i_blocks >> (PAGE_CACHE_SHIFT - 9)))) {
>> 399 ext2_error(dir->i_sb, __FUNCTION__,
>> 400 "dir %lu size %lld exceeds block count %llu",
>> 401 dir->i_ino, dir->i_size,
>> 402 (unsigned long long)dir->i_blocks);
>> 403 goto out;
>> 404 }
376 } while (n != start); 405 } while (n != start);
377 out: 406 out:
378 return NULL; 407 return NULL;
379 408
380 found: 409 found:
381 *res_page = page; 410 *res_page = page;
382 ei->i_dir_start_lookup = n; 411 ei->i_dir_start_lookup = n;
383 return de; 412 return de;
384 } 413 }
385 414
386 struct ext2_dir_entry_2 * ext2_dotdot (struct 415 struct ext2_dir_entry_2 * ext2_dotdot (struct inode *dir, struct page **p)
387 { 416 {
388 struct page *page = ext2_get_page(dir, 417 struct page *page = ext2_get_page(dir, 0);
389 ext2_dirent *de = NULL; 418 ext2_dirent *de = NULL;
390 419
391 if (!IS_ERR(page)) { 420 if (!IS_ERR(page)) {
392 de = ext2_next_entry((ext2_dir 421 de = ext2_next_entry((ext2_dirent *) page_address(page));
393 *p = page; 422 *p = page;
394 } 423 }
395 return de; 424 return de;
396 } 425 }
397 426
398 ino_t ext2_inode_by_name(struct inode * dir, s 427 ino_t ext2_inode_by_name(struct inode * dir, struct dentry *dentry)
399 { 428 {
400 ino_t res = 0; 429 ino_t res = 0;
401 struct ext2_dir_entry_2 * de; 430 struct ext2_dir_entry_2 * de;
402 struct page *page; 431 struct page *page;
403 432
404 de = ext2_find_entry (dir, dentry, &pa 433 de = ext2_find_entry (dir, dentry, &page);
405 if (de) { 434 if (de) {
406 res = le32_to_cpu(de->inode); 435 res = le32_to_cpu(de->inode);
407 kunmap(page); !! 436 ext2_put_page(page);
408 page_cache_release(page); <<
409 } 437 }
410 return res; 438 return res;
411 } 439 }
412 440
413 /* Releases the page */ 441 /* Releases the page */
414 void ext2_set_link(struct inode *dir, struct e 442 void ext2_set_link(struct inode *dir, struct ext2_dir_entry_2 *de,
415 struct page *page, str 443 struct page *page, struct inode *inode)
416 { 444 {
417 unsigned from = (char *) de - (char *) !! 445 loff_t pos = page_offset(page) +
418 unsigned to = from + le16_to_cpu(de->r !! 446 (char *) de - (char *) page_address(page);
>> 447 unsigned len = ext2_rec_len_from_disk(de->rec_len);
419 int err; 448 int err;
420 449
421 lock_page(page); 450 lock_page(page);
422 err = page->mapping->a_ops->prepare_wr !! 451 err = __ext2_write_begin(NULL, page->mapping, pos, len,
423 if (err) !! 452 AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
424 BUG(); !! 453 BUG_ON(err);
425 de->inode = cpu_to_le32(inode->i_ino); 454 de->inode = cpu_to_le32(inode->i_ino);
426 ext2_set_de_type (de, inode); !! 455 ext2_set_de_type(de, inode);
427 err = ext2_commit_chunk(page, from, to !! 456 err = ext2_commit_chunk(page, pos, len);
428 ext2_put_page(page); 457 ext2_put_page(page);
429 dir->i_mtime = dir->i_ctime = CURRENT_ 458 dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
430 EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL 459 EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL;
431 mark_inode_dirty(dir); 460 mark_inode_dirty(dir);
432 } 461 }
433 462
434 /* 463 /*
435 * Parent is locked. 464 * Parent is locked.
436 */ 465 */
437 int ext2_add_link (struct dentry *dentry, stru 466 int ext2_add_link (struct dentry *dentry, struct inode *inode)
438 { 467 {
439 struct inode *dir = dentry->d_parent-> 468 struct inode *dir = dentry->d_parent->d_inode;
440 const char *name = dentry->d_name.name 469 const char *name = dentry->d_name.name;
441 int namelen = dentry->d_name.len; 470 int namelen = dentry->d_name.len;
442 unsigned chunk_size = ext2_chunk_size( 471 unsigned chunk_size = ext2_chunk_size(dir);
443 unsigned reclen = EXT2_DIR_REC_LEN(nam 472 unsigned reclen = EXT2_DIR_REC_LEN(namelen);
444 unsigned short rec_len, name_len; 473 unsigned short rec_len, name_len;
445 struct page *page = NULL; 474 struct page *page = NULL;
446 ext2_dirent * de; 475 ext2_dirent * de;
447 unsigned long npages = dir_pages(dir); 476 unsigned long npages = dir_pages(dir);
448 unsigned long n; 477 unsigned long n;
449 char *kaddr; 478 char *kaddr;
450 unsigned from, to; !! 479 loff_t pos;
451 int err; 480 int err;
452 481
453 /* 482 /*
454 * We take care of directory expansion 483 * We take care of directory expansion in the same loop.
455 * This code plays outside i_size, so 484 * This code plays outside i_size, so it locks the page
456 * to protect that region. 485 * to protect that region.
457 */ 486 */
458 for (n = 0; n <= npages; n++) { 487 for (n = 0; n <= npages; n++) {
459 char *dir_end; 488 char *dir_end;
460 489
461 page = ext2_get_page(dir, n); 490 page = ext2_get_page(dir, n);
462 err = PTR_ERR(page); 491 err = PTR_ERR(page);
463 if (IS_ERR(page)) 492 if (IS_ERR(page))
464 goto out; 493 goto out;
465 lock_page(page); 494 lock_page(page);
466 kaddr = page_address(page); 495 kaddr = page_address(page);
467 dir_end = kaddr + ext2_last_by 496 dir_end = kaddr + ext2_last_byte(dir, n);
468 de = (ext2_dirent *)kaddr; 497 de = (ext2_dirent *)kaddr;
469 kaddr += PAGE_CACHE_SIZE - rec 498 kaddr += PAGE_CACHE_SIZE - reclen;
470 while ((char *)de <= kaddr) { 499 while ((char *)de <= kaddr) {
471 if ((char *)de == dir_ 500 if ((char *)de == dir_end) {
472 /* We hit i_si 501 /* We hit i_size */
473 name_len = 0; 502 name_len = 0;
474 rec_len = chun 503 rec_len = chunk_size;
475 de->rec_len = !! 504 de->rec_len = ext2_rec_len_to_disk(chunk_size);
476 de->inode = 0; 505 de->inode = 0;
477 goto got_it; 506 goto got_it;
478 } 507 }
479 if (de->rec_len == 0) 508 if (de->rec_len == 0) {
480 ext2_error(dir 509 ext2_error(dir->i_sb, __FUNCTION__,
481 "zero- 510 "zero-length directory entry");
482 err = -EIO; 511 err = -EIO;
483 goto out_unloc 512 goto out_unlock;
484 } 513 }
485 err = -EEXIST; 514 err = -EEXIST;
486 if (ext2_match (namele 515 if (ext2_match (namelen, name, de))
487 goto out_unloc 516 goto out_unlock;
488 name_len = EXT2_DIR_RE 517 name_len = EXT2_DIR_REC_LEN(de->name_len);
489 rec_len = le16_to_cpu( !! 518 rec_len = ext2_rec_len_from_disk(de->rec_len);
490 if (!de->inode && rec_ 519 if (!de->inode && rec_len >= reclen)
491 goto got_it; 520 goto got_it;
492 if (rec_len >= name_le 521 if (rec_len >= name_len + reclen)
493 goto got_it; 522 goto got_it;
494 de = (ext2_dirent *) ( 523 de = (ext2_dirent *) ((char *) de + rec_len);
495 } 524 }
496 unlock_page(page); 525 unlock_page(page);
497 ext2_put_page(page); 526 ext2_put_page(page);
498 } 527 }
499 BUG(); 528 BUG();
500 return -EINVAL; 529 return -EINVAL;
501 530
502 got_it: 531 got_it:
503 from = (char*)de - (char*)page_address !! 532 pos = page_offset(page) +
504 to = from + rec_len; !! 533 (char*)de - (char*)page_address(page);
505 err = page->mapping->a_ops->prepare_wr !! 534 err = __ext2_write_begin(NULL, page->mapping, pos, rec_len, 0,
>> 535 &page, NULL);
506 if (err) 536 if (err)
507 goto out_unlock; 537 goto out_unlock;
508 if (de->inode) { 538 if (de->inode) {
509 ext2_dirent *de1 = (ext2_diren 539 ext2_dirent *de1 = (ext2_dirent *) ((char *) de + name_len);
510 de1->rec_len = cpu_to_le16(rec !! 540 de1->rec_len = ext2_rec_len_to_disk(rec_len - name_len);
511 de->rec_len = cpu_to_le16(name !! 541 de->rec_len = ext2_rec_len_to_disk(name_len);
512 de = de1; 542 de = de1;
513 } 543 }
514 de->name_len = namelen; 544 de->name_len = namelen;
515 memcpy (de->name, name, namelen); !! 545 memcpy(de->name, name, namelen);
516 de->inode = cpu_to_le32(inode->i_ino); 546 de->inode = cpu_to_le32(inode->i_ino);
517 ext2_set_de_type (de, inode); 547 ext2_set_de_type (de, inode);
518 err = ext2_commit_chunk(page, from, to !! 548 err = ext2_commit_chunk(page, pos, rec_len);
519 dir->i_mtime = dir->i_ctime = CURRENT_ 549 dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
520 EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL 550 EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL;
521 mark_inode_dirty(dir); 551 mark_inode_dirty(dir);
522 /* OFFSET_CACHE */ 552 /* OFFSET_CACHE */
523 out_put: 553 out_put:
524 ext2_put_page(page); 554 ext2_put_page(page);
525 out: 555 out:
526 return err; 556 return err;
527 out_unlock: 557 out_unlock:
528 unlock_page(page); 558 unlock_page(page);
529 goto out_put; 559 goto out_put;
530 } 560 }
531 561
532 /* 562 /*
533 * ext2_delete_entry deletes a directory entry 563 * ext2_delete_entry deletes a directory entry by merging it with the
534 * previous entry. Page is up-to-date. Release 564 * previous entry. Page is up-to-date. Releases the page.
535 */ 565 */
536 int ext2_delete_entry (struct ext2_dir_entry_2 566 int ext2_delete_entry (struct ext2_dir_entry_2 * dir, struct page * page )
537 { 567 {
538 struct address_space *mapping = page-> 568 struct address_space *mapping = page->mapping;
539 struct inode *inode = mapping->host; 569 struct inode *inode = mapping->host;
540 char *kaddr = page_address(page); 570 char *kaddr = page_address(page);
541 unsigned from = ((char*)dir - kaddr) & 571 unsigned from = ((char*)dir - kaddr) & ~(ext2_chunk_size(inode)-1);
542 unsigned to = ((char*)dir - kaddr) + l !! 572 unsigned to = ((char *)dir - kaddr) +
>> 573 ext2_rec_len_from_disk(dir->rec_len);
>> 574 loff_t pos;
543 ext2_dirent * pde = NULL; 575 ext2_dirent * pde = NULL;
544 ext2_dirent * de = (ext2_dirent *) (ka 576 ext2_dirent * de = (ext2_dirent *) (kaddr + from);
545 int err; 577 int err;
546 578
547 while ((char*)de < (char*)dir) { 579 while ((char*)de < (char*)dir) {
548 if (de->rec_len == 0) { 580 if (de->rec_len == 0) {
549 ext2_error(inode->i_sb 581 ext2_error(inode->i_sb, __FUNCTION__,
550 "zero-length d 582 "zero-length directory entry");
551 err = -EIO; 583 err = -EIO;
552 goto out; 584 goto out;
553 } 585 }
554 pde = de; 586 pde = de;
555 de = ext2_next_entry(de); 587 de = ext2_next_entry(de);
556 } 588 }
557 if (pde) 589 if (pde)
558 from = (char*)pde - (char*)pag 590 from = (char*)pde - (char*)page_address(page);
>> 591 pos = page_offset(page) + from;
559 lock_page(page); 592 lock_page(page);
560 err = mapping->a_ops->prepare_write(NU !! 593 err = __ext2_write_begin(NULL, page->mapping, pos, to - from, 0,
561 if (err) !! 594 &page, NULL);
562 BUG(); !! 595 BUG_ON(err);
563 if (pde) 596 if (pde)
564 pde->rec_len = cpu_to_le16(to- !! 597 pde->rec_len = ext2_rec_len_to_disk(to - from);
565 dir->inode = 0; 598 dir->inode = 0;
566 err = ext2_commit_chunk(page, from, to !! 599 err = ext2_commit_chunk(page, pos, to - from);
567 inode->i_ctime = inode->i_mtime = CURR 600 inode->i_ctime = inode->i_mtime = CURRENT_TIME_SEC;
568 EXT2_I(inode)->i_flags &= ~EXT2_BTREE_ 601 EXT2_I(inode)->i_flags &= ~EXT2_BTREE_FL;
569 mark_inode_dirty(inode); 602 mark_inode_dirty(inode);
570 out: 603 out:
571 ext2_put_page(page); 604 ext2_put_page(page);
572 return err; 605 return err;
573 } 606 }
574 607
575 /* 608 /*
576 * Set the first fragment of directory. 609 * Set the first fragment of directory.
577 */ 610 */
578 int ext2_make_empty(struct inode *inode, struc 611 int ext2_make_empty(struct inode *inode, struct inode *parent)
579 { 612 {
580 struct address_space *mapping = inode- 613 struct address_space *mapping = inode->i_mapping;
581 struct page *page = grab_cache_page(ma 614 struct page *page = grab_cache_page(mapping, 0);
582 unsigned chunk_size = ext2_chunk_size( 615 unsigned chunk_size = ext2_chunk_size(inode);
583 struct ext2_dir_entry_2 * de; 616 struct ext2_dir_entry_2 * de;
584 int err; 617 int err;
585 void *kaddr; 618 void *kaddr;
586 619
587 if (!page) 620 if (!page)
588 return -ENOMEM; 621 return -ENOMEM;
589 err = mapping->a_ops->prepare_write(NU !! 622
>> 623 err = __ext2_write_begin(NULL, page->mapping, 0, chunk_size, 0,
>> 624 &page, NULL);
590 if (err) { 625 if (err) {
591 unlock_page(page); 626 unlock_page(page);
592 goto fail; 627 goto fail;
593 } 628 }
594 kaddr = kmap_atomic(page, KM_USER0); 629 kaddr = kmap_atomic(page, KM_USER0);
595 memset(kaddr, 0, chunk_size); !! 630 memset(kaddr, 0, chunk_size);
596 de = (struct ext2_dir_entry_2 *)kaddr; 631 de = (struct ext2_dir_entry_2 *)kaddr;
597 de->name_len = 1; 632 de->name_len = 1;
598 de->rec_len = cpu_to_le16(EXT2_DIR_REC !! 633 de->rec_len = ext2_rec_len_to_disk(EXT2_DIR_REC_LEN(1));
599 memcpy (de->name, ".\0\0", 4); 634 memcpy (de->name, ".\0\0", 4);
600 de->inode = cpu_to_le32(inode->i_ino); 635 de->inode = cpu_to_le32(inode->i_ino);
601 ext2_set_de_type (de, inode); 636 ext2_set_de_type (de, inode);
602 637
603 de = (struct ext2_dir_entry_2 *)(kaddr 638 de = (struct ext2_dir_entry_2 *)(kaddr + EXT2_DIR_REC_LEN(1));
604 de->name_len = 2; 639 de->name_len = 2;
605 de->rec_len = cpu_to_le16(chunk_size - !! 640 de->rec_len = ext2_rec_len_to_disk(chunk_size - EXT2_DIR_REC_LEN(1));
606 de->inode = cpu_to_le32(parent->i_ino) 641 de->inode = cpu_to_le32(parent->i_ino);
607 memcpy (de->name, "..\0", 4); 642 memcpy (de->name, "..\0", 4);
608 ext2_set_de_type (de, inode); 643 ext2_set_de_type (de, inode);
609 kunmap_atomic(kaddr, KM_USER0); 644 kunmap_atomic(kaddr, KM_USER0);
610 err = ext2_commit_chunk(page, 0, chunk 645 err = ext2_commit_chunk(page, 0, chunk_size);
611 fail: 646 fail:
612 page_cache_release(page); 647 page_cache_release(page);
613 return err; 648 return err;
614 } 649 }
615 650
616 /* 651 /*
617 * routine to check that the specified directo 652 * routine to check that the specified directory is empty (for rmdir)
618 */ 653 */
619 int ext2_empty_dir (struct inode * inode) 654 int ext2_empty_dir (struct inode * inode)
620 { 655 {
621 struct page *page = NULL; 656 struct page *page = NULL;
622 unsigned long i, npages = dir_pages(in 657 unsigned long i, npages = dir_pages(inode);
623 658
624 for (i = 0; i < npages; i++) { 659 for (i = 0; i < npages; i++) {
625 char *kaddr; 660 char *kaddr;
626 ext2_dirent * de; 661 ext2_dirent * de;
627 page = ext2_get_page(inode, i) 662 page = ext2_get_page(inode, i);
628 663
629 if (IS_ERR(page)) 664 if (IS_ERR(page))
630 continue; 665 continue;
631 666
632 kaddr = page_address(page); 667 kaddr = page_address(page);
633 de = (ext2_dirent *)kaddr; 668 de = (ext2_dirent *)kaddr;
634 kaddr += ext2_last_byte(inode, 669 kaddr += ext2_last_byte(inode, i) - EXT2_DIR_REC_LEN(1);
635 670
636 while ((char *)de <= kaddr) { 671 while ((char *)de <= kaddr) {
637 if (de->rec_len == 0) 672 if (de->rec_len == 0) {
638 ext2_error(ino 673 ext2_error(inode->i_sb, __FUNCTION__,
639 "zero- 674 "zero-length directory entry");
640 printk("kaddr= 675 printk("kaddr=%p, de=%p\n", kaddr, de);
641 goto not_empty 676 goto not_empty;
642 } 677 }
643 if (de->inode != 0) { 678 if (de->inode != 0) {
644 /* check for . 679 /* check for . and .. */
645 if (de->name[0 680 if (de->name[0] != '.')
646 goto n 681 goto not_empty;
647 if (de->name_l 682 if (de->name_len > 2)
648 goto n 683 goto not_empty;
649 if (de->name_l 684 if (de->name_len < 2) {
650 if (de 685 if (de->inode !=
651 cp 686 cpu_to_le32(inode->i_ino))
652 687 goto not_empty;
653 } else if (de- 688 } else if (de->name[1] != '.')
654 goto n 689 goto not_empty;
655 } 690 }
656 de = ext2_next_entry(d 691 de = ext2_next_entry(de);
657 } 692 }
658 ext2_put_page(page); 693 ext2_put_page(page);
659 } 694 }
660 return 1; 695 return 1;
661 696
662 not_empty: 697 not_empty:
663 ext2_put_page(page); 698 ext2_put_page(page);
664 return 0; 699 return 0;
665 } 700 }
666 701
667 struct file_operations ext2_dir_operations = { !! 702 const struct file_operations ext2_dir_operations = {
668 .llseek = generic_file_llseek, 703 .llseek = generic_file_llseek,
669 .read = generic_read_dir, 704 .read = generic_read_dir,
670 .readdir = ext2_readdir, 705 .readdir = ext2_readdir,
671 .ioctl = ext2_ioctl, !! 706 .unlocked_ioctl = ext2_ioctl,
>> 707 #ifdef CONFIG_COMPAT
>> 708 .compat_ioctl = ext2_compat_ioctl,
>> 709 #endif
672 .fsync = ext2_sync_file, 710 .fsync = ext2_sync_file,
673 }; 711 };
674 712
|
This page was automatically generated by the
LXR engine.
|