[kernel] r14374 - dists/trunk/linux-2.6/debian/patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Sun Oct 11 17:09:01 2009
New Revision: 14374

Log:
hfsplus: Apply Andrew Morton's incremental fix to hfsplus-limit-to-2tb.patch

Modified:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/hfsplus-limit-to-2tb.patch

Modified: dists/trunk/linux-2.6/debian/patches/bugfix/all/hfsplus-limit-to-2tb.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/all/hfsplus-limit-to-2tb.patch	Sun Oct 11 02:20:45 2009	(r14373)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/hfsplus-limit-to-2tb.patch	Sun Oct 11 17:09:01 2009	(r14374)
@@ -14,8 +14,7 @@
 number may be truncated.  For now, avoid data loss by refusing to mount
 HFS+ volumes with more than 2^32 sectors (2TB).
 
-Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
-Cc: stable at kernel.org
+[plus fix by Andrew Morton <akpm at linux-foundation.org>]
 ---
 --- a/fs/hfsplus/wrapper.c
 +++ b/fs/hfsplus/wrapper.c
@@ -23,7 +22,7 @@
  
  	if (hfsplus_get_last_session(sb, &part_start, &part_size))
  		return -EINVAL;
-+	if (part_start + part_size > 0x100000000) {
++	if ((u64)part_start + part_size > 0x100000000ULL) {
 +		pr_err("hfs: volumes larger than 2TB are not supported yet\n");
 +		return -EINVAL;
 +	}