diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-08-19 12:04:24 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-09-26 21:08:56 -0400 |
commit | 483ce1d4b8c3b82bc9c9a1dd9dbc44f50b3aaf5a (patch) | |
tree | 46a43df814fc7f7bb0c22d0c47fabb7db95d7ada /drivers/staging | |
parent | 0ee8cdfe6af052deb56dccd54838a1eb32fb4ca2 (diff) | |
download | op-kernel-dev-483ce1d4b8c3b82bc9c9a1dd9dbc44f50b3aaf5a.zip op-kernel-dev-483ce1d4b8c3b82bc9c9a1dd9dbc44f50b3aaf5a.tar.gz |
take descriptor-related part of close() to file.c
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/android/binder.c | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c index 9e1a98a..f71d624 100644 --- a/drivers/staging/android/binder.c +++ b/drivers/staging/android/binder.c @@ -391,42 +391,16 @@ static void task_fd_install( } /* - * copied from __put_unused_fd in open.c - */ -static void __put_unused_fd(struct files_struct *files, unsigned int fd) -{ - struct fdtable *fdt = files_fdtable(files); - __clear_open_fd(fd, fdt); - if (fd < files->next_fd) - files->next_fd = fd; -} - -/* * copied from sys_close */ static long task_close_fd(struct binder_proc *proc, unsigned int fd) { - struct file *filp; - struct files_struct *files = proc->files; - struct fdtable *fdt; int retval; - if (files == NULL) + if (proc->files == NULL) return -ESRCH; - spin_lock(&files->file_lock); - fdt = files_fdtable(files); - if (fd >= fdt->max_fds) - goto out_unlock; - filp = fdt->fd[fd]; - if (!filp) - goto out_unlock; - rcu_assign_pointer(fdt->fd[fd], NULL); - __clear_close_on_exec(fd, fdt); - __put_unused_fd(files, fd); - spin_unlock(&files->file_lock); - retval = filp_close(filp, files); - + retval = __close_fd(proc->files, fd); /* can't restart close syscall because file table entry was cleared */ if (unlikely(retval == -ERESTARTSYS || retval == -ERESTARTNOINTR || @@ -435,10 +409,6 @@ static long task_close_fd(struct binder_proc *proc, unsigned int fd) retval = -EINTR; return retval; - -out_unlock: - spin_unlock(&files->file_lock); - return -EBADF; } static void binder_set_nice(long nice) |