Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 11825792 authored by Hridaya Prajapati's avatar Hridaya Prajapati
Browse files

Revert "ANDROID: fs: fuse: Freeze client on suspend when request sent to userspace" 

commit e61b11a7 ("ANDROID: fuse: Allocate zeroed memory for canonical path")
fixes the deadlock that this patch tries to fix.

This reverts commit aeb761e1.

Change-Id: I7137a93cf83b4d2a3cecb2b2de6f9fa14e6a2702
parent cc216f0a

fs/fuse/dev.c

+1 −4
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/swap.h>

#include <linux/splice.h>

#include <linux/sched.h>

#include <linux/freezer.h>



MODULE_ALIAS_MISCDEV(FUSE_MINOR);

MODULE_ALIAS("devname:fuse");
@@ -488,9 +487,7 @@ static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req) 
	 * Either request is already in userspace, or it was forced.

	 * Wait it out.

	 */

	while (!test_bit(FR_FINISHED, &req->flags))

		wait_event_freezable(req->waitq,

				test_bit(FR_FINISHED, &req->flags));

	wait_event(req->waitq, test_bit(FR_FINISHED, &req->flags));

}



static void __fuse_request_send(struct fuse_conn *fc, struct fuse_req *req)