From: Zheng Liu Subject: [PATCH] ext4: make ext4_add_dirent_to_inline function return 0 Date: Tue, 9 Jul 2013 08:11:39 +0800 Message-ID: <1373328699-23037-1-git-send-email-wenqing.lz@taobao.com> Cc: Zheng Liu , Tao Ma , "Theodore Ts'o" To: linux-ext4@vger.kernel.org Return-path: Received: from mail-pb0-f45.google.com ([209.85.160.45]:40461 "EHLO mail-pb0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753400Ab3GHXxH (ORCPT ); Mon, 8 Jul 2013 19:53:07 -0400 Received: by mail-pb0-f45.google.com with SMTP id mc8so4820251pbc.18 for ; Mon, 08 Jul 2013 16:53:07 -0700 (PDT) Sender: linux-ext4-owner@vger.kernel.org List-ID: From: Zheng Liu Currently ext4_add_dirent_to_inline() function returns 1 to indicate that a new directory entry has been added. But it sounds reasonable to return 0 in this function. Meanwhile we also can eliminate a if statement in ext4_add_entry() function when a directory entry has added correctly. Signed-off-by: Zheng Liu Cc: Tao Ma Cc: "Theodore Ts'o" --- fs/ext4/inline.c | 2 +- fs/ext4/namei.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index b8a0746..5a27d32 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -1027,7 +1027,7 @@ static int ext4_add_dirent_to_inline(handle_t *handle, ext4_update_dx_flag(dir); dir->i_version++; ext4_mark_inode_dirty(handle, dir); - return 1; + return 0; } static void *ext4_get_inline_xattr_pos(struct inode *inode, diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index ab2f6dc..2a6a736 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1901,12 +1901,8 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry, if (ext4_has_inline_data(dir)) { retval = ext4_try_add_inline_entry(handle, dentry, inode); - if (retval < 0) + if (retval <= 0) return retval; - if (retval == 1) { - retval = 0; - return retval; - } } if (is_dx(dir)) { -- 1.7.9.7