Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp1766847imm; Wed, 16 May 2018 02:45:52 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqtTrYprdzsp3KEhzyaVqz6YN+aIprdDTyBJMkQJFfNF6crHdJSFyg5P8dAynSPXT9oyvxH X-Received: by 2002:a17:902:7082:: with SMTP id z2-v6mr137388plk.373.1526463952391; Wed, 16 May 2018 02:45:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526463952; cv=none; d=google.com; s=arc-20160816; b=FzDe8L+15ysBHqzdAYQAnnXRSba/os1Rm8Krmx+bcTqSYnAZRQkzacH6pWGnlsc0+R MWWLOm9HYv7Qt0+Oi5YjSOpVGn+ZJezworkltfgwvr2ScAsdDdnO6ZHmaHBKHHm71YWL ubc2+npaaO242lUYaO0dMLZUTOm9N+fczINpMQUkRpXqNKWvyWGKmY4qPhsKhFLE8nBm iDKFofnHVlCc6aI94QAgYanzt9Wx6uzNbzAMxUZihQWsT+IKcSVkr+THQMxirtowm0ht up1WQ2DOIdtf2ksO4Lg0iFwdQXiCSot2iSDXa2LE0RntPyu7qGO2nS2b+ScdyiC5SpRY GIjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=K3f0pKRznjnxrH0xx2oH67zXj6vorEdFOW+aOZKZPeo=; b=ItNeYlBcgNs24+MASlt1rwaBH5SOP40sgmQ3YgPPbHZMIZyPnC82ZaC7X13FHvTcpx MJmbJWKM8kt+iTNpQSvsPjEotajoSkBSZGNVrk4tq8d4qJcVvw0lIYaO9CliU4mOzGsN bD0RBVdG0humBQ4ksLQHEFxKti6nOts0OF4MCcmxwC5Gofj4onzS6nHlBpiC5hz/tVj9 l+FOHRkS+AwhO96Kbtvukk1Zb8uF5V5XnJArhz+7cR0tRnHXLqNKhAD4jPeoE/G/xpIr jOPF24goh2cR8qXo45NE1HD+szonbflx7OAmGfssVzlBOYIXEZJBFjQwvYuwkbFSxapm H+fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=M+d8dDBc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p84-v6si2297988pfa.180.2018.05.16.02.45.38; Wed, 16 May 2018 02:45:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=M+d8dDBc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752761AbeEPJo5 (ORCPT + 99 others); Wed, 16 May 2018 05:44:57 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:47112 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752710AbeEPJou (ORCPT ); Wed, 16 May 2018 05:44:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=K3f0pKRznjnxrH0xx2oH67zXj6vorEdFOW+aOZKZPeo=; b=M+d8dDBcHy5HKW+hJngRjks05 q2JMzTJDPFq4za10toXMfMB6ADC7xjFzwNaaCEJGHWrivHk9VJwjCivoJiSSu2h2FzwxsEq9V2MiJ qjv9rfJjSJr2JX8FObvY67Sum+Wcls1IbcZAksgXcqOteeR4ENfg5y6FpdIjeUbwOR5NaT1E2C841 pNbaHV52WiXW5y3NvSrY8OuVvkHt1KtthvpNpn7NVZ3pgsJTbJOodbLMGs4uT8feAhkIaw7YIlUSI KK4Oiqw6L06LJDSDEMRJP6vr/XPWn9kffs+jQK/3F1/GpvshxKfTm4+ysZpdSfxUa/iir8Y/H21y4 7p1IAYFXA==; Received: from 089144199016.atnat0008.highway.a1.net ([89.144.199.16] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fIsyb-0004vk-VG; Wed, 16 May 2018 09:44:06 +0000 From: Christoph Hellwig To: Andrew Morton , Alexander Viro Cc: Alexey Dobriyan , Greg Kroah-Hartman , Jiri Slaby , Alessandro Zummo , Alexandre Belloni , linux-acpi@vger.kernel.org, drbd-dev@lists.linbit.com, linux-ide@vger.kernel.org, netdev@vger.kernel.org, linux-rtc@vger.kernel.org, megaraidlinux.pdl@broadcom.com, linux-scsi@vger.kernel.org, devel@driverdev.osuosl.org, linux-afs@lists.infradead.org, linux-ext4@vger.kernel.org, jfs-discussion@lists.sourceforge.net, netfilter-devel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/42] proc: simplify proc_register calling conventions Date: Wed, 16 May 2018 11:43:08 +0200 Message-Id: <20180516094346.20506-5-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180516094346.20506-1-hch@lst.de> References: <20180516094346.20506-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return registered entry on success, return NULL on failure and free the passed in entry. Also expose it in internal.h as we'll start using it in proc_net.c soon. Signed-off-by: Christoph Hellwig --- fs/proc/generic.c | 44 ++++++++++++++++++-------------------------- fs/proc/internal.h | 2 ++ 2 files changed, 20 insertions(+), 26 deletions(-) diff --git a/fs/proc/generic.c b/fs/proc/generic.c index 2078e70e1595..bd8480ff0d35 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c @@ -346,13 +346,12 @@ static const struct inode_operations proc_dir_inode_operations = { .setattr = proc_notify_change, }; -static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp) +/* returns the registered entry, or frees dp and returns NULL on failure */ +struct proc_dir_entry *proc_register(struct proc_dir_entry *dir, + struct proc_dir_entry *dp) { - int ret; - - ret = proc_alloc_inum(&dp->low_ino); - if (ret) - return ret; + if (proc_alloc_inum(&dp->low_ino)) + goto out_free_entry; write_lock(&proc_subdir_lock); dp->parent = dir; @@ -360,12 +359,16 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp WARN(1, "proc_dir_entry '%s/%s' already registered\n", dir->name, dp->name); write_unlock(&proc_subdir_lock); - proc_free_inum(dp->low_ino); - return -EEXIST; + goto out_free_inum; } write_unlock(&proc_subdir_lock); - return 0; + return dp; +out_free_inum: + proc_free_inum(dp->low_ino); +out_free_entry: + pde_free(dp); + return NULL; } static struct proc_dir_entry *__proc_create(struct proc_dir_entry **parent, @@ -443,10 +446,7 @@ struct proc_dir_entry *proc_symlink(const char *name, if (ent->data) { strcpy((char*)ent->data,dest); ent->proc_iops = &proc_link_inode_operations; - if (proc_register(parent, ent) < 0) { - pde_free(ent); - ent = NULL; - } + ent = proc_register(parent, ent); } else { pde_free(ent); ent = NULL; @@ -470,11 +470,9 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode, ent->proc_fops = &proc_dir_operations; ent->proc_iops = &proc_dir_inode_operations; parent->nlink++; - if (proc_register(parent, ent) < 0) { - pde_free(ent); + ent = proc_register(parent, ent); + if (!ent) parent->nlink--; - ent = NULL; - } } return ent; } @@ -505,11 +503,9 @@ struct proc_dir_entry *proc_create_mount_point(const char *name) ent->proc_fops = NULL; ent->proc_iops = NULL; parent->nlink++; - if (proc_register(parent, ent) < 0) { - pde_free(ent); + ent = proc_register(parent, ent); + if (!ent) parent->nlink--; - ent = NULL; - } } return ent; } @@ -539,11 +535,7 @@ struct proc_dir_entry *proc_create_data(const char *name, umode_t mode, pde->proc_fops = proc_fops; pde->data = data; pde->proc_iops = &proc_file_inode_operations; - if (proc_register(parent, pde) < 0) - goto out_free; - return pde; -out_free: - pde_free(pde); + return proc_register(parent, pde); out: return NULL; } diff --git a/fs/proc/internal.h b/fs/proc/internal.h index 0f1692e63cb6..488e67490312 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h @@ -162,6 +162,8 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i /* * generic.c */ +struct proc_dir_entry *proc_register(struct proc_dir_entry *dir, + struct proc_dir_entry *dp); extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int); struct dentry *proc_lookup_de(struct inode *, struct dentry *, struct proc_dir_entry *); extern int proc_readdir(struct file *, struct dir_context *); -- 2.17.0