diff options
-rw-r--r-- | fs/xfs/linux-2.6/xfs_vfs.h | 2 | ||||
-rw-r--r-- | fs/xfs/quota/xfs_qm_bhv.c | 4 | ||||
-rw-r--r-- | fs/xfs/xfs_mount.h | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/fs/xfs/linux-2.6/xfs_vfs.h b/fs/xfs/linux-2.6/xfs_vfs.h index 0ab60bc2e761..8de5c4c95cb6 100644 --- a/fs/xfs/linux-2.6/xfs_vfs.h +++ b/fs/xfs/linux-2.6/xfs_vfs.h | |||
@@ -31,8 +31,6 @@ struct xfs_inode; | |||
31 | struct xfs_mount; | 31 | struct xfs_mount; |
32 | struct xfs_mount_args; | 32 | struct xfs_mount_args; |
33 | 33 | ||
34 | typedef struct kstatfs bhv_statvfs_t; | ||
35 | |||
36 | #define SHUTDOWN_META_IO_ERROR 0x0001 /* write attempt to metadata failed */ | 34 | #define SHUTDOWN_META_IO_ERROR 0x0001 /* write attempt to metadata failed */ |
37 | #define SHUTDOWN_LOG_IO_ERROR 0x0002 /* write attempt to the log failed */ | 35 | #define SHUTDOWN_LOG_IO_ERROR 0x0002 /* write attempt to the log failed */ |
38 | #define SHUTDOWN_FORCE_UMOUNT 0x0004 /* shutdown from a forced unmount */ | 36 | #define SHUTDOWN_FORCE_UMOUNT 0x0004 /* shutdown from a forced unmount */ |
diff --git a/fs/xfs/quota/xfs_qm_bhv.c b/fs/xfs/quota/xfs_qm_bhv.c index 9556df9f7dab..bc6c5cca3e12 100644 --- a/fs/xfs/quota/xfs_qm_bhv.c +++ b/fs/xfs/quota/xfs_qm_bhv.c | |||
@@ -50,7 +50,7 @@ | |||
50 | 50 | ||
51 | STATIC void | 51 | STATIC void |
52 | xfs_fill_statvfs_from_dquot( | 52 | xfs_fill_statvfs_from_dquot( |
53 | bhv_statvfs_t *statp, | 53 | struct kstatfs *statp, |
54 | xfs_disk_dquot_t *dp) | 54 | xfs_disk_dquot_t *dp) |
55 | { | 55 | { |
56 | __uint64_t limit; | 56 | __uint64_t limit; |
@@ -87,7 +87,7 @@ xfs_fill_statvfs_from_dquot( | |||
87 | STATIC void | 87 | STATIC void |
88 | xfs_qm_statvfs( | 88 | xfs_qm_statvfs( |
89 | xfs_inode_t *ip, | 89 | xfs_inode_t *ip, |
90 | bhv_statvfs_t *statp) | 90 | struct kstatfs *statp) |
91 | { | 91 | { |
92 | xfs_mount_t *mp = ip->i_mount; | 92 | xfs_mount_t *mp = ip->i_mount; |
93 | xfs_dquot_t *dqp; | 93 | xfs_dquot_t *dqp; |
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index e3f618c84e47..d70314302520 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h | |||
@@ -134,7 +134,7 @@ typedef struct xfs_dquot * (*xfs_dqvopchown_t)( | |||
134 | struct xfs_dquot **, struct xfs_dquot *); | 134 | struct xfs_dquot **, struct xfs_dquot *); |
135 | typedef int (*xfs_dqvopchownresv_t)(struct xfs_trans *, struct xfs_inode *, | 135 | typedef int (*xfs_dqvopchownresv_t)(struct xfs_trans *, struct xfs_inode *, |
136 | struct xfs_dquot *, struct xfs_dquot *, uint); | 136 | struct xfs_dquot *, struct xfs_dquot *, uint); |
137 | typedef void (*xfs_dqstatvfs_t)(struct xfs_inode *, bhv_statvfs_t *); | 137 | typedef void (*xfs_dqstatvfs_t)(struct xfs_inode *, struct kstatfs *); |
138 | typedef int (*xfs_dqsync_t)(struct xfs_mount *, int flags); | 138 | typedef int (*xfs_dqsync_t)(struct xfs_mount *, int flags); |
139 | typedef int (*xfs_quotactl_t)(struct xfs_mount *, int, int, xfs_caddr_t); | 139 | typedef int (*xfs_quotactl_t)(struct xfs_mount *, int, int, xfs_caddr_t); |
140 | 140 | ||