Skip to content

Commit

Permalink
[PATCH] get rid of __exit_files(), __exit_fs() and __put_fs_struct()
Browse files Browse the repository at this point in the history
The only reason to have separated __...() for those was to keep them inlined
for local users in exit.c.  Since Alexey removed the inline on those, there's
no reason whatsoever to keep them around; just collapse with normal variants.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Apr 22, 2008
1 parent 9b4f526 commit 1ec7f1d
Showing 1 changed file with 6 additions and 21 deletions.
27 changes: 6 additions & 21 deletions kernel/exit.c
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ void reset_files_struct(struct task_struct *tsk, struct files_struct *files)
}
EXPORT_SYMBOL(reset_files_struct);

static void __exit_files(struct task_struct *tsk)
void exit_files(struct task_struct *tsk)
{
struct files_struct * files = tsk->files;

Expand All @@ -533,12 +533,7 @@ static void __exit_files(struct task_struct *tsk)
}
}

void exit_files(struct task_struct *tsk)
{
__exit_files(tsk);
}

static void __put_fs_struct(struct fs_struct *fs)
void put_fs_struct(struct fs_struct *fs)
{
/* No need to hold fs->lock if we are killing it */
if (atomic_dec_and_test(&fs->count)) {
Expand All @@ -550,28 +545,18 @@ static void __put_fs_struct(struct fs_struct *fs)
}
}

void put_fs_struct(struct fs_struct *fs)
{
__put_fs_struct(fs);
}

static void __exit_fs(struct task_struct *tsk)
void exit_fs(struct task_struct *tsk)
{
struct fs_struct * fs = tsk->fs;

if (fs) {
task_lock(tsk);
tsk->fs = NULL;
task_unlock(tsk);
__put_fs_struct(fs);
put_fs_struct(fs);
}
}

void exit_fs(struct task_struct *tsk)
{
__exit_fs(tsk);
}

EXPORT_SYMBOL_GPL(exit_fs);

/*
Expand Down Expand Up @@ -967,8 +952,8 @@ NORET_TYPE void do_exit(long code)
if (group_dead)
acct_process();
exit_sem(tsk);
__exit_files(tsk);
__exit_fs(tsk);
exit_files(tsk);
exit_fs(tsk);
check_stack_usage();
exit_thread();
cgroup_exit(tsk, 1);
Expand Down

0 comments on commit 1ec7f1d

Please sign in to comment.