From fdb1cfe2d3a57a039ec3afbf19ee894a64c746fe Mon Sep 17 00:00:00 2001 From: Guangming Cao Date: Wed, 14 Jul 2021 10:57:57 +0800 Subject: [PATCH] FROMGIT: dma_buf: remove dmabuf sysfs teardown before release Dmabuf sysfs stat is used for dmabuf info track. But these file maybe still in use after buffer released, should clear it before buffer release. Signed-off-by: Guangming Cao Bug: 193585160 (cherry picked from commit 63c57e8dc7a01303ac020d82b1301602561ec001 https://anongit.freedesktop.org/git/drm/drm-misc.git drm-misc) Link: https://patchwork.freedesktop.org/patch/445008/ Change-Id: I0715d265f1c363130bd6cf4c036a5fd3730e2b16 Signed-off-by: Guangming Cao --- drivers/dma-buf/dma-buf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index 47eeeb02513b..d9948d58b3f4 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -98,12 +98,12 @@ static void dma_buf_release(struct dentry *dentry) */ BUG_ON(dmabuf->cb_shared.active || dmabuf->cb_excl.active); + dma_buf_stats_teardown(dmabuf); dmabuf->ops->release(dmabuf); if (dmabuf->resv == (struct dma_resv *)&dmabuf[1]) dma_resv_fini(dmabuf->resv); - dma_buf_stats_teardown(dmabuf); module_put(dmabuf->owner); kfree(dmabuf->name); kfree(dmabuf);