From nobody Mon Jun 20 20:24:07 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 9011886B19F; Mon, 20 Jun 2022 20:24:07 +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 4LRh1z3Th4z3t36; Mon, 20 Jun 2022 20:24:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655756647; 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=//sPWU8ECbO9qjQ//6gChDGC6GnCEQjPiTbPZJh4lJc=; b=nqhqMZm4jVk6hLpv5EueAkhfB11SvLduwqDVIK0o09ORS/B/Gjt//7EZ+EJWFjyKWaTB4F jdCu+Dn7SOENxVDQ6WBTTGp2/PkZBxE5GeNgRJH8sXcQGClvmO0x1wE0XO8EEvkC1vvZhB mPWErHw9+UW/dwMX1wZihneH84mpZzoqlxNvsVdj1mcgnNnCUXGmEycsLfBjn0PRMzvBWF 2mQJ60d15cikXNWBDPsr00ETKsz1y65cHIWwhs6E7yzsLhJ6MSCrBXy4V21OooCv+e4GNF ZZENKfttfwytfDemQca99+SGPXFnV+2Rzb16CEXdO18+EtxR1PvoFUWjWP1ACA== 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 5783A23DF0; Mon, 20 Jun 2022 20:24:07 +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 25KKO70A023509; Mon, 20 Jun 2022 20:24:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25KKO7iM023508; Mon, 20 Jun 2022 20:24:07 GMT (envelope-from git) Date: Mon, 20 Jun 2022 20:24:07 GMT Message-Id: <202206202024.25KKO7iM023508@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 0586a1290446 - main - nfscl: Clean up the code by removing vfs_flags() macro 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0586a12904461c3d99eb76e1d66706782c0d14be Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655756647; 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=//sPWU8ECbO9qjQ//6gChDGC6GnCEQjPiTbPZJh4lJc=; b=VKR9CHzjasB7xHThEGo7gdPlkvPe0/IdUiP3WSbZaHwgIVnRDOlyqAfmz3doxkNBwwj2hx V6XoC13FMBo6cKGWQQQVRBDRVqAaCvGJay+18V8PYg5twFIw5IL/+If05hAJoK5SnZAwqd JTPXlm6GVABThXZlKLsw9Ur14Vs+iKDaiFPgWjUzhhSRXTsLglmSlZGX0Bw7CzZkwZSPnp CSvAIkEgNftCp4sJPcvpKNS2D2k0zjot6yJH1xdFJ/TmMxvbI+50wofConi/qbTB9X3xXQ 5kpcvKLG7yaBHQb87ajLQ5cqOC6wLigqmLHTce5CJtC8t1nYaAz+rpW2ZlnRKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655756647; a=rsa-sha256; cv=none; b=pzt71SS+mtGg0rq8TOAdCw+BohJK8umd5Qi8ULuCFP5Pe/6HzQ5Z9MCkSsC/h0yrrL3deY nE5AOoCK7Wps28YcJ3M3NnXK3KqMqGXjaKhxLgmBaqKxh2epouLhtA8QCPJQKtQWkWSjLP bb1ViEDXYuT2Ml9OcMLTM6GqMFaTsROaVhOXxzSyGKryT16MQMCMyXuMW6CJhWZdvhrwUv pfayZfO8r3kibFmgqzpnDSg/xRbaWn34HxFkfihZH48cYP6Bnd00gFdZw2GWplugDCeeeR 9fjbpsfSRTWOXZOu3G1WoYccN7/C7MrGXDWbmqmylz6lsbaxbFdhBED2iShcdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=0586a12904461c3d99eb76e1d66706782c0d14be commit 0586a12904461c3d99eb76e1d66706782c0d14be Author: Rick Macklem AuthorDate: 2022-06-20 20:23:04 +0000 Commit: Rick Macklem CommitDate: 2022-06-20 20:23:04 +0000 nfscl: Clean up the code by removing vfs_flags() macro The vfs_flags() macro was used to make the code compatible with Mac OSX, for the Mac OSX port. For FreeBSD, this macro just obscured the code, so remove it to clean up the code. This commit should not result in a semantics change. --- sys/fs/nfs/nfskpiport.h | 1 - sys/fs/nfsserver/nfs_nfsdserv.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/fs/nfs/nfskpiport.h b/sys/fs/nfs/nfskpiport.h index c605bc9d8253..311465aba607 100644 --- a/sys/fs/nfs/nfskpiport.h +++ b/sys/fs/nfs/nfskpiport.h @@ -36,7 +36,6 @@ * Darwin8 and hopefully subsequent releases from Apple.) */ typedef struct mount * mount_t; -#define vfs_flags(m) ((m)->mnt_flag) typedef struct vnode * vnode_t; #define vnode_vtype(v) ((v)->v_type) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 3f896effd8ce..4cc14340d7d1 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -438,7 +438,7 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, if (!nd->nd_repstat) { if (NFSVNO_NOTSETSIZE(&nva)) { if (NFSVNO_EXRDONLY(exp) || - (vfs_flags(vp->v_mount) & MNT_RDONLY)) + (vp->v_mount->mnt_flag & MNT_RDONLY)) nd->nd_repstat = EROFS; } else { if (vnode_vtype(vp) != VREG)