From patchwork Fri Dec 6 09:57:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 297663 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 B49A62C0098 for ; Fri, 6 Dec 2013 20:55:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757209Ab3LFJzc (ORCPT ); Fri, 6 Dec 2013 04:55:32 -0500 Received: from mail-pb0-f41.google.com ([209.85.160.41]:57427 "EHLO mail-pb0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754827Ab3LFJz1 (ORCPT ); Fri, 6 Dec 2013 04:55:27 -0500 Received: by mail-pb0-f41.google.com with SMTP id jt11so798451pbb.0 for ; Fri, 06 Dec 2013 01:55:27 -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=CRjj2vXW8pdISLWyjZOepZd339LwUez+iwk6zNGvHXE=; b=QijlckxKI8X3GoDc+/GinYXtN5wCyXGBThZ7ZY8Nz6weIe09EbBbf+izCXHGluoplv aUo0cfiErfHAVaVoW83e6KWxwMLoSrdWg6+RRBVQv75nli8p8L8XcKA8bWqJ3m2skOh5 PcPXulxfNP67JYF7eSnDIMADRXe9t/UxxQaBy5I/kY1SsgiIkZ2WCVmAKpV/hWC4EPa9 1O03wNu6+Q2vpH7c4fvD8qBGHE3SGxnBqi7jExoLutGG7j2TW8mzqG11SVJZy7t9L+8+ 2TEzx5QXDlU0X4b9u7J2t3CO4ynQBWHBtiU2z1k2m8GAE57LBZ19TxGwqdUIT5mB7rFU E5lA== X-Received: by 10.68.20.70 with SMTP id l6mr3007674pbe.152.1386323727226; Fri, 06 Dec 2013 01:55:27 -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.25 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 06 Dec 2013 01:55:26 -0800 (PST) From: Zheng Liu To: linux-ext4@vger.kernel.org Cc: Theodore Ts'o , "Darrick J. Wong" , Zheng Liu Subject: [PATCH v3 02/30] libext2fs: various tweaks to the xattr editor APIs Date: Fri, 6 Dec 2013 17:57:49 +0800 Message-Id: <1386323897-2354-3-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" A few tweaks to the extended attribute editing APIs: * Use size_t, not unsigned int, in the new extended attribute editing API. * Don't expose the _expand() call since there should be no external users. * Add a function to return the number of attributes. Signed-off-by: Darrick J. Wong --- lib/ext2fs/ext2fs.h | 8 +++----- lib/ext2fs/ext_attr.c | 16 ++++++++-------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h index 30bd4cf..57db793 100644 --- a/lib/ext2fs/ext2fs.h +++ b/lib/ext2fs/ext2fs.h @@ -1149,20 +1149,18 @@ extern errcode_t ext2fs_adjust_ea_refcount3(ext2_filsys fs, blk64_t blk, char *block_buf, int adjust, __u32 *newcount, ext2_ino_t inum); -errcode_t ext2fs_xattrs_expand(struct ext2_xattr_handle *h, - unsigned int expandby); errcode_t ext2fs_xattrs_write(struct ext2_xattr_handle *handle); errcode_t ext2fs_xattrs_read(struct ext2_xattr_handle *handle); errcode_t ext2fs_xattrs_iterate(struct ext2_xattr_handle *h, int (*func)(char *name, char *value, - void *data), + size_t value_len, void *data), void *data); errcode_t ext2fs_xattr_get(struct ext2_xattr_handle *h, const char *key, - void **value, unsigned int *value_len); + void **value, size_t *value_len); errcode_t ext2fs_xattr_set(struct ext2_xattr_handle *handle, const char *key, const void *value, - unsigned int value_len); + size_t value_len); errcode_t ext2fs_xattr_remove(struct ext2_xattr_handle *handle, const char *key); errcode_t ext2fs_xattrs_open(ext2_filsys fs, ext2_ino_t ino, diff --git a/lib/ext2fs/ext_attr.c b/lib/ext2fs/ext_attr.c index c54925f..fa082ad 100644 --- a/lib/ext2fs/ext_attr.c +++ b/lib/ext2fs/ext_attr.c @@ -191,19 +191,19 @@ errcode_t ext2fs_adjust_ea_refcount(ext2_filsys fs, blk_t blk, struct ext2_xattr { char *name; void *value; - unsigned int value_len; + size_t value_len; }; struct ext2_xattr_handle { ext2_filsys fs; struct ext2_xattr *attrs; - unsigned int length; + size_t length; ext2_ino_t ino; int dirty; }; -errcode_t ext2fs_xattrs_expand(struct ext2_xattr_handle *h, - unsigned int expandby) +static errcode_t ext2fs_xattrs_expand(struct ext2_xattr_handle *h, + unsigned int expandby) { struct ext2_xattr *new_attrs; errcode_t err; @@ -767,7 +767,7 @@ out: #define XATTR_CHANGED 2 errcode_t ext2fs_xattrs_iterate(struct ext2_xattr_handle *h, int (*func)(char *name, char *value, - void *data), + size_t value_len, void *data), void *data) { struct ext2_xattr *x; @@ -778,7 +778,7 @@ errcode_t ext2fs_xattrs_iterate(struct ext2_xattr_handle *h, if (!x->name) continue; - ret = func(x->name, x->value, data); + ret = func(x->name, x->value, x->value_len, data); if (ret & XATTR_CHANGED) h->dirty = 1; if (ret & XATTR_ABORT) @@ -789,7 +789,7 @@ errcode_t ext2fs_xattrs_iterate(struct ext2_xattr_handle *h, } errcode_t ext2fs_xattr_get(struct ext2_xattr_handle *h, const char *key, - void **value, unsigned int *value_len) + void **value, size_t *value_len) { struct ext2_xattr *x; void *val; @@ -816,7 +816,7 @@ errcode_t ext2fs_xattr_get(struct ext2_xattr_handle *h, const char *key, errcode_t ext2fs_xattr_set(struct ext2_xattr_handle *handle, const char *key, const void *value, - unsigned int value_len) + size_t value_len) { struct ext2_xattr *x, *last_empty; char *new_value;