[RHEL7,COMMIT] Revert "fs/fuse kio_pcs: add WARN_ON to find race between setattr and write/falloc"

Submitted by Konstantin Khorenko on July 4, 2018, 3:06 p.m.

Details

Message ID 201807041506.w64F6npH008829@finist_ce7.work
State New
Series "Revert "fs/fuse kio_pcs: add WARN_ON to find race between setattr and write/falloc""
Headers show

Commit Message

Konstantin Khorenko July 4, 2018, 3:06 p.m.
The commit is pushed to "branch-rh7-3.10.0-862.3.2.vz7.61.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-862.3.2.vz7.61.12
------>
commit 75f075a7db7ad65807eb61d16e17a62e855169ad
Author: Pavel Butsykin <pbutsykin@virtuozzo.com>
Date:   Wed Jul 4 18:06:49 2018 +0300

    Revert "fs/fuse kio_pcs: add WARN_ON to find race between setattr and write/falloc"
    
    This reverts commit 79ee26fdda173d6724c635684b0c72f5e5f66d89.
    
    https://jira.sw.ru/browse/PSBM-85945
    
    Signed-off-by: Pavel Butsykin <pbutsykin@virtuozzo.com>
    Acked-by: Alexey Kuznetsov <kuznet@virtuozzo.com>
---
 fs/fuse/kio/pcs/pcs_fuse_kdirect.c | 11 -----------
 1 file changed, 11 deletions(-)

Patch hide | download patch | download mbox

diff --git a/fs/fuse/kio/pcs/pcs_fuse_kdirect.c b/fs/fuse/kio/pcs/pcs_fuse_kdirect.c
index 258959ed5014..f55a196d5eae 100644
--- a/fs/fuse/kio/pcs/pcs_fuse_kdirect.c
+++ b/fs/fuse/kio/pcs/pcs_fuse_kdirect.c
@@ -771,17 +771,6 @@  static int pcs_fuse_prep_rw(struct pcs_fuse_req *r)
 	spin_lock(&di->lock);
 	/* Deffer all requests if shrink requested to prevent livelock */
 	if (di->size.shrink) {
-		struct inode *inode = &di->inode->inode;
-		struct fuse_conn *fc = get_fuse_conn(inode);
-
-		if (r->req.in.h.opcode == FUSE_WRITE ||
-				r->req.in.h.opcode == FUSE_FALLOCATE) {
-			WARN_ON(1);
-			pr_info("fi->writectr: %d, mutex: %d, fc->lock: %d\n",
-					fi->writectr < 0, mutex_is_locked(&inode->i_mutex),
-					spin_is_locked(&fc->lock));
-		}
-
 		wait_shrink(r, di);
 		spin_unlock(&di->lock);
 		return 1;