[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Wed, 12 Dec 2018 13:02:09 +0100
From: Aaron Strahlberger <aaron.strahlberger@...teo.de>
To: Gao Xiang <gaoxiang25@...wei.com>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Chao Yu <yuchao0@...wei.com>, linux-erofs@...ts.ozlabs.org,
devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org,
linux-kernel@...cs.fau.de,
Aaron Strahlberger <aaron.strahlberger@...teo.de>,
Julius Wiedmann <julius.wiedmann@....de>,
Dominik Huber <domi250@....de>
Subject: [PATCH v2] staging:erofs: Remove __EROFS_BIT macro
The `__EROFS_BIT` macro is used only once, do define the
`EROFS_I_DATA_MAPPING_BIT` constant. This Patch removes this
macro and expands it in the place it is used.
Signed-off-by: Aaron Strahlberger <aaron.strahlberger@...teo.de>
Signed-off-by: Julius Wiedmann <julius.wiedmann@....de>
Signed-off-by: Dominik Huber <domi250@....de>
---
drivers/staging/erofs/erofs_fs.h | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/erofs/erofs_fs.h b/drivers/staging/erofs/erofs_fs.h
index d4bffa2852b3..da5562df847b 100644
--- a/drivers/staging/erofs/erofs_fs.h
+++ b/drivers/staging/erofs/erofs_fs.h
@@ -38,10 +38,6 @@ struct erofs_super_block {
/* 80 */__u8 reserved2[48]; /* 128 bytes */
} __packed;
-#define __EROFS_BIT(_prefix, _cur, _pre) enum { \
- _prefix ## _cur ## _BIT = _prefix ## _pre ## _BIT + \
- _prefix ## _pre ## _BITS }
-
/*
* erofs inode data mapping:
* 0 - inode plain without inline data A:
@@ -58,11 +54,14 @@ enum {
EROFS_INODE_LAYOUT_INLINE,
EROFS_INODE_LAYOUT_MAX
};
+
#define EROFS_I_VERSION_BITS 1
#define EROFS_I_DATA_MAPPING_BITS 3
#define EROFS_I_VERSION_BIT 0
-__EROFS_BIT(EROFS_I_, DATA_MAPPING, VERSION);
+enum {
+ EROFS_I_DATA_MAPPING_BIT = EROFS_I_VERSION_BIT + EROFS_I_VERSION_BITS
+}
struct erofs_inode_v1 {
/* 0 */__le16 i_advise;
--
2.19.2
Powered by blists - more mailing lists