git: 9fe2867ce4cb - main - smbfs_rename: Move all references to flags under #ifdef notnow.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 08 Apr 2022 00:03:45 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=9fe2867ce4cbe80a82aa848aefeb1be9d42ebfa4
commit 9fe2867ce4cbe80a82aa848aefeb1be9d42ebfa4
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-04-08 00:01:28 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
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;
}