s3: VFS: syncops. Do early return in syncops_renameat().

Makes the code path clearer.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <npower@samba.org>

diff --git a/source3/modules/vfs_syncops.c b/source3/modules/vfs_syncops.c
index 09b270d091836e5c9a57acca2e1fa327577c2ee0..bc8b641c1b0833666fb8889b2bd2790c90581d43 100644 (file)
--- a/source3/modules/vfs_syncops.c
+++ b/source3/modules/vfs_syncops.c
@@ -155,11 +155,19 @@ static int syncops_renameat(vfs_handle_struct *handle,
                        smb_fname_src,
                        dstfsp,
                        smb_fname_dst);
-       if (ret == 0 && config->onmeta && !config->disable) {
-               syncops_two_names(handle->conn,
-                                 smb_fname_src,
-                                 smb_fname_dst);
+       if (ret == -1) {
+               return ret;
+       }
+       if (config->disable) {
+               return ret;
        }
+       if (!config->onmeta) {
+               return ret;
+       }
+
+       syncops_two_names(handle->conn,
+                         smb_fname_src,
+                         smb_fname_dst);
        return ret;
 }