Received: by 2002:a05:6358:bb9e:b0:b9:5105:a5b4 with SMTP id df30csp3728404rwb; Mon, 5 Sep 2022 17:48:46 -0700 (PDT) X-Google-Smtp-Source: AA6agR7k4aZ70ZCgDyIoG0zObr1ffR9QFsT+c0SfcALun1cMKpHnYRaASw5GRa1rAlR/y8g/lzBQ X-Received: by 2002:a65:5b0d:0:b0:434:a7d2:9771 with SMTP id y13-20020a655b0d000000b00434a7d29771mr720748pgq.356.1662425326607; Mon, 05 Sep 2022 17:48:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662425326; cv=none; d=google.com; s=arc-20160816; b=Bb6hRo8xTRvShpAI1SF4k5ztOXAu7mfc2bQZl/L3+tJyxqUL/PzMnjPkSGcJvrCkLy GPHoJHZaF0QGBk0ujTFW/MF/w1R5XAem+TwluRmG1MnHRUgbz3GR+YYDV5nczP3J25GW SHwFFhU//GRytQqVCSrgjmxCVVHKWmVuoNQFjkreUabH46+FxeALJc4ZjesICBN5Ze3w bJvDapSvmBB/yrJ/8dZI0NwXxpYsuHD0DVG6igBXzi1QE4FezGlcI+sivapV7TE8OPEC /7f4JGmW3QqFlN1flAJ+eIcU8Wy9gzicjDfPrh+OxQO6vBSSsSJcyfMBXohjWwdm4qs8 Ftdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from:mime-version :content-transfer-encoding:dkim-signature:dkim-signature; bh=kpyfGOcI7GuWmB12GKLPIynRogI8GCvFaQQyUOir/k8=; b=zlF4NLzzJSbcHqoV7hNmG2QdpsKVIMc7K/qpieB4bnZU4QtFxRCWkGfjM0glonxRTE Y2FDYplQKzkmY4Qbz5tz/pVIaBwszGgXi0XmPytbpKvjOdXI4yv/SPS/F+hobS6Ayq60 zWULHPNyRCl+BDur7ZrvAdppRFBrkTt0N9Dh6fDFwnj4EUZEzaJ9R4d+YIpGvOX035Bt SnowW3aIuvTOmSFalt6cx9gHRsN2TnJg69zelQ7KrV6Qc4cJAbxPRs2+LmdCP+z+v5rg lNdmri2LrwyRkJ6ybIFBu/EvTaKv89tsLtleau+2kQclXpxRyuNe7QGLTuBbae+M21JH FItg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=gQQJpsyx; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i2-20020a636d02000000b00429a132d2c8si11707460pgc.279.2022.09.05.17.48.22; Mon, 05 Sep 2022 17:48:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=gQQJpsyx; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232117AbiIFAma (ORCPT + 99 others); Mon, 5 Sep 2022 20:42:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229817AbiIFAm3 (ORCPT ); Mon, 5 Sep 2022 20:42:29 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E54AF6A49C for ; Mon, 5 Sep 2022 17:42:28 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id ED9F01F8B9; Tue, 6 Sep 2022 00:42:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1662424946; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kpyfGOcI7GuWmB12GKLPIynRogI8GCvFaQQyUOir/k8=; b=gQQJpsyxMzQwN5Zhnbf7AwHhCzTN+boJiUkrYjrtICF3c3Gtkdk1VYWXQUWxZGdCAE1a0R dKVkb1Gd+XxKZJHdS4jSBLyzkOfEbMQD8sWI20Gjdwd5UML7kBzQgDGevFdL3zeVRBsT96 l47HW12dqEAvNSEEMGGt3gjY8LhYyrA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1662424946; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kpyfGOcI7GuWmB12GKLPIynRogI8GCvFaQQyUOir/k8=; b=1OkFZorZ1GCmY5+WEsQFcU6zMbNchk6Z2LyrCyLboD0zk1c8IKGYhQA5h2YRmLs9ebXLyG 93K7DL1VI82EHRBg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id D6247139C7; Tue, 6 Sep 2022 00:42:25 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id LepQJHGXFmOxNAAAMHmgww (envelope-from ); Tue, 06 Sep 2022 00:42:25 +0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit MIME-Version: 1.0 From: "NeilBrown" To: Chuck Lever , Jeff Layton Cc: Linux NFS Mailing List Subject: [PATCH] NFSD: drop fname and flen args from nfsd_create_locked() Date: Tue, 06 Sep 2022 10:42:19 +1000 Message-id: <166242493965.1168.6227147868888984691@noble.neil.brown.name> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org nfsd_create_locked() does not use the "fname" and "flen" arguments, so drop them from declaration and all callers. Signed-off-by: NeilBrown --- fs/nfsd/nfsproc.c | 4 ++-- fs/nfsd/vfs.c | 4 ++-- fs/nfsd/vfs.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index 7381972f1677..9c766ac2cc68 100644 --- a/fs/nfsd/nfsproc.c +++ b/fs/nfsd/nfsproc.c @@ -390,8 +390,8 @@ nfsd_proc_create(struct svc_rqst *rqstp) resp->status = nfs_ok; if (!inode) { /* File doesn't exist. Create it and set attrs */ - resp->status = nfsd_create_locked(rqstp, dirfhp, argp->name, - argp->len, &attrs, type, rdev, + resp->status = nfsd_create_locked(rqstp, dirfhp, + &attrs, type, rdev, newfhp); } else if (type == S_IFREG) { dprintk("nfsd: existing %s, valid=%x, size=%ld\n", diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 9f486b788ed0..528afc3be7af 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1252,7 +1252,7 @@ nfsd_check_ignore_resizing(struct iattr *iap) /* The parent directory should already be locked: */ __be32 nfsd_create_locked(struct svc_rqst *rqstp, struct svc_fh *fhp, - char *fname, int flen, struct nfsd_attrs *attrs, + struct nfsd_attrs *attrs, int type, dev_t rdev, struct svc_fh *resfhp) { struct dentry *dentry, *dchild; @@ -1379,7 +1379,7 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, if (err) goto out_unlock; fh_fill_pre_attrs(fhp); - err = nfsd_create_locked(rqstp, fhp, fname, flen, attrs, type, + err = nfsd_create_locked(rqstp, fhp, attrs, type, rdev, resfhp); fh_fill_post_attrs(fhp); out_unlock: diff --git a/fs/nfsd/vfs.h b/fs/nfsd/vfs.h index c95cd414b4bb..0bf5c7e79abe 100644 --- a/fs/nfsd/vfs.h +++ b/fs/nfsd/vfs.h @@ -79,7 +79,7 @@ __be32 nfsd4_clone_file_range(struct svc_rqst *rqstp, u64 count, bool sync); #endif /* CONFIG_NFSD_V4 */ __be32 nfsd_create_locked(struct svc_rqst *, struct svc_fh *, - char *name, int len, struct nfsd_attrs *attrs, + struct nfsd_attrs *attrs, int type, dev_t rdev, struct svc_fh *res); __be32 nfsd_create(struct svc_rqst *, struct svc_fh *, char *name, int len, struct nfsd_attrs *attrs, -- 2.37.1