| Message ID | 20190603165027.11831-1-yamada.masahiro@socionext.com |
|---|---|
| State | New, archived |
| Delegated to: | Richard Weinberger |
| Headers | show |
| Series | jffs2: do not use C++ style comments in uapi header | expand |
Hi Masahiro, Masahiro Yamada <yamada.masahiro@socionext.com> wrote on Tue, 4 Jun 2019 01:50:27 +0900: > Linux kernel tolerates C++ style comments these days. Actually, the > SPDX License Identifier for .c files uses C++ comment style. > > On the other hand, uapi headers are strict, where the C++ comment > style is banned. > > Looks like these lines are temporarily commented out, so I did not > use the block comment style. > > Having said that, they have been commented out since the pre-git era. > (so, at least 14 years). 'Maybe later' may not happen. Alternative fix > might be to delete these lines entirely. Richard's POV on the question would be interesting but mine would be to simple drop these lines. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > include/uapi/linux/jffs2.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/include/uapi/linux/jffs2.h b/include/uapi/linux/jffs2.h > index a18b719f49d4..5dee6d930d5b 100644 > --- a/include/uapi/linux/jffs2.h > +++ b/include/uapi/linux/jffs2.h > @@ -77,10 +77,10 @@ > > #define JFFS2_ACL_VERSION 0x0001 > > -// Maybe later... > -//#define JFFS2_NODETYPE_CHECKPOINT (JFFS2_FEATURE_RWCOMPAT_DELETE | JFFS2_NODE_ACCURATE | 3) > -//#define JFFS2_NODETYPE_OPTIONS (JFFS2_FEATURE_RWCOMPAT_COPY | JFFS2_NODE_ACCURATE | 4) > - > +/* Maybe later... > +#define JFFS2_NODETYPE_CHECKPOINT (JFFS2_FEATURE_RWCOMPAT_DELETE | JFFS2_NODE_ACCURATE | 3) > +#define JFFS2_NODETYPE_OPTIONS (JFFS2_FEATURE_RWCOMPAT_COPY | JFFS2_NODE_ACCURATE | 4) > +*/ > > #define JFFS2_INO_FLAG_PREREAD 1 /* Do read_inode() for this one at > mount time, don't wait for it to Thanks, Miquèl
diff --git a/include/uapi/linux/jffs2.h b/include/uapi/linux/jffs2.h index a18b719f49d4..5dee6d930d5b 100644 --- a/include/uapi/linux/jffs2.h +++ b/include/uapi/linux/jffs2.h @@ -77,10 +77,10 @@ #define JFFS2_ACL_VERSION 0x0001 -// Maybe later... -//#define JFFS2_NODETYPE_CHECKPOINT (JFFS2_FEATURE_RWCOMPAT_DELETE | JFFS2_NODE_ACCURATE | 3) -//#define JFFS2_NODETYPE_OPTIONS (JFFS2_FEATURE_RWCOMPAT_COPY | JFFS2_NODE_ACCURATE | 4) - +/* Maybe later... +#define JFFS2_NODETYPE_CHECKPOINT (JFFS2_FEATURE_RWCOMPAT_DELETE | JFFS2_NODE_ACCURATE | 3) +#define JFFS2_NODETYPE_OPTIONS (JFFS2_FEATURE_RWCOMPAT_COPY | JFFS2_NODE_ACCURATE | 4) +*/ #define JFFS2_INO_FLAG_PREREAD 1 /* Do read_inode() for this one at mount time, don't wait for it to
Linux kernel tolerates C++ style comments these days. Actually, the SPDX License Identifier for .c files uses C++ comment style. On the other hand, uapi headers are strict, where the C++ comment style is banned. Looks like these lines are temporarily commented out, so I did not use the block comment style. Having said that, they have been commented out since the pre-git era. (so, at least 14 years). 'Maybe later' may not happen. Alternative fix might be to delete these lines entirely. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- include/uapi/linux/jffs2.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)