From 4c090c8696dc661b2746b93cc691d624228acab7 Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Fri, 24 Jul 2020 13:51:48 -0700 Subject: [PATCH] ANDROID: GKI: Don't compact fuse_req when CONFIG_VIRTIO_FS=n Otherwise we cannot enable VIRTIO_FS downstream. Bug: 161843089 Change-Id: I317b8c425ab96a1bd484b85b41ce3cb036327117 Signed-off-by: Alistair Delva --- fs/fuse/fuse_i.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 740a8a7d7ae6..572034e04248 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -356,10 +356,8 @@ struct fuse_req { /** Used to wake up the task waiting for completion of request*/ wait_queue_head_t waitq; -#if IS_ENABLED(CONFIG_VIRTIO_FS) /** virtio-fs's physically contiguous buffer for in and out args */ void *argbuf; -#endif }; struct fuse_iqueue;