* Re: [PATCH v2 02/13] staging/android: drop sync_file_install() and sync_file_put()
[not found] <00da01d1a1ed$f8d8e4a0$ea8aade0$@alibaba-inc.com>
@ 2016-04-29 8:14 ` Hillf Danton
2016-04-29 14:11 ` Gustavo Padovan
0 siblings, 1 reply; 3+ messages in thread
From: Hillf Danton @ 2016-04-29 8:14 UTC (permalink / raw)
To: 'Gustavo Padovan'; +Cc: linux-kernel
>
> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
>
> These two functions are just wrappers for one line functions, they
> call fd_install() and fput() respectively, so just get rid of them
> and use fd_install() and fput() directly for more simplicity.
>
Given sync_file is not file, I don't see that simplicity is worth of
the change of 20+ lines.
Can you please specify the disadvantages of the wrappers?
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/staging/android/sync.c | 20 ++++----------------
> drivers/staging/android/sync.h | 19 -------------------
> drivers/staging/android/sync_debug.c | 4 ++--
> 3 files changed, 6 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
> index f9c6094..b965e2a 100644
> --- a/drivers/staging/android/sync.c
> +++ b/drivers/staging/android/sync.c
> @@ -216,18 +216,6 @@ err:
> }
> EXPORT_SYMBOL(sync_file_fdget);
>
> -void sync_file_put(struct sync_file *sync_file)
> -{
> - fput(sync_file->file);
> -}
> -EXPORT_SYMBOL(sync_file_put);
> -
> -void sync_file_install(struct sync_file *sync_file, int fd)
> -{
> - fd_install(fd, sync_file->file);
> -}
> -EXPORT_SYMBOL(sync_file_install);
> -
> static void sync_file_add_pt(struct sync_file *sync_file, int *i,
> struct fence *fence)
> {
> @@ -469,15 +457,15 @@ static long sync_file_ioctl_merge(struct sync_file *sync_file,
> goto err_put_fence3;
> }
>
> - sync_file_install(fence3, fd);
> - sync_file_put(fence2);
> + fd_install(fd, fence3->file);
> + fput(fence2->file);
> return 0;
>
> err_put_fence3:
> - sync_file_put(fence3);
> + fput(fence3->file);
>
> err_put_fence2:
> - sync_file_put(fence2);
> + fput(fence2->file);
>
> err_put_fd:
> put_unused_fd(fd);
> diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h
> index d2a1734..c45cc7b 100644
> --- a/drivers/staging/android/sync.h
> +++ b/drivers/staging/android/sync.h
> @@ -203,25 +203,6 @@ struct sync_file *sync_file_merge(const char *name,
> */
> struct sync_file *sync_file_fdget(int fd);
>
> -/**
> - * sync_file_put() - puts a reference of a sync_file
> - * @sync_file: sync_file to put
> - *
> - * Puts a reference on @sync_fence. If this is the last reference, the
> - * sync_fil and all it's sync_pts will be freed
> - */
> -void sync_file_put(struct sync_file *sync_file);
> -
> -/**
> - * sync_file_install() - installs a sync_file into a file descriptor
> - * @sync_file: sync_file to install
> - * @fd: file descriptor in which to install the fence
> - *
> - * Installs @sync_file into @fd. @fd's should be acquired through
> - * get_unused_fd_flags(O_CLOEXEC).
> - */
> -void sync_file_install(struct sync_file *sync_file, int fd);
> -
> #ifdef CONFIG_DEBUG_FS
>
> void sync_timeline_debug_add(struct sync_timeline *obj);
> diff --git a/drivers/staging/android/sync_debug.c b/drivers/staging/android/sync_debug.c
> index 5a7ec58..e4b0e41 100644
> --- a/drivers/staging/android/sync_debug.c
> +++ b/drivers/staging/android/sync_debug.c
> @@ -272,12 +272,12 @@ static long sw_sync_ioctl_create_fence(struct sw_sync_timeline *obj,
>
> data.fence = fd;
> if (copy_to_user((void __user *)arg, &data, sizeof(data))) {
> - sync_file_put(sync_file);
> + fput(sync_file->file);
> err = -EFAULT;
> goto err;
> }
>
> - sync_file_install(sync_file, fd);
> + fd_install(fd, sync_file->file);
>
> return 0;
>
> --
> 2.5.5
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2 02/13] staging/android: drop sync_file_install() and sync_file_put()
2016-04-29 8:14 ` [PATCH v2 02/13] staging/android: drop sync_file_install() and sync_file_put() Hillf Danton
@ 2016-04-29 14:11 ` Gustavo Padovan
0 siblings, 0 replies; 3+ messages in thread
From: Gustavo Padovan @ 2016-04-29 14:11 UTC (permalink / raw)
To: Hillf Danton; +Cc: linux-kernel
2016-04-29 Hillf Danton <hillf.zj@alibaba-inc.com>:
> >
> > From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> >
> > These two functions are just wrappers for one line functions, they
> > call fd_install() and fput() respectively, so just get rid of them
> > and use fd_install() and fput() directly for more simplicity.
> >
> Given sync_file is not file, I don't see that simplicity is worth of
> the change of 20+ lines.
> Can you please specify the disadvantages of the wrappers?
Our idea here was to simplify as much as possible this API, also we do
not want to hide sync_file internals from its users. This is staging
and we are re-thinking the API (and userspace ABI too) before moving it
out if staging. I can add some more information to the commit message.
Gustavo
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2 02/13] staging/android: drop sync_file_install() and sync_file_put()
2016-04-28 13:46 [PATCH v2 00/13] De-stage Sync File Framework Gustavo Padovan
@ 2016-04-28 13:46 ` Gustavo Padovan
0 siblings, 0 replies; 3+ messages in thread
From: Gustavo Padovan @ 2016-04-28 13:46 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: linux-kernel, devel, dri-devel, Daniel Stone,
Arve Hjønnevåg, Riley Andrews, Daniel Vetter,
Rob Clark, Greg Hackmann, John Harrison, Maarten Lankhorst,
Sumit Semwal, Gustavo Padovan
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
These two functions are just wrappers for one line functions, they
call fd_install() and fput() respectively, so just get rid of them
and use fd_install() and fput() directly for more simplicity.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/staging/android/sync.c | 20 ++++----------------
drivers/staging/android/sync.h | 19 -------------------
drivers/staging/android/sync_debug.c | 4 ++--
3 files changed, 6 insertions(+), 37 deletions(-)
diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index f9c6094..b965e2a 100644
--- a/drivers/staging/android/sync.c
+++ b/drivers/staging/android/sync.c
@@ -216,18 +216,6 @@ err:
}
EXPORT_SYMBOL(sync_file_fdget);
-void sync_file_put(struct sync_file *sync_file)
-{
- fput(sync_file->file);
-}
-EXPORT_SYMBOL(sync_file_put);
-
-void sync_file_install(struct sync_file *sync_file, int fd)
-{
- fd_install(fd, sync_file->file);
-}
-EXPORT_SYMBOL(sync_file_install);
-
static void sync_file_add_pt(struct sync_file *sync_file, int *i,
struct fence *fence)
{
@@ -469,15 +457,15 @@ static long sync_file_ioctl_merge(struct sync_file *sync_file,
goto err_put_fence3;
}
- sync_file_install(fence3, fd);
- sync_file_put(fence2);
+ fd_install(fd, fence3->file);
+ fput(fence2->file);
return 0;
err_put_fence3:
- sync_file_put(fence3);
+ fput(fence3->file);
err_put_fence2:
- sync_file_put(fence2);
+ fput(fence2->file);
err_put_fd:
put_unused_fd(fd);
diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h
index d2a1734..c45cc7b 100644
--- a/drivers/staging/android/sync.h
+++ b/drivers/staging/android/sync.h
@@ -203,25 +203,6 @@ struct sync_file *sync_file_merge(const char *name,
*/
struct sync_file *sync_file_fdget(int fd);
-/**
- * sync_file_put() - puts a reference of a sync_file
- * @sync_file: sync_file to put
- *
- * Puts a reference on @sync_fence. If this is the last reference, the
- * sync_fil and all it's sync_pts will be freed
- */
-void sync_file_put(struct sync_file *sync_file);
-
-/**
- * sync_file_install() - installs a sync_file into a file descriptor
- * @sync_file: sync_file to install
- * @fd: file descriptor in which to install the fence
- *
- * Installs @sync_file into @fd. @fd's should be acquired through
- * get_unused_fd_flags(O_CLOEXEC).
- */
-void sync_file_install(struct sync_file *sync_file, int fd);
-
#ifdef CONFIG_DEBUG_FS
void sync_timeline_debug_add(struct sync_timeline *obj);
diff --git a/drivers/staging/android/sync_debug.c b/drivers/staging/android/sync_debug.c
index 5a7ec58..e4b0e41 100644
--- a/drivers/staging/android/sync_debug.c
+++ b/drivers/staging/android/sync_debug.c
@@ -272,12 +272,12 @@ static long sw_sync_ioctl_create_fence(struct sw_sync_timeline *obj,
data.fence = fd;
if (copy_to_user((void __user *)arg, &data, sizeof(data))) {
- sync_file_put(sync_file);
+ fput(sync_file->file);
err = -EFAULT;
goto err;
}
- sync_file_install(sync_file, fd);
+ fd_install(fd, sync_file->file);
return 0;
--
2.5.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-04-29 14:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <00da01d1a1ed$f8d8e4a0$ea8aade0$@alibaba-inc.com>
2016-04-29 8:14 ` [PATCH v2 02/13] staging/android: drop sync_file_install() and sync_file_put() Hillf Danton
2016-04-29 14:11 ` Gustavo Padovan
2016-04-28 13:46 [PATCH v2 00/13] De-stage Sync File Framework Gustavo Padovan
2016-04-28 13:46 ` [PATCH v2 02/13] staging/android: drop sync_file_install() and sync_file_put() Gustavo Padovan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).