diff --git a/[refs] b/[refs]
index c20a0302fddd..00bfc7ece9cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 532490f0a5350fd92d838b7430a4c846bc8eac3f
+refs/heads/master: 66a362a2aa8ffa72670259fa15e2a77a01cc2217
diff --git a/trunk/fs/isofs/inode.c b/trunk/fs/isofs/inode.c
index 6b4dcd4f2943..5a44811b5027 100644
--- a/trunk/fs/isofs/inode.c
+++ b/trunk/fs/isofs/inode.c
@@ -722,7 +722,12 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent)
 	}
 
 	s->s_magic = ISOFS_SUPER_MAGIC;
-	s->s_maxbytes = 0xffffffff; /* We can handle files up to 4 GB */
+
+	/*
+	 * With multi-extent files, file size is only limited by the maximum
+	 * size of a file system, which is 8 TB.
+	 */
+	s->s_maxbytes = 0x80000000000LL;
 
 	/*
 	 * The CDROM is read-only, has no nodes (devices) on it, and since