On Mon, 26 Sep 2005, Linus Torvalds wrote:
> On Mon, 26 Sep 2005, Anton Altaparmakov wrote:
> >
> > NTFS: Fix sparse warnings that have crept in over time.
>
> I think this is wrong.
>
> What was the warning that caused this (and the two other things that look
> the same)?
fs/ntfs/mft.c:2577:24: warning: incompatible types for operation (&)
fs/ntfs/mft.c:2577:24: left side has type unsigned long long [unsigned]
[usertype] <noident>
fs/ntfs/mft.c:2577:24: right side has type bad type enum MFT_REF_CONSTS
[toplevel] MFT_REF_MASK_CPU
fs/ntfs/mft.c:2577:24: warning: cast from unknown type
> > #define MK_MREF(m, s) ((MFT_REF)(((MFT_REF)(s) << 48) | \
> > - ((MFT_REF)(m) & MFT_REF_MASK_CPU)))
> > + ((MFT_REF)(m) & (u64)MFT_REF_MASK_CPU)))
>
> Also, side note: how you defined "MFT_REF_MASK_CPU" is pretty debatable in
> the first place:
>
> typedef enum {
> MFT_REF_MASK_CPU = 0x0000ffffffffffffULL,
> MFT_REF_MASK_LE = const_cpu_to_le64(0x0000ffffffffffffULL),
> } MFT_REF_CONSTS;
>
> and this just _happens_ to work with gcc, but it's not real C.
>
> The issue? "enum" is really an integer type. As in "int". Trying to put a
> larger value than one that fits in "int" is not guaranteed to work.
Yes, that is true but as you say it does work with gcc.
> There's another issue, namely that the type of the snum is not only of
> undefined size (is it the same size as an "int"? Is it an "unsigned long
> long"?) but the "endianness" of it is also now totally undefined. You have
> two different endiannesses inside the _same_ enum. What is the type of the
> enum?
Good question. "confused"? (-;
> You _really_ probably should use just
>
> #define MFT_REF_MASK_CPU 0x0000ffffffffffffULL
> #define MFT_REF_MASK_LE const_cpu_to_le64(MFT_REF_MASK_CPU)
>
> instead. That way the type of that thing is well-defined.
Yes, that is probably better given it is not possible to have them both be
the same type (by definition).
> Depending on what warning you're trying to shut up, that may well fix it
> too. Because now "MFT_REF_MASK_CPU" is clearly a regular constant, while
> MFT_REF_MASK_LE is clearly a little-endian constant. Before, they were of
> the same enum type, which made it very unclear what the hell they were.
Yes, I would expect it to fix it.
In fact I just did it and yes, it fixes it, too. The repository I asked
you to pull from is now updated with the below patch added which reverts
the wrong layout.h parts and changes the enum to two defines as per your
suggestion.
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git/HEAD
Thanks for the comments. (-:
Best regards,
Anton
--
Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @)
Unix Support, Computing Service, University of Cambridge, CB2 3QH, UK
Linux NTFS maintainer / IRC: #ntfs on irc.freenode.net
WWW: http://linux-ntfs.sf.net/ & http://www-stu.christs.cam.ac.uk/~aia21/
---
NTFS: Re-fix sparse warnings in a more correct way, i.e. don't use an enum with
different types in it but #define the two constants instead.
Signed-off-by: Anton Altaparmakov <[email protected]>
---
fs/ntfs/layout.h | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
e2fcc61ef0d654887b651bd99ffcb52f7344b836
diff --git a/fs/ntfs/layout.h b/fs/ntfs/layout.h
--- a/fs/ntfs/layout.h
+++ b/fs/ntfs/layout.h
@@ -308,22 +308,19 @@ typedef le16 MFT_RECORD_FLAGS;
* The _LE versions are to be applied on little endian MFT_REFs.
* Note: The _LE versions will return a CPU endian formatted value!
*/
-typedef enum {
- MFT_REF_MASK_CPU = 0x0000ffffffffffffULL,
- MFT_REF_MASK_LE = const_cpu_to_le64(0x0000ffffffffffffULL),
-} MFT_REF_CONSTS;
+#define MFT_REF_MASK_CPU 0x0000ffffffffffffULL
+#define MFT_REF_MASK_LE const_cpu_to_le64(0x0000ffffffffffffULL)
typedef u64 MFT_REF;
typedef le64 leMFT_REF;
#define MK_MREF(m, s) ((MFT_REF)(((MFT_REF)(s) << 48) | \
- ((MFT_REF)(m) & (u64)MFT_REF_MASK_CPU)))
+ ((MFT_REF)(m) & MFT_REF_MASK_CPU)))
#define MK_LE_MREF(m, s) cpu_to_le64(MK_MREF(m, s))
-#define MREF(x) ((unsigned long)((x) & (u64)MFT_REF_MASK_CPU))
+#define MREF(x) ((unsigned long)((x) & MFT_REF_MASK_CPU))
#define MSEQNO(x) ((u16)(((x) >> 48) & 0xffff))
-#define MREF_LE(x) ((unsigned long)(le64_to_cpu(x) & \
- (u64)MFT_REF_MASK_CPU))
+#define MREF_LE(x) ((unsigned long)(le64_to_cpu(x) & MFT_REF_MASK_CPU))
#define MSEQNO_LE(x) ((u16)((le64_to_cpu(x) >> 48) & 0xffff))
#define IS_ERR_MREF(x) (((x) & 0x0000800000000000ULL) ? 1 : 0)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
| |
 |