| Message ID | 20200817220425.9389-3-ebiederm@xmission.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/17] exec: Move unshare_files to fix posix file locking during exec | expand |
On Mon, Aug 17, 2020 at 05:04:11PM -0500, Eric W. Biederman wrote: > Now that exec no longer needs to restore the previous value of current->files > on error there are no more callers of reset_files_struct so remove it. > > Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> > --- Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
diff --git a/fs/file.c b/fs/file.c index 21c0893f2f1d..c585dbaf31a3 100644 --- a/fs/file.c +++ b/fs/file.c @@ -435,18 +435,6 @@ void put_files_struct(struct files_struct *files) } } -void reset_files_struct(struct files_struct *files) -{ - struct task_struct *tsk = current; - struct files_struct *old; - - old = tsk->files; - task_lock(tsk); - tsk->files = files; - task_unlock(tsk); - put_files_struct(old); -} - void exit_files(struct task_struct *tsk) { struct files_struct * files = tsk->files; diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h index f46a084b60b2..7cc9885044d9 100644 --- a/include/linux/fdtable.h +++ b/include/linux/fdtable.h @@ -108,7 +108,6 @@ struct task_struct; struct files_struct *get_files_struct(struct task_struct *); void put_files_struct(struct files_struct *fs); -void reset_files_struct(struct files_struct *); int unshare_files(void); struct files_struct *dup_fd(struct files_struct *, unsigned, int *) __latent_entropy; void do_close_on_exec(struct files_struct *);
Now that exec no longer needs to restore the previous value of current->files on error there are no more callers of reset_files_struct so remove it. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> --- fs/file.c | 12 ------------ include/linux/fdtable.h | 1 - 2 files changed, 13 deletions(-)