From ac9efee298dc102415889dddfb133f404017f8bd Mon Sep 17 00:00:00 2001
From: Anton Altaparmakov <aia21@cantab.net>
Date: Wed, 17 Nov 2004 15:45:08 +0000
Subject: [PATCH] --- yaml --- r: 4831 b: refs/heads/master c:
 d4b9ba7bf6f38cff55b5d95a0db7dd91311ce20a h: refs/heads/master i:   4829:
 d7d596c31eef28d076d70f1610d6c7f33cfe0767   4827:
 2f1feffa290da2c178c9813578778ecb9ec39156   4823:
 362bd5b7edd93fc7a4d78e8ebcbef60561ce9ca8   4815:
 08e30273feb091fdc2fc2991dee8787701166dc1   4799:
 26d5edac824e7f553bd499ebd2a04d799ab24cd2 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/ntfs/ChangeLog | 1 +
 trunk/fs/ntfs/file.c    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index edf19f46af20..06e6da96ec9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db30d160cd8dfe1e53435fd76f4189778f1c728e
+refs/heads/master: d4b9ba7bf6f38cff55b5d95a0db7dd91311ce20a
diff --git a/trunk/fs/ntfs/ChangeLog b/trunk/fs/ntfs/ChangeLog
index ff0d9b132df8..6d2a99c13d30 100644
--- a/trunk/fs/ntfs/ChangeLog
+++ b/trunk/fs/ntfs/ChangeLog
@@ -33,6 +33,7 @@ ToDo/Notes:
 	- Use i_size_read() in fs/ntfs/logfile.c::ntfs_{check,empty}_logfile().
 	- Use i_size_read() once and then use the cached value in
 	  fs/ntfs/lcnalloc.c::ntfs_cluster_alloc().
+	- Use i_size_read() in fs/ntfs/file.c::ntfs_file_open().
 
 2.1.22 - Many bug and race fixes and error handling improvements.
 
diff --git a/trunk/fs/ntfs/file.c b/trunk/fs/ntfs/file.c
index db8713ea0d27..e0f530ce6b99 100644
--- a/trunk/fs/ntfs/file.c
+++ b/trunk/fs/ntfs/file.c
@@ -47,7 +47,7 @@
 static int ntfs_file_open(struct inode *vi, struct file *filp)
 {
 	if (sizeof(unsigned long) < 8) {
-		if (vi->i_size > MAX_LFS_FILESIZE)
+		if (i_size_read(vi) > MAX_LFS_FILESIZE)
 			return -EFBIG;
 	}
 	return generic_file_open(vi, filp);