From 18747013ea47cfb0f7091906b2ebe9380c9bfa22 Mon Sep 17 00:00:00 2001 From: Anton Altaparmakov Date: Tue, 4 Oct 2005 13:08:53 +0100 Subject: [PATCH] --- yaml --- r: 9629 b: refs/heads/master c: c394e458b69632902d65f9e2f39df79314f72908 h: refs/heads/master i: 9627: 8c95e34efcfcf60b18b61c9854fffb39ecb8be29 v: v3 --- [refs] | 2 +- trunk/fs/ntfs/layout.h | 2 +- trunk/fs/ntfs/mft.c | 3 ++- trunk/fs/ntfs/unistr.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 91528d1c35eb..928936f03e6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18efefa9355119b4f6d9b73b074ebbf9882c37c3 +refs/heads/master: c394e458b69632902d65f9e2f39df79314f72908 diff --git a/trunk/fs/ntfs/layout.h b/trunk/fs/ntfs/layout.h index 01f2dfa39cec..5c248d404f05 100644 --- a/trunk/fs/ntfs/layout.h +++ b/trunk/fs/ntfs/layout.h @@ -309,7 +309,7 @@ typedef le16 MFT_RECORD_FLAGS; * Note: The _LE versions will return a CPU endian formatted value! */ #define MFT_REF_MASK_CPU 0x0000ffffffffffffULL -#define MFT_REF_MASK_LE const_cpu_to_le64(0x0000ffffffffffffULL) +#define MFT_REF_MASK_LE const_cpu_to_le64(MFT_REF_MASK_CPU) typedef u64 MFT_REF; typedef le64 leMFT_REF; diff --git a/trunk/fs/ntfs/mft.c b/trunk/fs/ntfs/mft.c index 247586d1d5dc..b011369b5956 100644 --- a/trunk/fs/ntfs/mft.c +++ b/trunk/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); diff --git a/trunk/fs/ntfs/unistr.c b/trunk/fs/ntfs/unistr.c index a389a5a16c84..0ea887fc859c 100644 --- a/trunk/fs/ntfs/unistr.c +++ b/trunk/fs/ntfs/unistr.c @@ -1,7 +1,7 @@ /* * unistr.c - NTFS Unicode string handling. Part of the Linux-NTFS project. * - * Copyright (c) 2001-2004 Anton Altaparmakov + * Copyright (c) 2001-2005 Anton Altaparmakov * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published