diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2006-02-24 05:04:22 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2006-02-24 05:04:22 -0500 |
| commit | 7b875affd49fbc8978a1a898a0a80ebfff11f8c6 (patch) | |
| tree | c611237ddce08f33c858254a67c4858fe643861d /fs | |
| parent | 3672b638ec1d5b1020ea27986060b830f09c96c1 (diff) | |
| parent | 944d79559d154c12becde0dab327016cf438f46c (diff) | |
Merge ../ntfs-2.6-devel
Diffstat (limited to 'fs')
| -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 fb413d3d8618..3a119a87686a 100644 --- a/fs/ntfs/file.c +++ b/fs/ntfs/file.c | |||
| @@ -248,7 +248,7 @@ do_non_resident_extend: | |||
| 248 | * enough to make ntfs_writepage() work. | 248 | * enough to make ntfs_writepage() work. |
| 249 | */ | 249 | */ |
| 250 | write_lock_irqsave(&ni->size_lock, flags); | 250 | write_lock_irqsave(&ni->size_lock, flags); |
| 251 | ni->initialized_size = (index + 1) << PAGE_CACHE_SHIFT; | 251 | ni->initialized_size = (s64)(index + 1) << PAGE_CACHE_SHIFT; |
| 252 | if (ni->initialized_size > new_init_size) | 252 | if (ni->initialized_size > new_init_size) |
| 253 | ni->initialized_size = new_init_size; | 253 | ni->initialized_size = new_init_size; |
| 254 | write_unlock_irqrestore(&ni->size_lock, flags); | 254 | write_unlock_irqrestore(&ni->size_lock, flags); |