Merge ../ntfs-2.6-devel

mariux64 · Feb 24, 2006 · 7b875af · 7b875af
2 parents 3672b63 + 944d795
commit 7b875af
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
@@ -248,7 +248,7 @@ static int ntfs_attr_extend_initialized(ntfs_inode *ni, const s64 new_init_size,
 		 * 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);