diff options
author | Theodore Ts'o <tytso@mit.edu> | 2009-11-22 07:44:56 -0500 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2009-11-22 07:44:56 -0500 |
commit | 4433871130f36585fde38e7dd817433296648945 (patch) | |
tree | 5dd91fbb345f5a4240f4d2df271da49ca1a6037b /fs/ext4/balloc.c | |
parent | b7e57e7c2a41826e51fe060fae5158bfc7a04e81 (diff) | |
download | kernel_samsung_smdk4412-4433871130f36585fde38e7dd817433296648945.zip kernel_samsung_smdk4412-4433871130f36585fde38e7dd817433296648945.tar.gz kernel_samsung_smdk4412-4433871130f36585fde38e7dd817433296648945.tar.bz2 |
ext4: fold ext4_free_blocks() and ext4_mb_free_blocks()
ext4_mb_free_blocks() is only called by ext4_free_blocks(), and the
latter function doesn't really do much. So merge the two functions
together, such that ext4_free_blocks() is now found in
fs/ext4/mballoc.c. This saves about 200 bytes of compiled text space.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/balloc.c')
-rw-r--r-- | fs/ext4/balloc.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c index f3032c9..22bc743 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c @@ -499,44 +499,6 @@ error_return: } /** - * ext4_free_blocks() -- Free given blocks and update quota - * @handle: handle for this transaction - * @inode: inode - * @block: start physical block to free - * @count: number of blocks to count - * @metadata: Are these metadata blocks - */ -void ext4_free_blocks(handle_t *handle, struct inode *inode, - ext4_fsblk_t block, unsigned long count, - int metadata) -{ - struct super_block *sb; - unsigned long dquot_freed_blocks; - - /* this isn't the right place to decide whether block is metadata - * inode.c/extents.c knows better, but for safety ... */ - if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode)) - metadata = 1; - - /* We need to make sure we don't reuse - * block released untill the transaction commit. - * writeback mode have weak data consistency so - * don't force data as metadata when freeing block - * for writeback mode. - */ - if (metadata == 0 && !ext4_should_writeback_data(inode)) - metadata = 1; - - sb = inode->i_sb; - - ext4_mb_free_blocks(handle, inode, block, count, - metadata, &dquot_freed_blocks); - if (dquot_freed_blocks) - vfs_dq_free_block(inode, dquot_freed_blocks); - return; -} - -/** * ext4_has_free_blocks() * @sbi: in-core super block structure. * @nblocks: number of needed blocks |