Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4144670 authored by Al Viro's avatar Al Viro
Browse files

kill daemonize() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 02232f8d

drivers/staging/gdm72xx/gdm_usb.c

+1 −3
Original line number Diff line number Diff line
@@ -701,8 +701,6 @@ static int k_mode_thread(void *arg) 
	unsigned long flags, flags2, expire;

	int ret;



	daemonize("k_mode_wimax");



	while (!k_mode_stop) {



		spin_lock_irqsave(&k_lock, flags2);
@@ -764,7 +762,7 @@ static struct usb_driver gdm_usb_driver = { 
static int __init usb_gdm_wimax_init(void)

{

#ifdef CONFIG_WIMAX_GDM72XX_K_MODE

	kthread_run(k_mode_thread, NULL, "WiMax_thread");

	kthread_run(k_mode_thread, NULL, "k_mode_wimax");

#endif /* CONFIG_WIMAX_GDM72XX_K_MODE */

	return usb_register(&gdm_usb_driver);

}

fs/file.c

+0 −6
Original line number Diff line number Diff line
@@ -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.

 */

fs/fs_struct.c

+0 −24
Original line number Diff line number Diff line
@@ -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);

	}

}

include/linux/fdtable.h

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,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 *);

void daemonize_descriptors(void);

int unshare_files(struct files_struct **);

struct files_struct *dup_fd(struct files_struct *, int *);

void do_close_on_exec(struct files_struct *);

include/linux/fs_struct.h

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ extern void set_fs_root(struct fs_struct *, struct path *); 
extern void set_fs_pwd(struct fs_struct *, struct path *);

extern struct fs_struct *copy_fs_struct(struct fs_struct *);

extern void free_fs_struct(struct fs_struct *);

extern void daemonize_fs_struct(void);

extern int unshare_fs_struct(void);



static inline void get_fs_root(struct fs_struct *fs, struct path *root)