From 39f9c8ee32b18874e93409f6ae8211114652c85f Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 24 Apr 2009 16:11:18 -0400
Subject: [PATCH] --- yaml --- r: 144202 b: refs/heads/master c:
 a9e817425dc0baede8ebe5fbc9984a640257432b h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext4/inode.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6f5108e4e8eb..34667006a267 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 485c26ec70f823f2a9cf45982b724893e53a859e
+refs/heads/master: a9e817425dc0baede8ebe5fbc9984a640257432b
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index cab75bbcd57b..11460037ea9d 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -4357,11 +4357,9 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
 	ei->i_flags = le32_to_cpu(raw_inode->i_flags);
 	inode->i_blocks = ext4_inode_blocks(raw_inode, ei);
 	ei->i_file_acl = le32_to_cpu(raw_inode->i_file_acl_lo);
-	if (EXT4_SB(inode->i_sb)->s_es->s_creator_os !=
-	    cpu_to_le32(EXT4_OS_HURD)) {
+	if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_64BIT))
 		ei->i_file_acl |=
 			((__u64)le16_to_cpu(raw_inode->i_file_acl_high)) << 32;
-	}
 	inode->i_size = ext4_isize(raw_inode);
 	ei->i_disksize = inode->i_size;
 	inode->i_generation = le32_to_cpu(raw_inode->i_generation);