diff options
| author | Fabian Frederick <fabf@skynet.be> | 2016-09-15 17:52:07 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2016-09-15 17:52:07 +0200 |
| commit | c3fe493ccdb1f443c30155150391835004014c6a (patch) | |
| tree | 2e8c0dc7f294a7810abf0e8b27d0765573d774c9 | |
| parent | ext4: fix memory leak in ext4_insert_range() (diff) | |
| download | linux-c3fe493ccdb1f443c30155150391835004014c6a.tar.xz linux-c3fe493ccdb1f443c30155150391835004014c6a.zip | |
ext4: remove unneeded test in ext4_alloc_file_blocks()
ext4_alloc_file_blocks() is called from ext4_zero_range() and
ext4_fallocate() both already testing EXT4_INODE_EXTENTS
We can call ext_depth(inode) unconditionnally.
[ Added BUG_ON check to make sure ext4_alloc_file_blocks() won't get
called for a indirect-mapped inode in the future. -- tytso ]
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | fs/ext4/extents.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 7f69347bd5a5..ef288558b869 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4679,6 +4679,7 @@ static int ext4_alloc_file_blocks(struct file *file, ext4_lblk_t offset, unsigned int credits; loff_t epos; + BUG_ON(!ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)); map.m_lblk = offset; map.m_len = len; /* @@ -4693,13 +4694,7 @@ static int ext4_alloc_file_blocks(struct file *file, ext4_lblk_t offset, * credits to insert 1 extent into extent tree */ credits = ext4_chunk_trans_blocks(inode, len); - /* - * We can only call ext_depth() on extent based inodes - */ - if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) - depth = ext_depth(inode); - else - depth = -1; + depth = ext_depth(inode); retry: while (ret >= 0 && len) { |