Commit 91fbc6ed authored by Anton Altaparmakov's avatar Anton Altaparmakov
Browse files

NTFS: Fix sparse warnings that have crept in over time.


Signed-off-by: default avatarAnton Altaparmakov <aia21@cantab.net>
parent efb0372b
...@@ -22,6 +22,10 @@ ToDo/Notes: ...@@ -22,6 +22,10 @@ ToDo/Notes:
- Enable the code for setting the NT4 compatibility flag when we start - Enable the code for setting the NT4 compatibility flag when we start
making NTFS 1.2 specific modifications. making NTFS 1.2 specific modifications.
2.1.25-WIP
- Fix sparse warnings that have crept in over time.
2.1.24 - Lots of bug fixes and support more clean journal states. 2.1.24 - Lots of bug fixes and support more clean journal states.
- Support journals ($LogFile) which have been modified by chkdsk. This - Support journals ($LogFile) which have been modified by chkdsk. This
......
...@@ -317,12 +317,13 @@ typedef u64 MFT_REF; ...@@ -317,12 +317,13 @@ typedef u64 MFT_REF;
typedef le64 leMFT_REF; typedef le64 leMFT_REF;
#define MK_MREF(m, s) ((MFT_REF)(((MFT_REF)(s) << 48) | \ #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)))
#define MK_LE_MREF(m, s) cpu_to_le64(MK_MREF(m, s)) #define MK_LE_MREF(m, s) cpu_to_le64(MK_MREF(m, s))
#define MREF(x) ((unsigned long)((x) & MFT_REF_MASK_CPU)) #define MREF(x) ((unsigned long)((x) & (u64)MFT_REF_MASK_CPU))
#define MSEQNO(x) ((u16)(((x) >> 48) & 0xffff)) #define MSEQNO(x) ((u16)(((x) >> 48) & 0xffff))
#define MREF_LE(x) ((unsigned long)(le64_to_cpu(x) & MFT_REF_MASK_CPU)) #define MREF_LE(x) ((unsigned long)(le64_to_cpu(x) & \
(u64)MFT_REF_MASK_CPU))
#define MSEQNO_LE(x) ((u16)((le64_to_cpu(x) >> 48) & 0xffff)) #define MSEQNO_LE(x) ((u16)((le64_to_cpu(x) >> 48) & 0xffff))
#define IS_ERR_MREF(x) (((x) & 0x0000800000000000ULL) ? 1 : 0) #define IS_ERR_MREF(x) (((x) & 0x0000800000000000ULL) ? 1 : 0)
......
...@@ -113,7 +113,7 @@ typedef struct { ...@@ -113,7 +113,7 @@ typedef struct {
*/ */
enum { enum {
RESTART_VOLUME_IS_CLEAN = const_cpu_to_le16(0x0002), RESTART_VOLUME_IS_CLEAN = const_cpu_to_le16(0x0002),
RESTART_SPACE_FILLER = 0xffff, /* gcc: Force enum bit width to 16. */ RESTART_SPACE_FILLER = const_cpu_to_le16(0xffff), /* gcc: Force enum bit width to 16. */
} __attribute__ ((__packed__)); } __attribute__ ((__packed__));
typedef le16 RESTART_AREA_FLAGS; typedef le16 RESTART_AREA_FLAGS;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment