Merge "dma-buf: Handle dentry->d_fsdata being NULL" (0d177e5d) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/dma-buf/dma-buf.c

+10 −4

Original line number	Diff line number	Diff line
		@@ -45,11 +45,13 @@ static char dmabuffs_dname(struct dentry dentry, char *buffer, int buflen)
		size_t ret = 0;

		dmabuf = dentry->d_fsdata;

		if (dmabuf) {
		spin_lock(&dmabuf->name_lock);
		if (dmabuf->name)
		ret = strlcpy(name, dmabuf->name, DMA_BUF_NAME_LEN);
		spin_unlock(&dmabuf->name_lock);

		}
		return dynamic_dname(dentry, buffer, buflen, "/%s:%s",
		dentry->d_name.name, ret > 0 ? name : "");
		}
		@@ -82,6 +84,10 @@ static void dma_buf_release(struct dentry *dentry)
		int dtor_ret = 0;

		dmabuf = dentry->d_fsdata;

		if (!dmabuf)
		return;

		msm_dma_buf = to_msm_dma_buf(dmabuf);

		BUG_ON(dmabuf->vmapping_counter);