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

Commit 55c1c4ca authored by Dave Airlie's avatar Dave Airlie Committed by Sumit Semwal
Browse files

dma-buf: pass flags into dma_buf_fd. 



We need to pass the flags into dma_buf_fd at this point,
so the flags end up doing the right thing for O_CLOEXEC.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarRob Clark <rob@ti.com>
Signed-off-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
parent 33ea2dcb

drivers/base/dma-buf.c

+3 −2
Original line number Diff line number Diff line
@@ -107,17 +107,18 @@ EXPORT_SYMBOL_GPL(dma_buf_export); 
/**

 * dma_buf_fd - returns a file descriptor for the given dma_buf

 * @dmabuf:	[in]	pointer to dma_buf for which fd is required.

 * @flags:      [in]    flags to give to fd

 *

 * On success, returns an associated 'fd'. Else, returns error.

 */

int dma_buf_fd(struct dma_buf *dmabuf)

int dma_buf_fd(struct dma_buf *dmabuf, int flags)

{

	int error, fd;



	if (!dmabuf || !dmabuf->file)

		return -EINVAL;



	error = get_unused_fd();

	error = get_unused_fd_flags(flags);

	if (error < 0)

		return error;

	fd = error;

include/linux/dma-buf.h

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ void dma_buf_detach(struct dma_buf *dmabuf, 
				struct dma_buf_attachment *dmabuf_attach);

struct dma_buf *dma_buf_export(void *priv, const struct dma_buf_ops *ops,

			       size_t size, int flags);

int dma_buf_fd(struct dma_buf *dmabuf);

int dma_buf_fd(struct dma_buf *dmabuf, int flags);

struct dma_buf *dma_buf_get(int fd);

void dma_buf_put(struct dma_buf *dmabuf);