diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-02 22:34:38 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-29 03:49:02 +0100 |
| commit | c4144670fd9b34d6eae22c9f83751745898e8243 (patch) | |
| tree | da0bbda5707fafdc1d79eb2c851835c777182e89 /fs | |
| parent | microblaze: rt_sigreturn is too trigger-happy about sigaltstack errors (diff) | |
| download | linux-c4144670fd9b34d6eae22c9f83751745898e8243.tar.xz linux-c4144670fd9b34d6eae22c9f83751745898e8243.zip | |
kill daemonize()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/file.c | 6 | ||||
| -rw-r--r-- | fs/fs_struct.c | 24 |
2 files changed, 0 insertions, 30 deletions
diff --git a/fs/file.c b/fs/file.c index 7cb71b992603..7272a1c5831d 100644 --- a/fs/file.c +++ b/fs/file.c @@ -519,12 +519,6 @@ struct files_struct init_files = { .file_lock = __SPIN_LOCK_UNLOCKED(init_task.file_lock), }; -void daemonize_descriptors(void) -{ - atomic_inc(&init_files.count); - reset_files_struct(&init_files); -} - /* * allocate a file descriptor, mark it busy. */ diff --git a/fs/fs_struct.c b/fs/fs_struct.c index 5df4775fea03..fe6ca583bbc0 100644 --- a/fs/fs_struct.c +++ b/fs/fs_struct.c @@ -164,27 +164,3 @@ struct fs_struct init_fs = { .seq = SEQCNT_ZERO, .umask = 0022, }; - -void daemonize_fs_struct(void) -{ - struct fs_struct *fs = current->fs; - - if (fs) { - int kill; - - task_lock(current); - - spin_lock(&init_fs.lock); - init_fs.users++; - spin_unlock(&init_fs.lock); - - spin_lock(&fs->lock); - current->fs = &init_fs; - kill = !--fs->users; - spin_unlock(&fs->lock); - - task_unlock(current); - if (kill) - free_fs_struct(fs); - } -} |