[PATCH] ufs2 write: inodes write

[linux-2.6-omap-h63xx.git] / include / linux / ufs_fs.h

diff --git a/include/linux/ufs_fs.h b/include/linux/ufs_fs.h
index 28967eda9d7b4375d8d82e730d3ac93207ad754b..24ce39820560b122898d10d48451fab5a7079269 100644 (file)
--- a/include/linux/ufs_fs.h
+++ b/include/linux/ufs_fs.h
@@ -45,8 +45,10 @@ typedef __u32 __bitwise __fs32;
 typedef __u16 __bitwise __fs16;
 #endif
 
+#ifdef __KERNEL__
 #include <linux/ufs_fs_i.h>
 #include <linux/ufs_fs_sb.h>
+#endif
 
 #define UFS_BBLOCK 0
 #define UFS_BBSIZE 8192
@@ -261,7 +263,7 @@ typedef __u16 __bitwise __fs16;
  */
 #define        ufs_inotocg(x)          ((x) / uspi->s_ipg)
 #define        ufs_inotocgoff(x)       ((x) % uspi->s_ipg)
-#define        ufs_inotofsba(x)        (ufs_cgimin(ufs_inotocg(x)) + ufs_inotocgoff(x) / uspi->s_inopf)
+#define        ufs_inotofsba(x)        (((u64)ufs_cgimin(ufs_inotocg(x))) + ufs_inotocgoff(x) / uspi->s_inopf)
 #define        ufs_inotofsbo(x)        ((x) % uspi->s_inopf)
 
 /*
@@ -303,7 +305,7 @@ typedef __u16 __bitwise __fs16;
 #define UFS_MAXMNTLEN 512
 #define UFS2_MAXMNTLEN 468
 #define UFS2_MAXVOLLEN 32
-/* #define UFS_MAXCSBUFS 31 */
+#define UFS_MAXCSBUFS 31
 #define UFS_LINK_MAX 32000
 /*
 #define        UFS2_NOCSPTRS   ((128 / sizeof(void *)) - 4)
@@ -754,7 +756,7 @@ struct ufs_sb_private_info {
        __u32   s_npsect;       /* # sectors/track including spares */
        __u32   s_interleave;   /* hardware sector interleave */
        __u32   s_trackskew;    /* sector 0 skew, per track */
-       __u32   s_csaddr;       /* blk addr of cyl grp summary area */
+       __u64   s_csaddr;       /* blk addr of cyl grp summary area */
        __u32   s_cssize;       /* size of cyl grp summary area */
        __u32   s_cgsize;       /* cylinder group size */
        __u32   s_ntrak;        /* tracks per cylinder */
@@ -789,6 +791,7 @@ struct ufs_sb_private_info {
 
        __u32   s_maxsymlinklen;/* upper limit on fast symlinks' size */
        __s32   fs_magic;       /* filesystem magic */
+       unsigned int s_dirblksize;
 };
 
 /*