aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAdrian Hunter <ext-adrian.hunter@nokia.com>2008-07-23 08:23:11 -0400
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2008-08-13 04:30:04 -0400
commitbc813355c704e5916a86dd4b96fd226bfa3fc6ca (patch)
tree9a130ba25918ab0f0a0e729b76dc3f0afc054027 /fs
parentde94eb558b542873d3f6f9ede1b8575fb5662248 (diff)
UBIFS: do not union creat_sqnum and del_cmtno
The values in these two fields need to be preserved independently and so a union cannot be used. Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ubifs/ubifs.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index dfb4b93614ff..d342c6907244 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -374,10 +374,8 @@ struct ubifs_gced_idx_leb {
374 */ 374 */
375struct ubifs_inode { 375struct ubifs_inode {
376 struct inode vfs_inode; 376 struct inode vfs_inode;
377 union { 377 unsigned long long creat_sqnum;
378 unsigned long long creat_sqnum; 378 unsigned long long del_cmtno;
379 unsigned long long del_cmtno;
380 };
381 unsigned int xattr_size; 379 unsigned int xattr_size;
382 unsigned int xattr_cnt; 380 unsigned int xattr_cnt;
383 unsigned int xattr_names; 381 unsigned int xattr_names;