aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/fs/xfs/xfs_types.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2011-07-27 00:54:47 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-07-27 00:54:47 -0700
commitaa7eb8e78d8ecd6cd0475d86ea8385ff9cb47ece (patch)
tree3f9e98fadd5124fb05e8f6f9b06aa23698d4f215 /fs/xfs/xfs_types.h
parentInput: sh_keysc - fix compile warning (diff)
parentInput: synaptics - fix reporting of min coordinates (diff)
downloadwireguard-linux-aa7eb8e78d8ecd6cd0475d86ea8385ff9cb47ece.tar.xz
wireguard-linux-aa7eb8e78d8ecd6cd0475d86ea8385ff9cb47ece.zip
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/xfs/xfs_types.h')
-rw-r--r--fs/xfs/xfs_types.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/xfs/xfs_types.h b/fs/xfs/xfs_types.h
index 26d1867d8156..65584b55607d 100644
--- a/fs/xfs/xfs_types.h
+++ b/fs/xfs/xfs_types.h
@@ -73,8 +73,6 @@ typedef __int32_t xfs_tid_t; /* transaction identifier */
typedef __uint32_t xfs_dablk_t; /* dir/attr block number (in file) */
typedef __uint32_t xfs_dahash_t; /* dir/attr hash value */
-typedef __uint32_t xlog_tid_t; /* transaction ID type */
-
/*
* These types are 64 bits on disk but are either 32 or 64 bits in memory.
* Disk based types: