ext4: rename ext4_xattr_check_names() to ext4_xattr_check_entries()
authorEric Biggers <ebiggers@google.com>
Sun, 30 Apr 2017 03:56:52 +0000 (23:56 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Sun, 30 Apr 2017 03:56:52 +0000 (23:56 -0400)
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>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/ext4/xattr.c

index 8e9d0d4c6234f498c90eb94da20339de4c70f5d3..c5a3e98bd74d54db332f71c651d06c0cb3286dd7 100644 (file)
@@ -162,8 +162,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;
 
@@ -217,8 +217,8 @@ ext4_xattr_check_block(struct inode *inode, struct buffer_head *bh)
                return -EFSCORRUPTED;
        if (!ext4_xattr_block_csum_verify(inode, 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;
@@ -233,7 +233,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,