Linux-BTRFS Archive on lore.kernel.org
 help / Atom feed
From: Nikolay Borisov <nborisov@suse.com>
To: Anand Jain <anand.jain@oracle.com>, linux-btrfs@vger.kernel.org
Subject: Re: [PATCH 3/5] btrfs: reorg functions to drop forward declaration
Date: Fri, 8 Feb 2019 09:10:41 +0200
Message-ID: <4625b575-8599-00f2-3334-1789b6718d66@suse.com> (raw)
In-Reply-To: <1549609355-11053-4-git-send-email-anand.jain@oracle.com>



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 <anand.jain@oracle.com>

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 <nborisov@suse.com>

> ---
>  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;
>  }
>  
> -
> 

  reply index

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-08  7:02 [PATCH 0/5] Misc props.c cleanups Anand Jain
2019-02-08  7:02 ` [PATCH 1/5] btrfs: fix comment its device list mutex not volume lock Anand Jain
2019-02-08  7:07   ` Nikolay Borisov
2019-02-08  7:16     ` Anand Jain
2019-02-08  7:19       ` Nikolay Borisov
2019-02-08  7:39         ` [PATCH v2 " Anand Jain
2019-02-11 18:41           ` David Sterba
2019-02-08  7:02 ` [PATCH 2/5] btrfs: kill __btrfs_set_prop() Anand Jain
2019-02-08  7:02 ` [PATCH 3/5] btrfs: reorg functions to drop forward declaration Anand Jain
2019-02-08  7:10   ` Nikolay Borisov [this message]
2019-02-11 18:43     ` David Sterba
2019-02-08  7:02 ` [PATCH 4/5] btrfs: drop redundant forward declaration in props.c Anand Jain
2019-02-08  7:09   ` Nikolay Borisov
2019-02-08  7:02 ` [PATCH 5/5] btrfs: trivial, fix c coding style Anand Jain
2019-02-08  7:09   ` Nikolay Borisov
2019-02-08  7:15 ` [PATCH 0/5] Misc props.c cleanups Nikolay Borisov
2019-02-08  7:31   ` Anand Jain

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4625b575-8599-00f2-3334-1789b6718d66@suse.com \
    --to=nborisov@suse.com \
    --cc=anand.jain@oracle.com \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-BTRFS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-btrfs/0 linux-btrfs/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-btrfs linux-btrfs/ https://lore.kernel.org/linux-btrfs \
		linux-btrfs@vger.kernel.org linux-btrfs@archiver.kernel.org
	public-inbox-index linux-btrfs


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-btrfs


AGPL code for this site: git clone https://public-inbox.org/ public-inbox