From patchwork Wed Mar 15 04:33:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 739017 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 3vjdzr4KSqz9s2Q for ; Wed, 15 Mar 2017 15:34:32 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="JI4lEXE/"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750819AbdCOEea (ORCPT ); Wed, 15 Mar 2017 00:34:30 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34800 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750768AbdCOEe3 (ORCPT ); Wed, 15 Mar 2017 00:34:29 -0400 Received: by mail-pf0-f193.google.com with SMTP id o126so823835pfb.1 for ; Tue, 14 Mar 2017 21:34:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=yIkjUw9IcO+CmeHFC2XqpSrpYPks1i2N8uRfe6yi6zE=; b=JI4lEXE/QhkHFq6o6qjwkTMIVTbfkKvTNJy/Er7QcUmZarFpJRFwvxhQvw6Os/vtjD T/q9xxREhew3tbiFYrL+sZCbQTQEQH9oqzTqa7GvmxyFHF8beHxT1dEQJzp5anh79pWm G1u+7J89/5lsKowgZcZIwSJU4B37QKj502KVWcypMnxuOUSjPXVS6X1r6clzYhSASh/+ xQ6JtFzagRj94pM061j1+9cpSNoKdYnUbRaC/NCgyLMwBaBGgMwmIGlRb4kLcP8ow2ft SfJiIxEplcGicf3R5p4ctXHcDnm8MCSIlZu5ffWRhSxYGc6KGZJRsnmMa5v6+M6ii6k8 C4XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=yIkjUw9IcO+CmeHFC2XqpSrpYPks1i2N8uRfe6yi6zE=; b=Bh5I7iHydv23IQJzEY5/KI+Nlo9SLIIeB0AncmF9ktN/CAkbuX4YeR3MyJjP0NFUiv f+ZITka+/CX/ybA6Sg8gfIkJCNxRmHmUh1jzU1wbv+rqIW99NBmhEVhAdIwvA/tFYRfi 3rZGrFJItL6UoB2v0LmRJNSlhUkkCcgjVCE7wG67r0OuLFZh0ZFMDorLdgRAEuBUS4b6 Ve0zu7cBazL59Sr9+dQr6MC0rwXKI3CjtRR1jiS7q/pPrJkDYBRKZCRBXqktQbMIC/y8 1cREJD9Ie9aFMTH5RwZX1zxEsEfjCxTKS1tMegzc3QHyE/4M65i63mK0nqAuJHVIvFlP 98ag== X-Gm-Message-State: AFeK/H2rMyEHEtTT11U53Opfp+5HwhMZFDk8OSiX5N1iZTs4khPmTlOGi1m09lrsXvTQvg== X-Received: by 10.98.102.147 with SMTP id s19mr1366911pfj.202.1489552468350; Tue, 14 Mar 2017 21:34:28 -0700 (PDT) Received: from zzz.hsd1.wa.comcast.net (c-73-239-167-150.hsd1.wa.comcast.net. [73.239.167.150]) by smtp.gmail.com with ESMTPSA id 197sm911161pfv.19.2017.03.14.21.34.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Mar 2017 21:34:27 -0700 (PDT) From: Eric Biggers To: linux-ext4@vger.kernel.org Cc: Theodore Ts'o , Andreas Dilger , Eric Biggers Subject: [PATCH] ext4: merge ext4_xattr_list() into ext4_listxattr() Date: Tue, 14 Mar 2017 21:33:25 -0700 Message-Id: <20170315043325.6764-1-ebiggers3@gmail.com> X-Mailer: git-send-email 2.12.0 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Eric Biggers There's no difference between ext4_xattr_list() and ext4_listxattr(), so merge them together and just have ext4_listxattr(). Some years ago they took different arguments, but that's no longer the case. Signed-off-by: Eric Biggers Reviewed-by: Jan Kara --- fs/ext4/xattr.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index 67636acf7624..1d59895a91ee 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -78,8 +78,6 @@ static struct buffer_head *ext4_xattr_cache_find(struct inode *, struct mb_cache_entry **); static void ext4_xattr_rehash(struct ext4_xattr_header *, struct ext4_xattr_entry *); -static int ext4_xattr_list(struct dentry *dentry, char *buffer, - size_t buffer_size); static const struct xattr_handler *ext4_xattr_handler_map[] = { [EXT4_XATTR_INDEX_USER] = &ext4_xattr_user_handler, @@ -168,17 +166,6 @@ ext4_xattr_handler(int name_index) return handler; } -/* - * Inode operation listxattr() - * - * d_inode(dentry)->i_mutex: don't care - */ -ssize_t -ext4_listxattr(struct dentry *dentry, char *buffer, size_t size) -{ - return ext4_xattr_list(dentry, buffer, size); -} - static int ext4_xattr_check_names(struct ext4_xattr_entry *entry, void *end, void *value_start) @@ -524,7 +511,9 @@ ext4_xattr_ibody_list(struct dentry *dentry, char *buffer, size_t buffer_size) } /* - * ext4_xattr_list() + * Inode operation listxattr() + * + * d_inode(dentry)->i_rwsem: don't care * * Copy a list of attribute names into the buffer * provided, or compute the buffer size required. @@ -533,8 +522,8 @@ ext4_xattr_ibody_list(struct dentry *dentry, char *buffer, size_t buffer_size) * Returns a negative error number on failure, or the number of bytes * used / required on success. */ -static int -ext4_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size) +ssize_t +ext4_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size) { int ret, ret2;