aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ntfs/layout.h
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-09-22 08:26:44 -0400
committerAnton Altaparmakov <aia21@cantab.net>2005-09-22 08:26:44 -0400
commit91fbc6edfa7086b5fcdb74ea82ab747104541f1f (patch)
tree37fc00d0402e634d9de6b880098bba68bdc2da78 /fs/ntfs/layout.h
parentefb0372bbaf5b829ff8c39db372779928af542a7 (diff)
NTFS: Fix sparse warnings that have crept in over time.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
Diffstat (limited to 'fs/ntfs/layout.h')
-rw-r--r--fs/ntfs/layout.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/ntfs/layout.h b/fs/ntfs/layout.h
index 609ad1728ce4..dbf5c2a06dab 100644
--- a/fs/ntfs/layout.h
+++ b/fs/ntfs/layout.h
@@ -317,12 +317,13 @@ typedef u64 MFT_REF;
317typedef le64 leMFT_REF; 317typedef le64 leMFT_REF;
318 318
319#define MK_MREF(m, s) ((MFT_REF)(((MFT_REF)(s) << 48) | \ 319#define MK_MREF(m, s) ((MFT_REF)(((MFT_REF)(s) << 48) | \
320 ((MFT_REF)(m) & MFT_REF_MASK_CPU))) 320 ((MFT_REF)(m) & (u64)MFT_REF_MASK_CPU)))
321#define MK_LE_MREF(m, s) cpu_to_le64(MK_MREF(m, s)) 321#define MK_LE_MREF(m, s) cpu_to_le64(MK_MREF(m, s))
322 322
323#define MREF(x) ((unsigned long)((x) & MFT_REF_MASK_CPU)) 323#define MREF(x) ((unsigned long)((x) & (u64)MFT_REF_MASK_CPU))
324#define MSEQNO(x) ((u16)(((x) >> 48) & 0xffff)) 324#define MSEQNO(x) ((u16)(((x) >> 48) & 0xffff))
325#define MREF_LE(x) ((unsigned long)(le64_to_cpu(x) & MFT_REF_MASK_CPU)) 325#define MREF_LE(x) ((unsigned long)(le64_to_cpu(x) & \
326 (u64)MFT_REF_MASK_CPU))
326#define MSEQNO_LE(x) ((u16)((le64_to_cpu(x) >> 48) & 0xffff)) 327#define MSEQNO_LE(x) ((u16)((le64_to_cpu(x) >> 48) & 0xffff))
327 328
328#define IS_ERR_MREF(x) (((x) & 0x0000800000000000ULL) ? 1 : 0) 329#define IS_ERR_MREF(x) (((x) & 0x0000800000000000ULL) ? 1 : 0)