Merge branches 'fixes-for-37', 'ec' and 'thermal' into release

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

diff --git a/fs/ext3/ext3.h b/fs/ext3/ext3.h
index b6515fd7e56c6be9453d2d344a7f75ced330271c..e85ff15a060e7dcb220c4170f8455f7d1c96cba2 100644 (file)
--- a/fs/ext3/ext3.h
+++ b/fs/ext3/ext3.h
@@ -243,8 +243,8 @@ struct ext3_new_group_data {
  */
 struct ext3_mount_options {
        unsigned long s_mount_opt;
-       uid_t s_resuid;
-       gid_t s_resgid;
+       kuid_t s_resuid;
+       kgid_t s_resgid;
        unsigned long s_commit_interval;
 #ifdef CONFIG_QUOTA
        int s_jquota_fmt;
@@ -637,8 +637,8 @@ struct ext3_sb_info {
        struct buffer_head ** s_group_desc;
        unsigned long  s_mount_opt;
        ext3_fsblk_t s_sb_block;
-       uid_t s_resuid;
-       gid_t s_resgid;
+       kuid_t s_resuid;
+       kgid_t s_resgid;
        unsigned short s_mount_state;
        unsigned short s_pad;
        int s_addr_per_block_bits;
@@ -920,7 +920,11 @@ struct dx_hash_info
        u32             *seed;
 };
 
-#define EXT3_HTREE_EOF 0x7fffffff
+
+/* 32 and 64 bit signed EOF for dx directories */
+#define EXT3_HTREE_EOF_32BIT   ((1UL  << (32 - 1)) - 1)
+#define EXT3_HTREE_EOF_64BIT   ((1ULL << (64 - 1)) - 1)
+
 
 /*
  * Control parameters used by ext3_htree_next_block