[PATCH 1/3] remove bhv_statvfs_t typedef

[Christoph Hellwig <hch@xxxxxxxxxxxxx>]

Signed-off-by: Christoph Hellwig <hch@xxxxxx>

Index: linux-2.6-xfs/fs/xfs/linux-2.6/xfs_vfs.h
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/linux-2.6/xfs_vfs.h       2008-10-16 
00:18:08.000000000 +0200
+++ linux-2.6-xfs/fs/xfs/linux-2.6/xfs_vfs.h    2008-10-16 00:18:49.000000000 
+0200
@@ -31,8 +31,6 @@ struct xfs_inode;
 struct xfs_mount;
 struct xfs_mount_args;
 
-typedef struct kstatfs bhv_statvfs_t;
-
 #define SHUTDOWN_META_IO_ERROR 0x0001  /* write attempt to metadata failed */
 #define SHUTDOWN_LOG_IO_ERROR  0x0002  /* write attempt to the log failed */
 #define SHUTDOWN_FORCE_UMOUNT  0x0004  /* shutdown from a forced unmount */
Index: linux-2.6-xfs/fs/xfs/quota/xfs_qm_bhv.c
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/quota/xfs_qm_bhv.c        2008-10-16 
00:18:08.000000000 +0200
+++ linux-2.6-xfs/fs/xfs/quota/xfs_qm_bhv.c     2008-10-16 00:18:49.000000000 
+0200
@@ -50,7 +50,7 @@
 
 STATIC void
 xfs_fill_statvfs_from_dquot(
-       bhv_statvfs_t           *statp,
+       struct kstatfs          *statp,
        xfs_disk_dquot_t        *dp)
 {
        __uint64_t              limit;
@@ -87,7 +87,7 @@ xfs_fill_statvfs_from_dquot(
 STATIC void
 xfs_qm_statvfs(
        xfs_inode_t             *ip,
-       bhv_statvfs_t           *statp)
+       struct kstatfs          *statp)
 {
        xfs_mount_t             *mp = ip->i_mount;
        xfs_dquot_t             *dqp;
Index: linux-2.6-xfs/fs/xfs/xfs_mount.h
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/xfs_mount.h       2008-10-16 00:18:08.000000000 
+0200
+++ linux-2.6-xfs/fs/xfs/xfs_mount.h    2008-10-22 09:29:09.000000000 +0200
@@ -133,7 +133,7 @@ typedef struct xfs_dquot * (*xfs_dqvopch
                        struct xfs_dquot **, struct xfs_dquot *);
 typedef int    (*xfs_dqvopchownresv_t)(struct xfs_trans *, struct xfs_inode *,
                        struct xfs_dquot *, struct xfs_dquot *, uint);
-typedef void   (*xfs_dqstatvfs_t)(struct xfs_inode *, bhv_statvfs_t *);
+typedef void   (*xfs_dqstatvfs_t)(struct xfs_inode *, struct kstatfs *);
 typedef int    (*xfs_dqsync_t)(struct xfs_mount *, int flags);
 typedef int    (*xfs_quotactl_t)(struct xfs_mount *, int, int, xfs_caddr_t);
 

--