Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem

[pandora-kernel.git] / fs / super.c

diff --git a/fs/super.c b/fs/super.c
index b383fa4..c755939 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -951,8 +951,7 @@ mount_fs(struct file_system_type *type, int flags, const char *name, void *data)
         * filesystems should never set s_maxbytes larger than MAX_LFS_FILESIZE
         * but s_maxbytes was an unsigned long long for many releases. Throw
         * this warning for a little while to try and catch filesystems that
-        * violate this rule. This warning should be either removed or
-        * converted to a BUG() in 2.6.34.
+        * violate this rule.
         */
        WARN((sb->s_maxbytes < 0), "%s set sb->s_maxbytes to "
                "negative value (%lld)\n", type->name, sb->s_maxbytes);