From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C6CAC169C4 for ; Fri, 8 Feb 2019 07:10:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DD6C021917 for ; Fri, 8 Feb 2019 07:10:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727021AbfBHHKo (ORCPT ); Fri, 8 Feb 2019 02:10:44 -0500 Received: from mx2.suse.de ([195.135.220.15]:53032 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726004AbfBHHKo (ORCPT ); Fri, 8 Feb 2019 02:10:44 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id A9A07AF27; Fri, 8 Feb 2019 07:10:42 +0000 (UTC) Subject: Re: [PATCH 3/5] btrfs: reorg functions to drop forward declaration To: Anand Jain , linux-btrfs@vger.kernel.org References: <1549609355-11053-1-git-send-email-anand.jain@oracle.com> <1549609355-11053-4-git-send-email-anand.jain@oracle.com> From: Nikolay Borisov Openpgp: preference=signencrypt Autocrypt: addr=nborisov@suse.com; prefer-encrypt=mutual; keydata= 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 Message-ID: <4625b575-8599-00f2-3334-1789b6718d66@suse.com> Date: Fri, 8 Feb 2019 09:10:41 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: <1549609355-11053-4-git-send-email-anand.jain@oracle.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org On 8.02.19 г. 9:02 ч., Anand Jain wrote: > In preparation to drop forward declaration of the functions, > prop_compression_validate(), prop_compression_apply() and > prop_compression_extract(). Move prop_handlers[], btrfs_props_init() > prop_compression_validate(), prop_compression_apply() and > prop_compression_extract() appropriately with in the file. No functional > changes. > > Signed-off-by: Anand Jain I'm fine with this, however I think this and the next patch could really be squashed into one, but let's see what David prefers. Reviewed-by: Nikolay Borisov > --- > fs/btrfs/props.c | 157 ++++++++++++++++++++++++++++--------------------------- > 1 file changed, 79 insertions(+), 78 deletions(-) > > diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c > index 4525a2a4d1cd..6f52e3d21012 100644 > --- a/fs/btrfs/props.c > +++ b/fs/btrfs/props.c > @@ -29,30 +29,6 @@ static int prop_compression_apply(struct inode *inode, > size_t len); > static const char *prop_compression_extract(struct inode *inode); > > -static struct prop_handler prop_handlers[] = { > - { > - .xattr_name = XATTR_BTRFS_PREFIX "compression", > - .validate = prop_compression_validate, > - .apply = prop_compression_apply, > - .extract = prop_compression_extract, > - .inheritable = 1 > - }, > -}; > - > -void __init btrfs_props_init(void) > -{ > - int i; > - > - hash_init(prop_handlers_ht); > - > - for (i = 0; i < ARRAY_SIZE(prop_handlers); i++) { > - struct prop_handler *p = &prop_handlers[i]; > - u64 h = btrfs_name_hash(p->xattr_name, strlen(p->xattr_name)); > - > - hash_add(prop_handlers_ht, &p->node, h); > - } > -} > - > static const struct hlist_head *find_prop_handlers_by_hash(const u64 hash) > { > struct hlist_head *h; > @@ -271,6 +247,78 @@ int btrfs_load_inode_props(struct inode *inode, struct btrfs_path *path) > return ret; > } > > +static int prop_compression_validate(const char *value, size_t len) > +{ > + if (!value) > + return 0; > + > + if (!strncmp("lzo", value, len)) > + return 0; > + else if (!strncmp("zlib", value, len)) > + return 0; > + else if (!strncmp("zstd", value, len)) > + return 0; > + > + return -EINVAL; > +} > + > +static int prop_compression_apply(struct inode *inode, const char *value, > + size_t len) > +{ > + struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); > + int type; > + > + if (len == 0) { > + BTRFS_I(inode)->flags |= BTRFS_INODE_NOCOMPRESS; > + BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS; > + BTRFS_I(inode)->prop_compress = BTRFS_COMPRESS_NONE; > + > + return 0; > + } > + > + if (!strncmp("lzo", value, 3)) { > + type = BTRFS_COMPRESS_LZO; > + btrfs_set_fs_incompat(fs_info, COMPRESS_LZO); > + } else if (!strncmp("zlib", value, 4)) { > + type = BTRFS_COMPRESS_ZLIB; > + } else if (!strncmp("zstd", value, len)) { > + type = BTRFS_COMPRESS_ZSTD; > + btrfs_set_fs_incompat(fs_info, COMPRESS_ZSTD); > + } else { > + return -EINVAL; > + } > + > + BTRFS_I(inode)->flags &= ~BTRFS_INODE_NOCOMPRESS; > + BTRFS_I(inode)->flags |= BTRFS_INODE_COMPRESS; > + BTRFS_I(inode)->prop_compress = type; > + > + return 0; > +} > + > +static const char *prop_compression_extract(struct inode *inode) > +{ > + switch (BTRFS_I(inode)->prop_compress) { > + case BTRFS_COMPRESS_ZLIB: > + case BTRFS_COMPRESS_LZO: > + case BTRFS_COMPRESS_ZSTD: > + return btrfs_compress_type2str(BTRFS_I(inode)->prop_compress); > + default: > + break; > + } > + > + return NULL; > +} > + > +static struct prop_handler prop_handlers[] = { > + { > + .xattr_name = XATTR_BTRFS_PREFIX "compression", > + .validate = prop_compression_validate, > + .apply = prop_compression_apply, > + .extract = prop_compression_extract, > + .inheritable = 1 > + }, > +}; > + > static int inherit_props(struct btrfs_trans_handle *trans, > struct inode *inode, > struct inode *parent) > @@ -352,64 +400,17 @@ int btrfs_subvol_inherit_props(struct btrfs_trans_handle *trans, > return ret; > } > > -static int prop_compression_validate(const char *value, size_t len) > -{ > - if (!strncmp("lzo", value, len)) > - return 0; > - else if (!strncmp("zlib", value, len)) > - return 0; > - else if (!strncmp("zstd", value, len)) > - return 0; > - > - return -EINVAL; > -} > - > -static int prop_compression_apply(struct inode *inode, > - const char *value, > - size_t len) > +void __init btrfs_props_init(void) > { > - struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); > - int type; > - > - if (len == 0) { > - BTRFS_I(inode)->flags |= BTRFS_INODE_NOCOMPRESS; > - BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS; > - BTRFS_I(inode)->prop_compress = BTRFS_COMPRESS_NONE; > - > - return 0; > - } > - > - if (!strncmp("lzo", value, 3)) { > - type = BTRFS_COMPRESS_LZO; > - btrfs_set_fs_incompat(fs_info, COMPRESS_LZO); > - } else if (!strncmp("zlib", value, 4)) { > - type = BTRFS_COMPRESS_ZLIB; > - } else if (!strncmp("zstd", value, len)) { > - type = BTRFS_COMPRESS_ZSTD; > - btrfs_set_fs_incompat(fs_info, COMPRESS_ZSTD); > - } else { > - return -EINVAL; > - } > + int i; > > - BTRFS_I(inode)->flags &= ~BTRFS_INODE_NOCOMPRESS; > - BTRFS_I(inode)->flags |= BTRFS_INODE_COMPRESS; > - BTRFS_I(inode)->prop_compress = type; > + hash_init(prop_handlers_ht); > > - return 0; > -} > + for (i = 0; i < ARRAY_SIZE(prop_handlers); i++) { > + struct prop_handler *p = &prop_handlers[i]; > + u64 h = btrfs_name_hash(p->xattr_name, strlen(p->xattr_name)); > > -static const char *prop_compression_extract(struct inode *inode) > -{ > - switch (BTRFS_I(inode)->prop_compress) { > - case BTRFS_COMPRESS_ZLIB: > - case BTRFS_COMPRESS_LZO: > - case BTRFS_COMPRESS_ZSTD: > - return btrfs_compress_type2str(BTRFS_I(inode)->prop_compress); > - default: > - break; > + hash_add(prop_handlers_ht, &p->node, h); > } > - > - return NULL; > } > > - >