diff --git a/[refs] b/[refs]
index e98ea757e87f..f1b9ca2d5d42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c9f6de3b80ca46000bd1b63d892820f9ee32138
+refs/heads/master: 4e64c88693fde1b1cbaa4cfecad43a0c3fad354e
diff --git a/trunk/fs/ntfs/aops.c b/trunk/fs/ntfs/aops.c
index b6cc8cf24626..5fd516f42eec 100644
--- a/trunk/fs/ntfs/aops.c
+++ b/trunk/fs/ntfs/aops.c
@@ -389,9 +389,11 @@ static int ntfs_readpage(struct file *file, struct page *page)
 	 * Only $DATA attributes can be encrypted and only unnamed $DATA
 	 * attributes can be compressed.  Index root can have the flags set but
 	 * this means to create compressed/encrypted files, not that the
-	 * attribute is compressed/encrypted.
+	 * attribute is compressed/encrypted.  Note we need to check for
+	 * AT_INDEX_ALLOCATION since this is the type of both directory and
+	 * index inodes.
 	 */
-	if (ni->type != AT_INDEX_ROOT) {
+	if (ni->type != AT_INDEX_ALLOCATION) {
 		/* If attribute is encrypted, deny access, just like NT4. */
 		if (NInoEncrypted(ni)) {
 			BUG_ON(ni->type != AT_DATA);
@@ -1341,9 +1343,11 @@ static int ntfs_writepage(struct page *page, struct writeback_control *wbc)
 	 * Only $DATA attributes can be encrypted and only unnamed $DATA
 	 * attributes can be compressed.  Index root can have the flags set but
 	 * this means to create compressed/encrypted files, not that the
-	 * attribute is compressed/encrypted.
+	 * attribute is compressed/encrypted.  Note we need to check for
+	 * AT_INDEX_ALLOCATION since this is the type of both directory and
+	 * index inodes.
 	 */
-	if (ni->type != AT_INDEX_ROOT) {
+	if (ni->type != AT_INDEX_ALLOCATION) {
 		/* If file is encrypted, deny access, just like NT4. */
 		if (NInoEncrypted(ni)) {
 			unlock_page(page);