From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754959AbcHXUF7 (ORCPT ); Wed, 24 Aug 2016 16:05:59 -0400 Received: from mailrelay117.isp.belgacom.be ([195.238.20.144]:48891 "EHLO mailrelay117.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753068AbcHXUFD (ORCPT ); Wed, 24 Aug 2016 16:05:03 -0400 X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2CDAwBX/L1X/+tCtVtcDoJjOAEBAQEBH?= =?us-ascii?q?oFSs1WCKoIPgX6GHQKBTDkUAgEBAQEBAQFeJ4RiBlYjEFE5HgYBEog2tQKKHQE?= =?us-ascii?q?BCCeGLY5MHQWZSI8iAo9OSI9xHjaDQj06NIhXAQEB?= From: Fabian Frederick To: tytso@mit.edu, Andreas Dilger Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, fabf@skynet.be Subject: [PATCH 2/6 linux-next] ext4: remove unneeded test in ext4_alloc_file_blocks() Date: Wed, 24 Aug 2016 22:03:16 +0200 Message-Id: <1472069000-18897-3-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1472069000-18897-1-git-send-email-fabf@skynet.be> References: <1472069000-18897-1-git-send-email-fabf@skynet.be> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Signed-off-by: Fabian Frederick --- fs/ext4/extents.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 5d9f99a..4f1cca8 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4693,13 +4693,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) { -- 2.8.1