From patchwork Fri Mar 31 20:09:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Bruce Fields" X-Patchwork-Id: 9657267 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7541960350 for ; Fri, 31 Mar 2017 20:09:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 680DD282EC for ; Fri, 31 Mar 2017 20:09:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5AC43286F9; Fri, 31 Mar 2017 20:09:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8BB5E282EC for ; Fri, 31 Mar 2017 20:09:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755251AbdCaUJK (ORCPT ); Fri, 31 Mar 2017 16:09:10 -0400 Received: from fieldses.org ([173.255.197.46]:33204 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754898AbdCaUJK (ORCPT ); Fri, 31 Mar 2017 16:09:10 -0400 Received: by fieldses.org (Postfix, from userid 2815) id C117C4C06; Fri, 31 Mar 2017 16:09:09 -0400 (EDT) Date: Fri, 31 Mar 2017 16:09:09 -0400 From: "J. Bruce Fields" To: NeilBrown Cc: Jason Yan , jlayton@poochiereds.net, linux-nfs@vger.kernel.org, miaoxie@huawei.com, zhaohongjiang@huawei.com Subject: Re: [PATCH] nfsd: make strdup_if_nonnull static Message-ID: <20170331200909.GC8487@fieldses.org> References: <1490259456-15858-1-git-send-email-yanaijie@huawei.com> <20170329215132.GC29934@fieldses.org> <874lyb5kc8.fsf@notabene.neil.brown.name> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <874lyb5kc8.fsf@notabene.neil.brown.name> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Thu, Mar 30, 2017 at 05:50:47PM +1100, NeilBrown wrote: > On Wed, Mar 29 2017, J. Bruce Fields wrote: > > > Thanks, applying for 4.12.--b. > > Ugh... does strdup_if_nonnull() actually help readability at all? > kstrdup() already handles NULL fine, which is what the name seems to > suggest is happening. > I would think kstrdup_report_error() is a name that better reflects the > function. > > Or just discard it: Yes, what was I thinking? Just didn't read kstrdup(), I guess. Applying as follows. --b. commit 3c14417a48da Author: NeilBrown Date: Thu Mar 23 16:57:36 2017 +0800 nfsd4: remove pointless strdup_if_nonnull kstrdup() already checks for NULL. (Brought to our attention by Jason Yann noticing (from sparse output) that it should have been declared static.) Reported-by: Jason Yan Signed-off-by: J. Bruce Fields --- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index e9ef50addddb..78ff82123a1a 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1912,28 +1912,17 @@ static void copy_clid(struct nfs4_client *target, struct nfs4_client *source) target->cl_clientid.cl_id = source->cl_clientid.cl_id; } -int strdup_if_nonnull(char **target, char *source) -{ - if (source) { - *target = kstrdup(source, GFP_KERNEL); - if (!*target) - return -ENOMEM; - } else - *target = NULL; - return 0; -} - static int copy_cred(struct svc_cred *target, struct svc_cred *source) { int ret; - ret = strdup_if_nonnull(&target->cr_principal, source->cr_principal); - if (ret) - return ret; - ret = strdup_if_nonnull(&target->cr_raw_principal, - source->cr_raw_principal); - if (ret) - return ret; + target->cr_principal = kstrdup(source->cr_principal, GFP_KERNEL); + target->cr_raw_principal = kstrdup(source->cr_raw_principal, + GFP_KERNEL); + if ((source->cr_principal && ! target->cr_principal) || + (source->cr_raw_principal && ! target->cr_raw_principal)) + return -ENOMEM; + target->cr_flavor = source->cr_flavor; target->cr_uid = source->cr_uid; target->cr_gid = source->cr_gid;