Revert "kernel: revert an upstream patch that break 8TB Blockdevices on 32bit"

This reverts commit c64e080f3a52be0e60c06220021e97fecad94d34.

diff --git a/lfs/linux b/lfs/linux
index 1b8c399bc16e429ec5377b2f8a624cde372dfd32..e29dab67fa07f5955c58f786746ac5a36e1a2641 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -167,10 +167,6 @@ endif
        # Fix uevent PHYSDEVDRIVER
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-2.6.32.27_mcs7830-fix-driver-name.patch
 
-       # Revert c2a973f45e2 this should fix a fs deadlock but it is the
-       # reason for 8TB block device limitation on 32bit systems
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.58-revert-3d549dc.patch
-
 ifeq "$(KCFG)" "-kirkwood"
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.10-mv_cesa_disable_failing_hmac_sha1.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-kirkwood_legacy_boot.patch

diff --git a/src/patches/linux/linux-4.9.58-revert-3d549dc.patch b/src/patches/linux/linux-4.9.58-revert-3d549dc.patch
deleted file mode 100644 (file)
index e974bf4..0000000
--- a/src/patches/linux/linux-4.9.58-revert-3d549dc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur linux-4.9.58.org/mm/filemap.c linux-4.9.58/mm/filemap.c
---- linux-4.9.58.org/mm/filemap.c      2017-10-21 17:21:39.000000000 +0200
-+++ linux-4.9.58/mm/filemap.c  2017-10-25 13:53:57.083152487 +0200
-@@ -1688,9 +1688,9 @@
-       unsigned int prev_offset;
-       int error = 0;
- 
--      if (unlikely(*ppos >= inode->i_sb->s_maxbytes))
--              return 0;
--      iov_iter_truncate(iter, inode->i_sb->s_maxbytes);
-+//    if (unlikely(*ppos >= inode->i_sb->s_maxbytes))
-+//            return 0;
-+//    iov_iter_truncate(iter, inode->i_sb->s_maxbytes);
- 
-       index = *ppos >> PAGE_SHIFT;
-       prev_index = ra->prev_pos >> PAGE_SHIFT;