Merge tag 'acpi-extra-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-artful-kernel.git] / fs / xfs / libxfs / xfs_dir2.h

diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h
index d6e6d9d16f6c30d90e88f742c077782bc678b86f..21c8f8bf94d52ebd62b7a9e41efb50fb6a8a8000 100644 (file)
--- a/fs/xfs/libxfs/xfs_dir2.h
+++ b/fs/xfs/libxfs/xfs_dir2.h
@@ -47,9 +47,9 @@ struct xfs_dir_ops {
        struct xfs_dir2_sf_entry *
                (*sf_nextentry)(struct xfs_dir2_sf_hdr *hdr,
                                struct xfs_dir2_sf_entry *sfep);
-       __uint8_t (*sf_get_ftype)(struct xfs_dir2_sf_entry *sfep);
+       uint8_t (*sf_get_ftype)(struct xfs_dir2_sf_entry *sfep);
        void    (*sf_put_ftype)(struct xfs_dir2_sf_entry *sfep,
-                               __uint8_t ftype);
+                               uint8_t ftype);
        xfs_ino_t (*sf_get_ino)(struct xfs_dir2_sf_hdr *hdr,
                                struct xfs_dir2_sf_entry *sfep);
        void    (*sf_put_ino)(struct xfs_dir2_sf_hdr *hdr,
@@ -60,9 +60,9 @@ struct xfs_dir_ops {
                                     xfs_ino_t ino);
 
        int     (*data_entsize)(int len);
-       __uint8_t (*data_get_ftype)(struct xfs_dir2_data_entry *dep);
+       uint8_t (*data_get_ftype)(struct xfs_dir2_data_entry *dep);
        void    (*data_put_ftype)(struct xfs_dir2_data_entry *dep,
-                               __uint8_t ftype);
+                               uint8_t ftype);
        __be16 * (*data_entry_tag_p)(struct xfs_dir2_data_entry *dep);
        struct xfs_dir2_data_free *
                (*data_bestfree_p)(struct xfs_dir2_data_hdr *hdr);