From 7a17995f72f12aa6dd8ad74d05dd5db37818671a Mon Sep 17 00:00:00 2001
From: Adrian Hunter <ext-adrian.hunter@nokia.com>
Date: Wed, 23 Jul 2008 15:23:11 +0300
Subject: [PATCH] --- yaml --- r: 108542 b: refs/heads/master c:
 bc813355c704e5916a86dd4b96fd226bfa3fc6ca h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ubifs/ubifs.h | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 461a2bcbf455..2975b4456a9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de94eb558b542873d3f6f9ede1b8575fb5662248
+refs/heads/master: bc813355c704e5916a86dd4b96fd226bfa3fc6ca
diff --git a/trunk/fs/ubifs/ubifs.h b/trunk/fs/ubifs/ubifs.h
index dfb4b93614ff..d342c6907244 100644
--- a/trunk/fs/ubifs/ubifs.h
+++ b/trunk/fs/ubifs/ubifs.h
@@ -374,10 +374,8 @@ struct ubifs_gced_idx_leb {
  */
 struct ubifs_inode {
 	struct inode vfs_inode;
-	union {
-		unsigned long long creat_sqnum;
-		unsigned long long del_cmtno;
-	};
+	unsigned long long creat_sqnum;
+	unsigned long long del_cmtno;
 	unsigned int xattr_size;
 	unsigned int xattr_cnt;
 	unsigned int xattr_names;