summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2006-02-24 10:04:22 +0000
committerAnton Altaparmakov <aia21@cantab.net>2006-02-24 10:04:22 +0000
commit7b875affd49fbc8978a1a898a0a80ebfff11f8c6 (patch)
treec611237ddce08f33c858254a67c4858fe643861d /fs
parent3672b638ec1d5b1020ea27986060b830f09c96c1 (diff)
parent944d79559d154c12becde0dab327016cf438f46c (diff)
downloadlwn-7b875affd49fbc8978a1a898a0a80ebfff11f8c6.tar.gz
lwn-7b875affd49fbc8978a1a898a0a80ebfff11f8c6.zip
Merge ../ntfs-2.6-devel
Diffstat (limited to 'fs')
-rw-r--r--fs/ntfs/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index fb413d3d8618..3a119a87686a 100644
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -248,7 +248,7 @@ do_non_resident_extend:
* enough to make ntfs_writepage() work.
*/
write_lock_irqsave(&ni->size_lock, flags);
- ni->initialized_size = (index + 1) << PAGE_CACHE_SHIFT;
+ ni->initialized_size = (s64)(index + 1) << PAGE_CACHE_SHIFT;
if (ni->initialized_size > new_init_size)
ni->initialized_size = new_init_size;
write_unlock_irqrestore(&ni->size_lock, flags);