diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2010-07-27 19:54:40 +0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2010-07-27 19:54:40 +0400 |
| commit | 60fd4da34d55a9cc0d857fc76dc12cf8cab4ed02 (patch) | |
| tree | 72c6b3d9c7680070a751da56bd9068f71e7b106f /fs/ext4/dir.c | |
| parent | 90c7201b97bb7ac5a4e2605abc0efb5fdfb957f0 (diff) | |
| download | linux-60fd4da34d55a9cc0d857fc76dc12cf8cab4ed02.tar.xz | |
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) } -int ext4_check_dir_entry(const char *function, struct inode *dir, - struct ext4_dir_entry_2 *de, - struct buffer_head *bh, - unsigned int offset) +int __ext4_check_dir_entry(const char *function, unsigned int line, + struct inode *dir, + struct ext4_dir_entry_2 *de, + struct buffer_head *bh, + unsigned int offset) { const char *error_msg = NULL; const int rlen = ext4_rec_len_from_disk(de->rec_len, @@ -194,7 +195,7 @@ revalidate: while (!error && filp->f_pos < inode->i_size && offset < sb->s_blocksize) { de = (struct ext4_dir_entry_2 *) (bh->b_data + offset); - if (!ext4_check_dir_entry("ext4_readdir", inode, de, + if (!ext4_check_dir_entry(inode, de, bh, offset)) { /* * On error, skip the f_pos to the next block |