Diff for /linux-2.6-xfs/mainline-patches/linux-2.6/xfs_super.h between versions 1.2 and 1.3

version 1.2, 2007/01/16 14:53:53 version 1.3, 2007/01/16 14:56:58
Line 0 Line 1
   Initialisation of quota and dmapi stuff, 2.6.x-xfs uses behaviours to
   set these modules up. We need to export xfs_get_inode for ioops.
   
   TODO: DMAPI stuff could be removed completely from mainline.
   
   
   --- /home/chatz/isms/linux-2.6.19/fs/xfs/linux-2.6/xfs_super.h  2006-11-30 08:57:37.000000000 +1100
   +++ linux-2.6/xfs_super.h       2006-12-15 17:48:29.000000000 +1100
   @@ -18,28 +18,6 @@
    #ifndef __XFS_SUPER_H__
    #define __XFS_SUPER_H__
    
   -#ifdef CONFIG_XFS_DMAPI
   -# define vfs_insertdmapi(vfs)  vfs_insertops(vfsp, &xfs_dmops)
   -# define vfs_initdmapi()       dmapi_init()
   -# define vfs_exitdmapi()       dmapi_uninit()
   -#else
   -# define vfs_insertdmapi(vfs)  do { } while (0)
   -# define vfs_initdmapi()       do { } while (0)
   -# define vfs_exitdmapi()       do { } while (0)
   -#endif
   -
   -#ifdef CONFIG_XFS_QUOTA
   -# define vfs_insertquota(vfs)  vfs_insertops(vfsp, &xfs_qmops)
   -extern void xfs_qm_init(void);
   -extern void xfs_qm_exit(void);
   -# define vfs_initquota()       xfs_qm_init()
   -# define vfs_exitquota()       xfs_qm_exit()
   -#else
   -# define vfs_insertquota(vfs)  do { } while (0)
   -# define vfs_initquota()       do { } while (0)
   -# define vfs_exitquota()       do { } while (0)
   -#endif
   -
    #ifdef CONFIG_XFS_POSIX_ACL
    # define XFS_ACL_STRING                "ACLs, "
    # define set_posix_acl_flag(sb)        ((sb)->s_flags |= MS_POSIXACL)
   @@ -78,12 +56,6 @@
    # define XFS_TRACE_STRING
    #endif
    
   -#ifdef CONFIG_XFS_DMAPI
   -# define XFS_DMAPI_STRING      "dmapi support, "
   -#else
   -# define XFS_DMAPI_STRING
   -#endif
   -
    #ifdef DEBUG
    # define XFS_DBG_STRING                "debug"
    #else
   @@ -95,7 +67,6 @@
                                   XFS_REALTIME_STRING \
                                   XFS_BIGFS_STRING \
                                   XFS_TRACE_STRING \
   -                               XFS_DMAPI_STRING \
                                   XFS_DBG_STRING /* DBG must be last */
    
    struct xfs_inode;
   @@ -105,6 +76,7 @@
    
    extern __uint64_t xfs_max_file_offset(unsigned int);
    
   +extern struct inode *xfs_get_inode(bhv_desc_t *, xfs_ino_t, int);
    extern void xfs_initialize_vnode(bhv_desc_t *, bhv_vnode_t *, bhv_desc_t *, int);
    
    extern void xfs_flush_inode(struct xfs_inode *);

Removed from v.1.2  
changed lines
  Added in v.1.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>