Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6-omap-h63xx.git] / fs / xfs / xfs_dir2.h

diff --git a/fs/xfs/xfs_dir2.h b/fs/xfs/xfs_dir2.h
index 7e24ffeda9e1f7ae92d0882d940b1fd6e11825af..7dd364b1e038d04053f525da93afd1e9687b3d61 100644 (file)
--- a/fs/xfs/xfs_dir2.h
+++ b/fs/xfs/xfs_dir2.h
@@ -55,16 +55,16 @@ typedef     __uint32_t      xfs_dir2_db_t;
 /*
  * Byte offset in a directory.
  */
-typedef        xfs_off_t               xfs_dir2_off_t;
+typedef        xfs_off_t       xfs_dir2_off_t;
 
 /*
  * For getdents, argument struct for put routines.
  */
 typedef int (*xfs_dir2_put_t)(struct xfs_dir2_put_args *pa);
 typedef struct xfs_dir2_put_args {
-       xfs_off_t               cook;           /* cookie of (next) entry */
+       xfs_off_t       cook;           /* cookie of (next) entry */
        xfs_intino_t    ino;            /* inode number */
-       struct xfs_dirent       *dbp;           /* buffer pointer */
+       xfs_dirent_t    *dbp;           /* buffer pointer */
        char            *name;          /* directory entry name */
        int             namelen;        /* length of name */
        int             done;           /* output: set if value was stored */
@@ -72,24 +72,16 @@ typedef struct xfs_dir2_put_args {
        struct uio      *uio;           /* uio control structure */
 } xfs_dir2_put_args_t;
 
-#define        XFS_DIR_IS_V2(mp)       ((mp)->m_dirversion == 2)
-extern xfs_dirops_t    xfsv2_dirops;
-
 /*
  * Other interfaces used by the rest of the dir v2 code.
  */
-extern int
-       xfs_dir2_grow_inode(struct xfs_da_args *args, int space,
-                           xfs_dir2_db_t *dbp);
-
-extern int
-       xfs_dir2_isblock(struct xfs_trans *tp, struct xfs_inode *dp, int *vp);
-
-extern int
-       xfs_dir2_isleaf(struct xfs_trans *tp, struct xfs_inode *dp, int *vp);
-
-extern int
-       xfs_dir2_shrink_inode(struct xfs_da_args *args, xfs_dir2_db_t db,
-                             struct xfs_dabuf *bp);
+extern int xfs_dir2_grow_inode(struct xfs_da_args *args, int space,
+                               xfs_dir2_db_t *dbp);
+extern int xfs_dir2_isblock(struct xfs_trans *tp, struct xfs_inode *dp,
+                               int *vp);
+extern int xfs_dir2_isleaf(struct xfs_trans *tp, struct xfs_inode *dp,
+                               int *vp);
+extern int xfs_dir2_shrink_inode(struct xfs_da_args *args, xfs_dir2_db_t db,
+                               struct xfs_dabuf *bp);
 
 #endif /* __XFS_DIR2_H__ */