[RHEL7,COMMIT] Revert "vfs: panic in guard_bio_eod() if truncated_bytes > bvec->bv_len"

Submitted by Konstantin Khorenko on July 10, 2019, 8:25 a.m.

Details

Message ID 201907100825.x6A8Pt39027393@finist-ce7.sw.ru
State New
Series "Series without cover letter"
Headers show

Commit Message

Konstantin Khorenko July 10, 2019, 8:25 a.m.
The commit is pushed to "branch-rh7-3.10.0-957.21.3.vz7.106.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-957.21.3.vz7.106.6
------>
commit 2ea9e9126111c360526798a420364d77bf791dc2
Author: Konstantin Khorenko <khorenko@virtuozzo.com>
Date:   Tue Jul 9 19:31:41 2019 +0300

    Revert "vfs: panic in guard_bio_eod() if truncated_bytes > bvec->bv_len"
    
    This reverts commit e340cf28e7635d2f2c146a1efa4100c63a4e1a1d.
    
    Not needed after the 5f816f6345ad ("ms/fs: fix guard_bio_eod to
    check for real EOD errors")
    
    https://jira.sw.ru/browse/PSBM-96006
    
    Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com>
---
 fs/buffer.c | 1 -
 1 file changed, 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/fs/buffer.c b/fs/buffer.c
index e9a4c65eed73..2774c8bfb24e 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -3032,7 +3032,6 @@  void guard_bio_eod(int rw, struct bio *bio)
 
 	/* Truncate the bio.. */
 	bio->bi_size -= truncated_bytes;
-	BUG_ON(truncated_bytes > bvec->bv_len);
 	bvec->bv_len -= truncated_bytes;
 
 	/* ..and clear the end of the buffer for reads */