NTFS: Add helpers fs/ntfs/layout.h::MK_MREF() and MK_LE_MREF().

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index 92f80a1403d7c3fb082a5ca4cf4bf8184c6cb204..e555cd1a34491a5facb543ef5e18b397eb43c538 100644 (file)
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -133,6 +133,7 @@ ToDo/Notes:
          add a declaration for it to inode.h.  Fix some compilation issues
          that resulted due to #includes and header file interdependencies.
        - Simplify setup of i_mode in fs/ntfs/inode.c::ntfs_read_locked_inode().
+       - Add helpers fs/ntfs/layout.h::MK_MREF() and MK_LE_MREF().
 
 2.1.20 - Fix two stupid bugs introduced in 2.1.18 release.
 

diff --git a/fs/ntfs/layout.h b/fs/ntfs/layout.h
index 94d3440d260d33f29208882fe5c439758bc361a8..a34eed5b922dd7990e40547c3a6717da11b1b4a3 100644 (file)
--- a/fs/ntfs/layout.h
+++ b/fs/ntfs/layout.h
@@ -316,6 +316,10 @@ typedef enum {
 typedef u64 MFT_REF;
 typedef le64 leMFT_REF;
 
+#define MK_MREF(m, s)  ((MFT_REF)(((MFT_REF)(s) << 48) |               \
+                                       ((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) & MFT_REF_MASK_CPU))
 #define MSEQNO(x)      ((u16)(((x) >> 48) & 0xffff))
 #define MREF_LE(x)     ((unsigned long)(le64_to_cpu(x) & MFT_REF_MASK_CPU))