diff options
author | Theodore Ts'o <tytso@mit.edu> | 2010-07-27 11:54:40 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2010-07-27 11:54:40 -0400 |
commit | 60fd4da34d55a9cc0d857fc76dc12cf8cab4ed02 (patch) | |
tree | 72c6b3d9c7680070a751da56bd9068f71e7b106f /fs/ext4/dir.c | |
parent | 90c7201b97bb7ac5a4e2605abc0efb5fdfb957f0 (diff) |
ext4: Cleanup ext4_check_dir_entry so __func__ is now implicit
Also start passing the line number to ext4_check_dir since we're going
to need it in upcoming patch.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/dir.c')
-rw-r--r-- | fs/ext4/dir.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c index 2965c39d4183..af581f08fe3a 100644 --- a/fs/ext4/dir.c +++ b/fs/ext4/dir.c | |||
@@ -61,10 +61,11 @@ static unsigned char get_dtype(struct super_block *sb, int filetype) | |||
61 | } | 61 | } |
62 | 62 | ||
63 | 63 | ||
64 | int ext4_check_dir_entry(const char *function, struct inode *dir, | 64 | int __ext4_check_dir_entry(const char *function, unsigned int line, |
65 | struct ext4_dir_entry_2 *de, | 65 | struct inode *dir, |
66 | struct buffer_head *bh, | 66 | struct ext4_dir_entry_2 *de, |
67 | unsigned int offset) | 67 | struct buffer_head *bh, |
68 | unsigned int offset) | ||
68 | { | 69 | { |
69 | const char *error_msg = NULL; | 70 | const char *error_msg = NULL; |
70 | const int rlen = ext4_rec_len_from_disk(de->rec_len, | 71 | const int rlen = ext4_rec_len_from_disk(de->rec_len, |
@@ -194,7 +195,7 @@ revalidate: | |||
194 | while (!error && filp->f_pos < inode->i_size | 195 | while (!error && filp->f_pos < inode->i_size |
195 | && offset < sb->s_blocksize) { | 196 | && offset < sb->s_blocksize) { |
196 | de = (struct ext4_dir_entry_2 *) (bh->b_data + offset); | 197 | de = (struct ext4_dir_entry_2 *) (bh->b_data + offset); |
197 | if (!ext4_check_dir_entry("ext4_readdir", inode, de, | 198 | if (!ext4_check_dir_entry(inode, de, |
198 | bh, offset)) { | 199 | bh, offset)) { |
199 | /* | 200 | /* |
200 | * On error, skip the f_pos to the next block | 201 | * On error, skip the f_pos to the next block |