Subject: + fs-proc_namespacec-simplify-testing-nsp-and-nsp-mnt_ns.patch added to -mm tree To: axel.lin@xxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 13 Jan 2014 12:03:12 -0800 The patch titled Subject: fs/proc_namespace.c: simplify testing nsp and nsp->mnt_ns has been added to the -mm tree. Its filename is fs-proc_namespacec-simplify-testing-nsp-and-nsp-mnt_ns.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/fs-proc_namespacec-simplify-testing-nsp-and-nsp-mnt_ns.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/fs-proc_namespacec-simplify-testing-nsp-and-nsp-mnt_ns.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Axel Lin <axel.lin@xxxxxxxxxx> Subject: fs/proc_namespace.c: simplify testing nsp and nsp->mnt_ns Trivial cleanup to eliminate a goto. Signed-off-by: Axel Lin <axel.lin@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/proc_namespace.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff -puN fs/proc_namespace.c~fs-proc_namespacec-simplify-testing-nsp-and-nsp-mnt_ns fs/proc_namespace.c --- a/fs/proc_namespace.c~fs-proc_namespacec-simplify-testing-nsp-and-nsp-mnt_ns +++ a/fs/proc_namespace.c @@ -234,17 +234,12 @@ static int mounts_open_common(struct ino rcu_read_lock(); nsp = task_nsproxy(task); - if (!nsp) { + if (!nsp || !nsp->mnt_ns) { rcu_read_unlock(); put_task_struct(task); goto err; } ns = nsp->mnt_ns; - if (!ns) { - rcu_read_unlock(); - put_task_struct(task); - goto err; - } get_mnt_ns(ns); rcu_read_unlock(); task_lock(task); _ Patches currently in -mm which might be from axel.lin@xxxxxxxxxx are fs-ramfs-file-nommuc-make-ramfs_nommu_get_unmapped_area-and-ramfs_nommu_mmap-static.patch fs-ramfs-move-ramfs_aops-to-inodec.patch fs-proc_namespacec-simplify-testing-nsp-and-nsp-mnt_ns.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html