From nobody Fri Apr 08 00:03:45 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3BAD51A880E7; Fri, 8 Apr 2022 00:03:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KZJPY5w8Lz4ksq; Fri, 8 Apr 2022 00:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=69X1WC+r5Sg7CVeeQOuTJuElXMtK7mxZCoIXLafICv8=; b=JgYtJM2VZAH0+HDbiTRkRiW4iZe3OSjO4NKBcFygR3VTrhEMg+SRBuwSh5+C4nMGfsEVnP mJQOqrlgUKEshRmyzCqZAaeJA8QyQ/thGMe5+YHHTWIKB09ruk6KOjoBrv7NDNMW2VZijc 9taoOe5m/+Mnak9J1APf9cG3foCsn+OPPBXyX8kTVYdXIkL/lFNclMUv4+dWQD252lCzIv wBu8G8o26+zZ0gQcyrJKGJ/2wvScNRPTasI3rZNZbtMC//JF4V8xwnhIb7IyniO962VOp6 o0+kngE+mWe/p4ac+9EMiJMqxJof8UZAxtNTklfswG/2mO5jBEze0LMAFoMm4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5D0891A582; Fri, 8 Apr 2022 00:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23803jGg086768; Fri, 8 Apr 2022 00:03:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23803j86086767; Fri, 8 Apr 2022 00:03:45 GMT (envelope-from git) Date: Fri, 8 Apr 2022 00:03:45 GMT Message-Id: <202204080003.23803j86086767@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 9fe2867ce4cb - main - smbfs_rename: Move all references to flags under #ifdef notnow. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fe2867ce4cbe80a82aa848aefeb1be9d42ebfa4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=69X1WC+r5Sg7CVeeQOuTJuElXMtK7mxZCoIXLafICv8=; b=biLOw6anM4XruICK9/voGWvabpunw3xX0cRP0wArY7xQZVA2vf7clhNIHU/D0XBKRccZoV khAQKgm4e+R3+v7BkhLnEhfSnHqWuHJJxHFgSAVodCzNZIyI6xk6SQqD9MBs0BEG8cWx4y TL0ihEqDSFuO+FGS1QXk1FgEi4ZpCFT1O836XgDS7/NcY9GiY+uL3FPJaorqQpz3aTR7jq W3B77ZzjTIRL6tzI6sbWJJI7MsFe7AlkKtnkbuzse51MW4EnsXAvdmvRiAtSUAHWsXFJAw bLgFExYmQJ3l7SmBjzkcfHK0oJz/CHsQeHD5FNN2wv77MNgbp+HmwV4+eughQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649376226; a=rsa-sha256; cv=none; b=DvyXu+uNksQEY9dqbLo3jgkmEep7Du93PY6TuLAZxYslZeaYNiiQaw/HoOx4fnhiRZo40Z DGS/RmntK1umDFY6/yF50HoCmCdMaarfyq2rKQKVyxSee7Wn4JxEVG9VOvCL+jnTd+1aOI cV81KfpM1po6O53QMPYvEKGI/9LnDQ2Bwcjfi22VpydxrfRBVz20aUKn/1/nNEeKqcWQ1y 0aSI989bLAE2ubE8QA0lqb2EMht4ifVtMyfZ2MAFm4t9ctKWU3nZptaiiggYSkYvJfmULO ZzIykNxMth02pTGn3S45U2JgD8EWc9+0cSDFzfYuv7gvDSfcibyAENVZK0YS4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9fe2867ce4cbe80a82aa848aefeb1be9d42ebfa4 commit 9fe2867ce4cbe80a82aa848aefeb1be9d42ebfa4 Author: John Baldwin AuthorDate: 2022-04-08 00:01:28 +0000 Commit: John Baldwin CommitDate: 2022-04-08 00:01:28 +0000 smbfs_rename: Move all references to flags under #ifdef notnow. --- sys/fs/smbfs/smbfs_vnops.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c index 7ae5fb303590..8df399b392f9 100644 --- a/sys/fs/smbfs/smbfs_vnops.c +++ b/sys/fs/smbfs/smbfs_vnops.c @@ -628,7 +628,9 @@ smbfs_rename(ap) struct componentname *tcnp = ap->a_tcnp; /* struct componentname *fcnp = ap->a_fcnp;*/ struct smb_cred *scred; +#ifdef notnow u_int16_t flags = 6; +#endif int error=0; scred = NULL; @@ -643,11 +645,17 @@ smbfs_rename(ap) error = EBUSY; goto out; } +#ifdef notnow flags = 0x10; /* verify all writes */ +#endif if (fvp->v_type == VDIR) { +#ifdef notnow flags |= 2; +#endif } else if (fvp->v_type == VREG) { +#ifdef notnow flags |= 1; +#endif } else { return EINVAL; }