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

Commit 0678e5fe authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] proc_task_root_link c99 fix 



fs/proc/base.c: In function `proc_task_root_link':
fs/proc/base.c:364: warning: ISO C90 forbids mixed declarations and code

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e53897e2

fs/proc/base.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -343,7 +343,8 @@ static int proc_root_link(struct inode *inode, struct dentry **dentry, struct vf 




/* Same as proc_root_link, but this addionally tries to get fs from other

/* Same as proc_root_link, but this addionally tries to get fs from other

 * threads in the group */

 * threads in the group */

static int proc_task_root_link(struct inode *inode, struct dentry **dentry, struct vfsmount **mnt)

static int proc_task_root_link(struct inode *inode, struct dentry **dentry,

				struct vfsmount **mnt)

{

{

	struct fs_struct *fs;

	struct fs_struct *fs;

	int result = -ENOENT;

	int result = -ENOENT;
@@ -357,9 +358,10 @@ static int proc_task_root_link(struct inode *inode, struct dentry **dentry, stru 
	} else {

	} else {

		/* Try to get fs from other threads */

		/* Try to get fs from other threads */

		task_unlock(leader);

		task_unlock(leader);

		struct task_struct *task = leader;

		read_lock(&tasklist_lock);

		read_lock(&tasklist_lock);

		if (pid_alive(task)) {

		if (pid_alive(leader)) {

			struct task_struct *task = leader;



			while ((task = next_thread(task)) != leader) {

			while ((task = next_thread(task)) != leader) {

				task_lock(task);

				task_lock(task);

				fs = task->fs;

				fs = task->fs;