evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dma-buf: pass flags into dma_buf_fd.

Browse source 
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: Dave Airlie <airlied@redhat.com>
Signed-off-by: Rob Clark <rob@ti.com>
Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
This commit is contained in:
Dave Airlie 2012-03-16 10:34:02 +00:00 • committed by Sumit Semwal
parent 33ea2dcb39
commit 55c1c4ca23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/base/dma-buf.c
View file

@ -107,17 +107,18 @@ EXPORT_SYMBOL_GPL(dma_buf_export);
/** /**
* dma_buf_fd - returns a file descriptor for the given dma_buf * dma_buf_fd - returns a file descriptor for the given dma_buf
* @dmabuf: [in] pointer to dma_buf for which fd is required. * @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. * 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; int error, fd;
if (!dmabuf || !dmabuf->file) if (!dmabuf || !dmabuf->file)
return -EINVAL; return -EINVAL;
error = get_unused_fd(); error = get_unused_fd_flags(flags);
if (error < 0) if (error < 0)
return error; return error;
fd = error; fd = error;

2
include/linux/dma-buf.h
View file

@ -117,7 +117,7 @@ void dma_buf_detach(struct dma_buf *dmabuf,
struct dma_buf_attachment *dmabuf_attach); struct dma_buf_attachment *dmabuf_attach);
struct dma_buf *dma_buf_export(void *priv, const struct dma_buf_ops *ops, struct dma_buf *dma_buf_export(void *priv, const struct dma_buf_ops *ops,
size_t size, int flags); 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); struct dma_buf *dma_buf_get(int fd);
void dma_buf_put(struct dma_buf *dmabuf); void dma_buf_put(struct dma_buf *dmabuf);