[1/2] ext4: rename ext4_xattr_check_names() to ext4_xattr_check_entries()

Submitted by Eric Biggers on March 15, 2017, 4:50 a.m.

Details

Message ID 20170315045057.18837-1-ebiggers3@gmail.com
State Awaiting Upstream
Headers show

Commit Message

Eric Biggers March 15, 2017, 4:50 a.m.
From: Eric Biggers <ebiggers@google.com>

ext4_xattr_check_names() actually validates both the xattr names and
values, not just the names.  So rename it to ext4_xattr_check_entries()
to avoid confusion.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 fs/ext4/xattr.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Jan Kara March 21, 2017, 3:25 p.m.
On Tue 14-03-17 21:50:55, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> ext4_xattr_check_names() actually validates both the xattr names and
> values, not just the names.  So rename it to ext4_xattr_check_entries()
> to avoid confusion.
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>

Looks good. You can add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza

> ---
>  fs/ext4/xattr.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
> index 1d59895a91ee..71bf40933bbb 100644
> --- a/fs/ext4/xattr.c
> +++ b/fs/ext4/xattr.c
> @@ -167,8 +167,8 @@ ext4_xattr_handler(int name_index)
>  }
>  
>  static int
> -ext4_xattr_check_names(struct ext4_xattr_entry *entry, void *end,
> -		       void *value_start)
> +ext4_xattr_check_entries(struct ext4_xattr_entry *entry, void *end,
> +			 void *value_start)
>  {
>  	struct ext4_xattr_entry *e = entry;
>  
> @@ -222,8 +222,8 @@ ext4_xattr_check_block(struct inode *inode, struct buffer_head *bh)
>  		return -EFSCORRUPTED;
>  	if (!ext4_xattr_block_csum_verify(inode, bh->b_blocknr, BHDR(bh)))
>  		return -EFSBADCRC;
> -	error = ext4_xattr_check_names(BFIRST(bh), bh->b_data + bh->b_size,
> -				       bh->b_data);
> +	error = ext4_xattr_check_entries(BFIRST(bh), bh->b_data + bh->b_size,
> +					 bh->b_data);
>  	if (!error)
>  		set_buffer_verified(bh);
>  	return error;
> @@ -238,7 +238,7 @@ __xattr_check_inode(struct inode *inode, struct ext4_xattr_ibody_header *header,
>  	if (end - (void *)header < sizeof(*header) + sizeof(u32) ||
>  	    (header->h_magic != cpu_to_le32(EXT4_XATTR_MAGIC)))
>  		goto errout;
> -	error = ext4_xattr_check_names(IFIRST(header), end, IFIRST(header));
> +	error = ext4_xattr_check_entries(IFIRST(header), end, IFIRST(header));
>  errout:
>  	if (error)
>  		__ext4_error_inode(inode, function, line, 0,
> -- 
> 2.12.0
>
Theodore Ts'o April 30, 2017, 4 a.m.
On Tue, Mar 14, 2017 at 09:50:55PM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> ext4_xattr_check_names() actually validates both the xattr names and
> values, not just the names.  So rename it to ext4_xattr_check_entries()
> to avoid confusion.
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>

Thanks, applied.

					- Ted

Patch hide | download patch | download mbox

diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index 1d59895a91ee..71bf40933bbb 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -167,8 +167,8 @@  ext4_xattr_handler(int name_index)
 }
 
 static int
-ext4_xattr_check_names(struct ext4_xattr_entry *entry, void *end,
-		       void *value_start)
+ext4_xattr_check_entries(struct ext4_xattr_entry *entry, void *end,
+			 void *value_start)
 {
 	struct ext4_xattr_entry *e = entry;
 
@@ -222,8 +222,8 @@  ext4_xattr_check_block(struct inode *inode, struct buffer_head *bh)
 		return -EFSCORRUPTED;
 	if (!ext4_xattr_block_csum_verify(inode, bh->b_blocknr, BHDR(bh)))
 		return -EFSBADCRC;
-	error = ext4_xattr_check_names(BFIRST(bh), bh->b_data + bh->b_size,
-				       bh->b_data);
+	error = ext4_xattr_check_entries(BFIRST(bh), bh->b_data + bh->b_size,
+					 bh->b_data);
 	if (!error)
 		set_buffer_verified(bh);
 	return error;
@@ -238,7 +238,7 @@  __xattr_check_inode(struct inode *inode, struct ext4_xattr_ibody_header *header,
 	if (end - (void *)header < sizeof(*header) + sizeof(u32) ||
 	    (header->h_magic != cpu_to_le32(EXT4_XATTR_MAGIC)))
 		goto errout;
-	error = ext4_xattr_check_names(IFIRST(header), end, IFIRST(header));
+	error = ext4_xattr_check_entries(IFIRST(header), end, IFIRST(header));
 errout:
 	if (error)
 		__ext4_error_inode(inode, function, line, 0,