diff options
| author | Tao Ma | 2012-12-10 20:05:58 +0100 |
|---|---|---|
| committer | Theodore Ts'o | 2012-12-10 20:05:58 +0100 |
| commit | 226ba972b0863783ad377f741f6ff0538f31ab00 (patch) | |
| tree | 72e089868a0856a1968d6118e359d0ae13f5cc91 /fs/ext4/ext4.h | |
| parent | ext4: make ext4_init_dot_dotdot for inline dir usage (diff) | |
| download | kernel-qcow2-linux-226ba972b0863783ad377f741f6ff0538f31ab00.tar.gz kernel-qcow2-linux-226ba972b0863783ad377f741f6ff0538f31ab00.tar.xz kernel-qcow2-linux-226ba972b0863783ad377f741f6ff0538f31ab00.zip | |
ext4: refactor __ext4_check_dir_entry() to accept start and size
The __ext4_check_dir_entry() function() is used to check whether the
de is over the block boundary. Now with inline data, it could be
within the block boundary while exceeds the inode size. So check this
function to check the overflow more precisely.
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/ext4.h')
| -rw-r--r-- | fs/ext4/ext4.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index cf840146ce81..59cbf498fd5f 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -1960,10 +1960,11 @@ ext4_fsblk_t ext4_inode_to_goal_block(struct inode *); extern int __ext4_check_dir_entry(const char *, unsigned int, struct inode *, struct file *, struct ext4_dir_entry_2 *, - struct buffer_head *, unsigned int); -#define ext4_check_dir_entry(dir, filp, de, bh, offset) \ + struct buffer_head *, char *, int, + unsigned int); +#define ext4_check_dir_entry(dir, filp, de, bh, buf, size, offset) \ unlikely(__ext4_check_dir_entry(__func__, __LINE__, (dir), (filp), \ - (de), (bh), (offset))) + (de), (bh), (buf), (size), (offset))) extern int ext4_htree_store_dirent(struct file *dir_file, __u32 hash, __u32 minor_hash, struct ext4_dir_entry_2 *dirent); |