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

[~andy/linux] / fs / btrfs / export.c

diff --git a/fs/btrfs/export.c b/fs/btrfs/export.c
index 2b357a6d2407833d81b5419ab8d4aac5a113eca8..85315d2c90de0677e593ce21ea11174d5bce9031 100644 (file)
--- a/fs/btrfs/export.c
+++ b/fs/btrfs/export.c
@@ -7,15 +7,11 @@
 #include "export.h"
 #include "compat.h"
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
-#define FILEID_BTRFS_WITHOUT_PARENT            0x4d
-#define FILEID_BTRFS_WITH_PARENT               0x4e
-#define FILEID_BTRFS_WITH_PARENT_ROOT          0x4f
-#endif
-
-#define BTRFS_FID_SIZE_NON_CONNECTABLE         (offsetof(struct btrfs_fid, parent_objectid)/4)
-#define BTRFS_FID_SIZE_CONNECTABLE             (offsetof(struct btrfs_fid, parent_root_objectid)/4)
-#define BTRFS_FID_SIZE_CONNECTABLE_ROOT                (sizeof(struct btrfs_fid)/4)
+#define BTRFS_FID_SIZE_NON_CONNECTABLE (offsetof(struct btrfs_fid, \
+                                                parent_objectid) / 4)
+#define BTRFS_FID_SIZE_CONNECTABLE (offsetof(struct btrfs_fid, \
+                                            parent_root_objectid) / 4)
+#define BTRFS_FID_SIZE_CONNECTABLE_ROOT (sizeof(struct btrfs_fid) / 4)
 
 static int btrfs_encode_fh(struct dentry *dentry, u32 *fh, int *max_len,
                           int connectable)