Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[firefly-linux-kernel-4.4.55.git] / fs / jfs / jfs_types.h

diff --git a/fs/jfs/jfs_types.h b/fs/jfs/jfs_types.h
index 649f9817accd05f5899e54dca2ecb0dcb406c6d6..43ea3713c083febbdd5df2cac7a7b611561e3574 100644 (file)
--- a/fs/jfs/jfs_types.h
+++ b/fs/jfs/jfs_types.h
@@ -57,35 +57,6 @@ struct timestruc_t {
 #define        HIGHORDER       0x80000000u     /* high order bit on    */
 #define        ONES            0xffffffffu     /* all bit on           */
 
-/*
- *     logical xd (lxd)
- */
-typedef struct {
-       unsigned len:24;
-       unsigned off1:8;
-       u32 off2;
-} lxd_t;
-
-/* lxd_t field construction */
-#define        LXDlength(lxd, length32)        ( (lxd)->len = length32 )
-#define        LXDoffset(lxd, offset64)\
-{\
-       (lxd)->off1 = ((s64)offset64) >> 32;\
-       (lxd)->off2 = (offset64) & 0xffffffff;\
-}
-
-/* lxd_t field extraction */
-#define        lengthLXD(lxd)  ( (lxd)->len )
-#define        offsetLXD(lxd)\
-       ( ((s64)((lxd)->off1)) << 32 | (lxd)->off2 )
-
-/* lxd list */
-struct lxdlist {
-       s16 maxnlxd;
-       s16 nlxd;
-       lxd_t *lxd;
-};
-
 /*
  *     physical xd (pxd)
  */