Merge remote-tracking branch 'regulator/fix/core' into regulator-linus

[~andy/linux] / fs / affs / affs.h

diff --git a/fs/affs/affs.h b/fs/affs/affs.h
index 6e216419f340de5219a684db6a70f99643784ac5..3952121f2f28beee731618ae915a433f16e16fa0 100644 (file)
--- a/fs/affs/affs.h
+++ b/fs/affs/affs.h
@@ -88,8 +88,8 @@ struct affs_sb_info {
        u32 s_root_block;               /* FFS root block number. */
        int s_hashsize;                 /* Size of hash table. */
        unsigned long s_flags;          /* See below. */
-       uid_t s_uid;                    /* uid to override */
-       gid_t s_gid;                    /* gid to override */
+       kuid_t s_uid;                   /* uid to override */
+       kgid_t s_gid;                   /* gid to override */
        umode_t s_mode;                 /* mode to override */
        struct buffer_head *s_root_bh;  /* Cached root block. */
        struct mutex s_bmlock;          /* Protects bitmap access. */