Re: [BK PATCH 2.5] fs/ntfs/dir.c: use PAGE_CACHE_MASK_LL with 64-bit values

[Eric W. Biederman]

Anton Altaparmakov <[e-mail]> writes:

> Linus,
> 
> Following from previous patch which introduced PAGE_CACHE_MASK_LL, this
> one fixes a bug in fs/ntfs/dir.c which was using PAGE_CACHE_MASK
> on 64-bit values... It now uses PAGE_CACHE_MASK_LL.
> 
> Patch together with the other two patches available from:
> 
> 	bk pull http://linux-ntfs.bkbits.net/linux-2.5-pm
> 
> Best regards,
> 
> 	Anton
> -- 
> Anton Altaparmakov <aia21 at cantab.net> (replace at with @)
> Linux NTFS maintainer / IRC: #ntfs on irc.openprojects.net
> WWW: http://linux-ntfs.sf.net/, http://www-stu.christs.cam.ac.uk/~aia21/
> 
> ===================================================================
> 
> This will update the following files:
> 
>  fs/ntfs/dir.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletion(-)
> 
> through these ChangeSets:
> 
> <[e-mail]> (02/07/27 1.479)
>    fs/ntfs/dir.c: Use PAGE_CACHE_MASK_LL() on 64-bit values.
> 
> 
> diff -Nru a/fs/ntfs/dir.c b/fs/ntfs/dir.c
> --- a/fs/ntfs/dir.c	Sat Jul 27 14:24:09 2002
> +++ b/fs/ntfs/dir.c	Sat Jul 27 14:24:09 2002
> @@ -1232,7 +1232,8 @@
>  	ntfs_debug("Handling index buffer 0x%Lx.",
>  			(long long)bmp_pos + cur_bmp_pos);
>  	/* If the current index buffer is in the same page we reuse the page. */
> 
> -	if ((prev_ia_pos & PAGE_CACHE_MASK) != (ia_pos & PAGE_CACHE_MASK)) {
> +	if ((prev_ia_pos & PAGE_CACHE_MASK_LL) !=
> +			(ia_pos & PAGE_CACHE_MASK_LL)) {
>  		prev_ia_pos = ia_pos;
>  		if (likely(ia_page != NULL))
>  			ntfs_unmap_page(ia_page);

Hmm.  Wouldn't
prev_ia_pos >> PAGE_CACHE_SHIFT != ia_pos >> PAGE_CACHE_SHIFT
work just as well?  And be some safer as the result could be stored in
32bits?

Eric