[Devel,RHEL7,COMMIT] Revert "ext4: fix seek_data soft lookup on sparse files"

Submitted by Konstantin Khorenko on April 28, 2017, 12:16 p.m.

Details

Message ID 201704281216.v3SCGEYe016243@finist_cl7.x64_64.work.ct
State New
Series "Series without cover letter"
Headers show

Commit Message

Konstantin Khorenko April 28, 2017, 12:16 p.m. 
The commit is pushed to "branch-rh7-3.10.0-514.16.1.vz7.32.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-514.16.1.vz7.30.8
------>
commit a06f7eb4fb64f58e10b6f4a04215ee3df8866b17
Author: Andrey Ryabinin <aryabinin@virtuozzo.com>
Date:   Fri Apr 28 16:16:01 2017 +0400

    Revert "ext4: fix seek_data soft lookup on sparse files"
    
    This reverts commit a8b68fd3911361dbaf66da6786eb3a6d472177c6.
    
    We are going to apply a better fix for seek_data slowness,
    so this commit is no longer needed.
    
    https://jira.sw.ru/browse/PSBM-65551
    
    Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
---
 fs/ext4/file.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

Patch hide | download patch | download mbox 

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 167e262..c63d937 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -612,17 +612,7 @@  static loff_t ext4_seek_data(struct file *file, loff_t offset, loff_t maxsize)
 			if (unwritten)
 				break;
 		}
-		if (signal_pending(current)) {
-			mutex_unlock(&inode->i_mutex);
-			return -EINTR;
-		}
-		if (need_resched()) {
-			mutex_unlock(&inode->i_mutex);
-			cond_resched();
-			mutex_lock(&inode->i_mutex);
-			isize = inode->i_size;
-			end = isize >> blkbits;
-		}
+
 		last++;
 		dataoff = (loff_t)last << blkbits;
 	} while (last <= end);