From mboxrd@z Thu Jan 1 00:00:00 1970 From: Axel Lin Subject: [PATCH] fs: proc_namespace: simplify testing nsp and nsp->mnt_ns Date: Wed, 27 Nov 2013 11:35:49 +0800 Message-ID: <1385523349.29941.3.camel@phoenix> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: linux-fsdevel@vger.kernel.org To: Al Viro , Andrew Morton Return-path: Received: from mail-pd0-f173.google.com ([209.85.192.173]:61845 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751966Ab3K0Dfz (ORCPT ); Tue, 26 Nov 2013 22:35:55 -0500 Received: by mail-pd0-f173.google.com with SMTP id p10so9032238pdj.4 for ; Tue, 26 Nov 2013 19:35:55 -0800 (PST) Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Trivial cleanup to eliminate a goto. Signed-off-by: Axel Lin --- fs/proc_namespace.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c index 439406e..7be26f0 100644 --- a/fs/proc_namespace.c +++ b/fs/proc_namespace.c @@ -234,17 +234,12 @@ static int mounts_open_common(struct inode *inode, struct file *file, 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); -- 1.8.1.2