aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/ufs_fs.h4
-rw-r--r--include/linux/ufs_fs_i.h1
2 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/ufs_fs.h b/include/linux/ufs_fs.h
index 5014604d0a50..24ce39820560 100644
--- a/include/linux/ufs_fs.h
+++ b/include/linux/ufs_fs.h
@@ -263,7 +263,7 @@ typedef __u16 __bitwise __fs16;
263 */ 263 */
264#define ufs_inotocg(x) ((x) / uspi->s_ipg) 264#define ufs_inotocg(x) ((x) / uspi->s_ipg)
265#define ufs_inotocgoff(x) ((x) % uspi->s_ipg) 265#define ufs_inotocgoff(x) ((x) % uspi->s_ipg)
266#define ufs_inotofsba(x) (ufs_cgimin(ufs_inotocg(x)) + ufs_inotocgoff(x) / uspi->s_inopf) 266#define ufs_inotofsba(x) (((u64)ufs_cgimin(ufs_inotocg(x))) + ufs_inotocgoff(x) / uspi->s_inopf)
267#define ufs_inotofsbo(x) ((x) % uspi->s_inopf) 267#define ufs_inotofsbo(x) ((x) % uspi->s_inopf)
268 268
269/* 269/*
@@ -756,7 +756,7 @@ struct ufs_sb_private_info {
756 __u32 s_npsect; /* # sectors/track including spares */ 756 __u32 s_npsect; /* # sectors/track including spares */
757 __u32 s_interleave; /* hardware sector interleave */ 757 __u32 s_interleave; /* hardware sector interleave */
758 __u32 s_trackskew; /* sector 0 skew, per track */ 758 __u32 s_trackskew; /* sector 0 skew, per track */
759 __u32 s_csaddr; /* blk addr of cyl grp summary area */ 759 __u64 s_csaddr; /* blk addr of cyl grp summary area */
760 __u32 s_cssize; /* size of cyl grp summary area */ 760 __u32 s_cssize; /* size of cyl grp summary area */
761 __u32 s_cgsize; /* cylinder group size */ 761 __u32 s_cgsize; /* cylinder group size */
762 __u32 s_ntrak; /* tracks per cylinder */ 762 __u32 s_ntrak; /* tracks per cylinder */
diff --git a/include/linux/ufs_fs_i.h b/include/linux/ufs_fs_i.h
index f50ce3b0cd52..fef77d52b029 100644
--- a/include/linux/ufs_fs_i.h
+++ b/include/linux/ufs_fs_i.h
@@ -20,7 +20,6 @@ struct ufs_inode_info {
20 __fs64 u2_i_data[15]; 20 __fs64 u2_i_data[15];
21 } i_u1; 21 } i_u1;
22 __u32 i_flags; 22 __u32 i_flags;
23 __u32 i_gen;
24 __u32 i_shadow; 23 __u32 i_shadow;
25 __u32 i_unused1; 24 __u32 i_unused1;
26 __u32 i_unused2; 25 __u32 i_unused2;