Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[safe/jmp/linux-2.6] / fs / xfs / xfs_itable.h

diff --git a/fs/xfs/xfs_itable.h b/fs/xfs/xfs_itable.h
index a1f18fc..20792bf 100644 (file)
--- a/fs/xfs/xfs_itable.h
+++ b/fs/xfs/xfs_itable.h
@@ -71,24 +71,33 @@ xfs_bulkstat_single(
 
 typedef int (*bulkstat_one_fmt_pf)(  /* used size in bytes or negative error */
        void                    __user *ubuffer, /* buffer to write to */
+       int                     ubsize,          /* remaining user buffer sz */
+       int                     *ubused,         /* bytes used by formatter */
        const xfs_bstat_t       *buffer);        /* buffer to read from */
 
 int
-xfs_bulkstat_one(
+xfs_bulkstat_one_int(
        xfs_mount_t             *mp,
        xfs_ino_t               ino,
        void                    __user *buffer,
        int                     ubsize,
-       void                    *private_data,
+       bulkstat_one_fmt_pf     formatter,
        xfs_daddr_t             bno,
        int                     *ubused,
        void                    *dibuff,
        int                     *stat);
 
 int
-xfs_internal_inum(
+xfs_bulkstat_one(
        xfs_mount_t             *mp,
-       xfs_ino_t               ino);
+       xfs_ino_t               ino,
+       void                    __user *buffer,
+       int                     ubsize,
+       void                    *private_data,
+       xfs_daddr_t             bno,
+       int                     *ubused,
+       void                    *dibuff,
+       int                     *stat);
 
 typedef int (*inumbers_fmt_pf)(
        void                    __user *ubuffer, /* buffer to write to */