staging: erofs: rename data_mapping_mode to datamode

data_mapping_mode is too long as a member name of erofs_vnode,
datamode is straight-forward enough.

Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/erofs/inode.c b/drivers/staging/erofs/inode.c
index 9520419..e51348f 100644 (file)
--- a/drivers/staging/erofs/inode.c
+++ b/drivers/staging/erofs/inode.c
@@ -22,11 +22,11 @@ static int read_inode(struct inode *inode, void *data)
        const unsigned int advise = le16_to_cpu(v1->i_advise);
        erofs_blk_t nblks = 0;
 
-       vi->data_mapping_mode = __inode_data_mapping(advise);
+       vi->datamode = __inode_data_mapping(advise);
 
-       if (unlikely(vi->data_mapping_mode >= EROFS_INODE_LAYOUT_MAX)) {
-               errln("unknown data mapping mode %u of nid %llu",
-                     vi->data_mapping_mode, vi->nid);
+       if (unlikely(vi->datamode >= EROFS_INODE_LAYOUT_MAX)) {
+               errln("unsupported data mapping %u of nid %llu",
+                     vi->datamode, vi->nid);
                DBG_BUGON(1);
                return -EIO;
        }
@@ -63,7 +63,7 @@ static int read_inode(struct inode *inode, void *data)
                inode->i_size = le64_to_cpu(v2->i_size);
 
                /* total blocks for compressed files */
-               if (vi->data_mapping_mode == EROFS_INODE_LAYOUT_COMPRESSION)
+               if (is_inode_layout_compression(inode))
                        nblks = le32_to_cpu(v2->i_u.compressed_blocks);
        } else if (__inode_version(advise) == EROFS_INODE_LAYOUT_V1) {
                struct erofs_sb_info *sbi = EROFS_SB(inode->i_sb);
@@ -95,7 +95,7 @@ static int read_inode(struct inode *inode, void *data)
                        sbi->build_time_nsec;
 
                inode->i_size = le32_to_cpu(v1->i_size);
-               if (vi->data_mapping_mode == EROFS_INODE_LAYOUT_COMPRESSION)
+               if (is_inode_layout_compression(inode))
                        nblks = le32_to_cpu(v1->i_u.compressed_blocks);
        } else {
                errln("unsupported on-disk inode version %u of nid %llu",
@@ -127,7 +127,7 @@ static int fill_inline_data(struct inode *inode, void *data,
 {
        struct erofs_vnode *vi = EROFS_V(inode);
        struct erofs_sb_info *sbi = EROFS_I_SB(inode);
-       int mode = vi->data_mapping_mode;
+       const int mode = vi->datamode;
 
        DBG_BUGON(mode >= EROFS_INODE_LAYOUT_MAX);
 
@@ -299,9 +299,8 @@ int erofs_getattr(const struct path *path, struct kstat *stat,
                  u32 request_mask, unsigned int query_flags)
 {
        struct inode *const inode = d_inode(path->dentry);
-       struct erofs_vnode *const vi = EROFS_V(inode);
 
-       if (vi->data_mapping_mode == EROFS_INODE_LAYOUT_COMPRESSION)
+       if (is_inode_layout_compression(inode))
                stat->attributes |= STATX_ATTR_COMPRESSED;
 
        stat->attributes |= STATX_ATTR_IMMUTABLE;

diff --git a/drivers/staging/erofs/internal.h b/drivers/staging/erofs/internal.h
index fc732c8..1666cce 100644 (file)
--- a/drivers/staging/erofs/internal.h
+++ b/drivers/staging/erofs/internal.h
@@ -349,8 +349,7 @@ struct erofs_vnode {
        /* atomic flags (including bitlocks) */
        unsigned long flags;
 
-       unsigned char data_mapping_mode;
-       /* inline size in bytes */
+       unsigned char datamode;
        unsigned char inode_isize;
        unsigned short xattr_isize;
 
@@ -385,18 +384,17 @@ static inline unsigned long inode_datablocks(struct inode *inode)
 
 static inline bool is_inode_layout_plain(struct inode *inode)
 {
-       return EROFS_V(inode)->data_mapping_mode == EROFS_INODE_LAYOUT_PLAIN;
+       return EROFS_V(inode)->datamode == EROFS_INODE_LAYOUT_PLAIN;
 }
 
 static inline bool is_inode_layout_compression(struct inode *inode)
 {
-       return EROFS_V(inode)->data_mapping_mode ==
-                                       EROFS_INODE_LAYOUT_COMPRESSION;
+       return EROFS_V(inode)->datamode == EROFS_INODE_LAYOUT_COMPRESSION;
 }
 
 static inline bool is_inode_layout_inline(struct inode *inode)
 {
-       return EROFS_V(inode)->data_mapping_mode == EROFS_INODE_LAYOUT_INLINE;
+       return EROFS_V(inode)->datamode == EROFS_INODE_LAYOUT_INLINE;
 }
 
 extern const struct super_operations erofs_sops;