Merge branch 'master' of /usr/src/ntfs-2.6/

[sfrench/cifs-2.6.git] / fs / ntfs / file.c

diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index fb413d3d861875932742b3ccea65d40ac99ef47b..3a119a87686ab62425ce255d90fc3d23a97281fd 100644 (file)
--- 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);