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: Dave Airlie <airlied@redhat.com> Signed-off-by: Rob Clark <rob@ti.com> Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>

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: Dave Airlie <airlied@redhat.com> Signed-off-by: Rob Clark <rob@ti.com> Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
Dave Airlie · Sumit Semwal
1 parent 33ea2dcb39
Showing 2 changed files with 4 additions and 3 deletions Side-by-side Diff
drivers/base/dma-buf.c
include/linux/dma-buf.h
@@ -107,17 +107,18 @@
 /**
  * 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;
@@ -117,7 +117,7 @@
 				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);
...	...	@@ -107,17 +107,18 @@
107	107	/**
108	108	* dma_buf_fd - returns a file descriptor for the given dma_buf
109	109	* @dmabuf: [in] pointer to dma_buf for which fd is required.
	110	+ * @flags: [in] flags to give to fd
110	111	*
111	112	* On success, returns an associated 'fd'. Else, returns error.
112	113	*/
113		-int dma_buf_fd(struct dma_buf *dmabuf)
	114	+int dma_buf_fd(struct dma_buf *dmabuf, int flags)
114	115	{
115	116	int error, fd;
116	117
117	118	if (!dmabuf \|\| !dmabuf->file)
118	119	return -EINVAL;
119	120
120		- error = get_unused_fd();
	121	+ error = get_unused_fd_flags(flags);
121	122	if (error < 0)
122	123	return error;
123	124	fd = error;
...	...	@@ -117,7 +117,7 @@
117	117	struct dma_buf_attachment *dmabuf_attach);
118	118	struct dma_buf dma_buf_export(void priv, const struct dma_buf_ops *ops,
119	119	size_t size, int flags);
120		-int dma_buf_fd(struct dma_buf *dmabuf);
	120	+int dma_buf_fd(struct dma_buf *dmabuf, int flags);
121	121	struct dma_buf *dma_buf_get(int fd);
122	122	void dma_buf_put(struct dma_buf *dmabuf);
123	123