nilfs2: use fixed sized types for ioctl structures

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

diff --git a/include/linux/nilfs2_fs.h b/include/linux/nilfs2_fs.h
index e38fad2f7c0b366adbe8d990b10c3d2aab5f5515..8fb64ce285fdb0c7600b25d91719187424a39755 100644 (file)
--- a/include/linux/nilfs2_fs.h
+++ b/include/linux/nilfs2_fs.h
@@ -499,6 +499,7 @@ NILFS_CHECKPOINT_FNS(SKETCH, sketch)
 /**
  * struct nilfs_cpinfo - checkpoint information
  * @ci_flags: flags
+ * @ci_pad: padding
  * @ci_cno: checkpoint number
  * @ci_create: creation timestamp
  * @ci_nblk_inc: number of blocks incremented by this checkpoint
@@ -508,6 +509,7 @@ NILFS_CHECKPOINT_FNS(SKETCH, sketch)
  */
 struct nilfs_cpinfo {
        __u32 ci_flags;
+       __u32 ci_pad;
        __u64 ci_cno;
        __u64 ci_create;
        __u64 ci_nblk_inc;
@@ -668,7 +670,8 @@ enum {
  */
 struct nilfs_cpmode {
        __u64 cm_cno;
-       int cm_mode;
+       __u32 cm_mode;
+       __u32 cm_pad;
 };
 
 /**
@@ -676,15 +679,15 @@ struct nilfs_cpmode {
  * @v_base:
  * @v_nmembs:
  * @v_size:
- * @v_index:
  * @v_flags:
+ * @v_index:
  */
 struct nilfs_argv {
-       void *v_base;
-       size_t v_nmembs;        /* number of members */
-       size_t v_size;          /* size of members */
-       int v_index;
-       int v_flags;
+       __u64 v_base;
+       __u32 v_nmembs; /* number of members */
+       __u16 v_size;   /* size of members */
+       __u16 v_flags;
+       __u64 v_index;
 };
 
 /**
@@ -721,8 +724,8 @@ struct nilfs_sustat {
        __u64 ss_nsegs;
        __u64 ss_ncleansegs;
        __u64 ss_ndirtysegs;
-       time_t ss_ctime;
-       time_t ss_nongc_ctime;
+       __u64 ss_ctime;
+       __u64 ss_nongc_ctime;
 };
 
 /**
@@ -750,6 +753,7 @@ struct nilfs_vdesc {
        __u64 vd_blocknr;
        __u64 vd_offset;
        __u32 vd_flags;
+       __u32 vd_pad;
 };
 
 /**
@@ -761,18 +765,7 @@ struct nilfs_bdesc {
        __u64 bd_blocknr;
        __u64 bd_offset;
        __u32 bd_level;
-};
-
-#define        NILFS_TIMEDWAIT_WRITE_LOCKED    0x1
-#define        NILFS_TIMEDWAIT_SEG_WRITE       0x2
-
-/**
- * struct nilfs_wait_cond -
- */
-struct nilfs_wait_cond {
-       int wc_cond;
-       int wc_flags;
-       struct timespec wc_timeout;
+       __u32 bd_pad;
 };
 
 #define NILFS_IOCTL_IDENT              'n'
@@ -795,8 +788,6 @@ struct nilfs_wait_cond {
        _IOWR(NILFS_IOCTL_IDENT, 0x87, struct nilfs_argv)
 #define NILFS_IOCTL_CLEAN_SEGMENTS  \
        _IOW(NILFS_IOCTL_IDENT, 0x88, struct nilfs_argv[5])
-#define NILFS_IOCTL_TIMEDWAIT  \
-       _IOWR(NILFS_IOCTL_IDENT, 0x89, struct nilfs_wait_cond)
 #define NILFS_IOCTL_SYNC  \
        _IOR(NILFS_IOCTL_IDENT, 0x8A, __u64)
 #define NILFS_IOCTL_RESIZE  \
@@ -827,12 +818,6 @@ struct nilfs_sustat32 {
        compat_time_t ss_nongc_ctime;
 };
 
-struct nilfs_wait_cond32 {
-       compat_int_t wc_cond;
-       compat_int_t wc_flags;
-       struct compat_timespec wc_timeout;
-};
-
 #define NILFS_IOCTL32_CHANGE_CPMODE  \
        _IOW(NILFS_IOCTL_IDENT, 0x80, struct nilfs_cpmode32)
 #define NILFS_IOCTL32_GET_CPINFO  \
@@ -847,8 +832,6 @@ struct nilfs_wait_cond32 {
        _IOWR(NILFS_IOCTL_IDENT, 0x87, struct nilfs_argv32)
 #define NILFS_IOCTL32_CLEAN_SEGMENTS  \
        _IOW(NILFS_IOCTL_IDENT, 0x88, struct nilfs_argv32[5])
-#define NILFS_IOCTL32_TIMEDWAIT  \
-       _IOWR(NILFS_IOCTL_IDENT, 0x89, struct nilfs_wait_cond32)
 #endif /* CONFIG_COMPAT */
 
 #endif /* _LINUX_NILFS_FS_H */