diff options
Diffstat (limited to 'fs/nilfs2/dir.c')
-rw-r--r-- | fs/nilfs2/dir.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c index 76d803e060a9..0092840492ee 100644 --- a/fs/nilfs2/dir.c +++ b/fs/nilfs2/dir.c | |||
@@ -224,7 +224,7 @@ fail: | |||
224 | * len <= NILFS_NAME_LEN and de != NULL are guaranteed by caller. | 224 | * len <= NILFS_NAME_LEN and de != NULL are guaranteed by caller. |
225 | */ | 225 | */ |
226 | static int | 226 | static int |
227 | nilfs_match(int len, const char * const name, struct nilfs_dir_entry *de) | 227 | nilfs_match(int len, const unsigned char *name, struct nilfs_dir_entry *de) |
228 | { | 228 | { |
229 | if (len != de->name_len) | 229 | if (len != de->name_len) |
230 | return 0; | 230 | return 0; |
@@ -349,11 +349,11 @@ done: | |||
349 | * Entry is guaranteed to be valid. | 349 | * Entry is guaranteed to be valid. |
350 | */ | 350 | */ |
351 | struct nilfs_dir_entry * | 351 | struct nilfs_dir_entry * |
352 | nilfs_find_entry(struct inode *dir, struct dentry *dentry, | 352 | nilfs_find_entry(struct inode *dir, const struct qstr *qstr, |
353 | struct page **res_page) | 353 | struct page **res_page) |
354 | { | 354 | { |
355 | const char *name = dentry->d_name.name; | 355 | const unsigned char *name = qstr->name; |
356 | int namelen = dentry->d_name.len; | 356 | int namelen = qstr->len; |
357 | unsigned reclen = NILFS_DIR_REC_LEN(namelen); | 357 | unsigned reclen = NILFS_DIR_REC_LEN(namelen); |
358 | unsigned long start, n; | 358 | unsigned long start, n; |
359 | unsigned long npages = dir_pages(dir); | 359 | unsigned long npages = dir_pages(dir); |
@@ -424,13 +424,13 @@ struct nilfs_dir_entry *nilfs_dotdot(struct inode *dir, struct page **p) | |||
424 | return de; | 424 | return de; |
425 | } | 425 | } |
426 | 426 | ||
427 | ino_t nilfs_inode_by_name(struct inode *dir, struct dentry *dentry) | 427 | ino_t nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr) |
428 | { | 428 | { |
429 | ino_t res = 0; | 429 | ino_t res = 0; |
430 | struct nilfs_dir_entry *de; | 430 | struct nilfs_dir_entry *de; |
431 | struct page *page; | 431 | struct page *page; |
432 | 432 | ||
433 | de = nilfs_find_entry(dir, dentry, &page); | 433 | de = nilfs_find_entry(dir, qstr, &page); |
434 | if (de) { | 434 | if (de) { |
435 | res = le64_to_cpu(de->inode); | 435 | res = le64_to_cpu(de->inode); |
436 | kunmap(page); | 436 | kunmap(page); |
@@ -465,7 +465,7 @@ void nilfs_set_link(struct inode *dir, struct nilfs_dir_entry *de, | |||
465 | int nilfs_add_link(struct dentry *dentry, struct inode *inode) | 465 | int nilfs_add_link(struct dentry *dentry, struct inode *inode) |
466 | { | 466 | { |
467 | struct inode *dir = dentry->d_parent->d_inode; | 467 | struct inode *dir = dentry->d_parent->d_inode; |
468 | const char *name = dentry->d_name.name; | 468 | const unsigned char *name = dentry->d_name.name; |
469 | int namelen = dentry->d_name.len; | 469 | int namelen = dentry->d_name.len; |
470 | unsigned chunk_size = nilfs_chunk_size(dir); | 470 | unsigned chunk_size = nilfs_chunk_size(dir); |
471 | unsigned reclen = NILFS_DIR_REC_LEN(namelen); | 471 | unsigned reclen = NILFS_DIR_REC_LEN(namelen); |