From patchwork Fri Dec 6 09:57:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 297670 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8F68E2C00A7 for ; Fri, 6 Dec 2013 20:55:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757611Ab3LFJzx (ORCPT ); Fri, 6 Dec 2013 04:55:53 -0500 Received: from mail-pd0-f177.google.com ([209.85.192.177]:42004 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757460Ab3LFJzh (ORCPT ); Fri, 6 Dec 2013 04:55:37 -0500 Received: by mail-pd0-f177.google.com with SMTP id q10so742083pdj.22 for ; Fri, 06 Dec 2013 01:55:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=K0IfQIGfA046Q5whWNg/Hv96c5JCRh+KdBEJ94gdkbY=; b=EvIOhh7w2R8OuzwVb3FaMkpG1jtKxOghfj9fPq8w60gN+QwMa1enkT8ONKNqVv6Oy2 Oo6uguNy1gLeQXAZ+3L2W203dI9bSr+u6QBd+ev/+PpNKTik5eLbadwjvWoAxxf105Va 2WQ/ixYEsuan+riw9s2bYWGUtNgGDFFCOgF0QKuS/HVQD6O00CHWbu0X0yRDwS3S+lKg anBU1LWK7uTC3S3BL2iPXLfXei2s95oQS/QI9sye+w5DpGyqS2/xIOiHl7HnVqa5mUcs uji4cX5MbKrkrGEQSMXhI9p93u8Kx6SQfs1X8cupwEWw6bKe6+Yt2SlYjBxp4ZZHU6wY jaqQ== X-Received: by 10.66.25.36 with SMTP id z4mr3121121paf.101.1386323737003; Fri, 06 Dec 2013 01:55:37 -0800 (PST) Received: from alpha.taobao.ali.com ([182.92.247.2]) by mx.google.com with ESMTPSA id m2sm56582620pbn.19.2013.12.06.01.55.34 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 06 Dec 2013 01:55:36 -0800 (PST) From: Zheng Liu To: linux-ext4@vger.kernel.org Cc: Theodore Ts'o , "Darrick J. Wong" , Zheng Liu Subject: [PATCH v3 06/30] libext2fs: remove redundant code Date: Fri, 6 Dec 2013 17:57:53 +0800 Message-Id: <1386323897-2354-7-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.9.7 In-Reply-To: <1386323897-2354-1-git-send-email-wenqing.lz@taobao.com> References: <1386323897-2354-1-git-send-email-wenqing.lz@taobao.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: "Darrick J. Wong" Signed-off-by: Darrick J. Wong --- lib/ext2fs/ext_attr.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/lib/ext2fs/ext_attr.c b/lib/ext2fs/ext_attr.c index 81f60ca..1b65c4b 100644 --- a/lib/ext2fs/ext_attr.c +++ b/lib/ext2fs/ext_attr.c @@ -466,7 +466,7 @@ errcode_t ext2fs_xattrs_write(struct ext2_xattr_handle *handle) __u32 ea_inode_magic; blk64_t blk; unsigned int storage_size; - unsigned int i, written; + unsigned int i; errcode_t err; if (!EXT2_HAS_COMPAT_FEATURE(handle->fs->super, @@ -531,26 +531,24 @@ write_ea_block: goto out2; } - if (block_buf) { - /* Write a header on the EA block */ - header = block_buf; - header->h_magic = EXT2_EXT_ATTR_MAGIC; - header->h_refcount = 1; - header->h_blocks = 1; + /* Write a header on the EA block */ + header = block_buf; + header->h_magic = EXT2_EXT_ATTR_MAGIC; + header->h_refcount = 1; + header->h_blocks = 1; - /* Get a new block for writing */ - err = prep_ea_block_for_write(handle->fs, handle->ino, inode); - if (err) - goto out2; + /* Get a new block for writing */ + err = prep_ea_block_for_write(handle->fs, handle->ino, inode); + if (err) + goto out2; - /* Finally, write the new EA block */ - blk = ext2fs_file_acl_block(handle->fs, - (struct ext2_inode *)inode); - err = ext2fs_write_ext_attr3(handle->fs, blk, block_buf, - handle->ino); - if (err) - goto out2; - } + /* Finally, write the new EA block */ + blk = ext2fs_file_acl_block(handle->fs, + (struct ext2_inode *)inode); + err = ext2fs_write_ext_attr3(handle->fs, blk, block_buf, + handle->ino); + if (err) + goto out2; skip_ea_block: blk = ext2fs_file_acl_block(handle->fs, (struct ext2_inode *)inode); @@ -663,7 +661,6 @@ static errcode_t read_xattrs_from_buffer(struct ext2_xattr_handle *handle, errcode_t ext2fs_xattrs_read(struct ext2_xattr_handle *handle) { struct ext2_xattr *attrs = NULL, *x; - unsigned int attrs_len; struct ext2_inode_large *inode; struct ext2_ext_attr_header *header; __u32 ea_inode_magic; @@ -765,8 +762,6 @@ out: return err; } -#define XATTR_ABORT 1 -#define XATTR_CHANGED 2 errcode_t ext2fs_xattrs_iterate(struct ext2_xattr_handle *h, int (*func)(char *name, char *value, size_t value_len, void *data),