diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-17 15:30:06 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-17 15:30:06 -0400 |
commit | 3190186362466658f01b2e354e639378ce07e1a9 (patch) | |
tree | 4ef50e96c385ed076465aac23f52902467e7d825 /fs/ntfs/file.c | |
parent | 08848e446bcd2130c26945be966446389d25bcc2 (diff) | |
parent | f60f700876cd51de9de69f3a3c865d95e287a24d (diff) |
Auto merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/ntfs/file.c')
-rw-r--r-- | fs/ntfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c index db8713ea0d27..e0f530ce6b99 100644 --- a/fs/ntfs/file.c +++ b/fs/ntfs/file.c | |||
@@ -47,7 +47,7 @@ | |||
47 | static int ntfs_file_open(struct inode *vi, struct file *filp) | 47 | static int ntfs_file_open(struct inode *vi, struct file *filp) |
48 | { | 48 | { |
49 | if (sizeof(unsigned long) < 8) { | 49 | if (sizeof(unsigned long) < 8) { |
50 | if (vi->i_size > MAX_LFS_FILESIZE) | 50 | if (i_size_read(vi) > MAX_LFS_FILESIZE) |
51 | return -EFBIG; | 51 | return -EFBIG; |
52 | } | 52 | } |
53 | return generic_file_open(vi, filp); | 53 | return generic_file_open(vi, filp); |