diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-04 09:34:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-04 09:34:00 -0700 |
| commit | dd7205ed0f022a2a5e60eb7404e6c9f49d2301c3 (patch) | |
| tree | 773021ad63126ff2dacff654bd41b03a4ad6389e /fs/ntfs/mft.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| parent | NTFS: Fix a 64-bitness bug where a left-shift could overflow a 32-bit variable (diff) | |
| download | linux-dev-dd7205ed0f022a2a5e60eb7404e6c9f49d2301c3.tar.xz linux-dev-dd7205ed0f022a2a5e60eb7404e6c9f49d2301c3.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6
Diffstat (limited to 'fs/ntfs/mft.c')
| -rw-r--r-- | fs/ntfs/mft.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c index 247586d1d5dc..b011369b5956 100644 --- a/fs/ntfs/mft.c +++ b/fs/ntfs/mft.c @@ -58,7 +58,8 @@ static inline MFT_RECORD *map_mft_record_page(ntfs_inode *ni) * overflowing the unsigned long, but I don't think we would ever get * here if the volume was that big... */ - index = ni->mft_no << vol->mft_record_size_bits >> PAGE_CACHE_SHIFT; + index = (u64)ni->mft_no << vol->mft_record_size_bits >> + PAGE_CACHE_SHIFT; ofs = (ni->mft_no << vol->mft_record_size_bits) & ~PAGE_CACHE_MASK; i_size = i_size_read(mft_vi); |