Attachment 14313 Details for Bug 13318 – Patch for 4.7 and 4.8 cherry-picked from master

[patch] Patch for 4.7 and 4.8 cherry-picked from master

bug13318-v47,v48.patch (text/plain), 1.81 KB, created by Ralph Böhme on 2018-07-07 14:55:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Böhme

Created: 2018-07-07 14:55:23 UTC

Size: 1.81 KB

patch

obsolete

>From 3b1c92c693e3199f93a06ff39aed1d50f24a2f19 Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Fri, 2 Mar 2018 15:50:29 +0100
>Subject: [PATCH] s3: smbd/durable: remove dev and inode check from
> vfs_default_durable_reconnect_check_stat()
>
>On a cluster filesystem the device numbers may differ on the cluster
>nodes. We already verify the file_id in vfs_default_durable_reconnect(),
>so we can safely remove the dev/inode checks.
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=13318
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit 0a91ade5272698c094137fa28d2ad4723b5963cf)
>---
> source3/smbd/durable.c | 24 ------------------------
> 1 file changed, 24 deletions(-)
>
>diff --git a/source3/smbd/durable.c b/source3/smbd/durable.c
>index 602a96e1fe5..2a5ddc00268 100644
>--- a/source3/smbd/durable.c
>+++ b/source3/smbd/durable.c
>@@ -305,30 +305,6 @@ static bool vfs_default_durable_reconnect_check_stat(
> {
> 	int ret;
> 
>-	if (cookie_st->st_ex_dev != fsp_st->st_ex_dev) {
>-		DEBUG(1, ("vfs_default_durable_reconnect (%s): "
>-			  "stat_ex.%s differs: "
>-			  "cookie:%llu != stat:%llu, "
>-			  "denying durable reconnect\n",
>-			  name,
>-			  "st_ex_dev",
>-			  (unsigned long long)cookie_st->st_ex_dev,
>-			  (unsigned long long)fsp_st->st_ex_dev));
>-		return false;
>-	}
>-
>-	if (cookie_st->st_ex_ino != fsp_st->st_ex_ino) {
>-		DEBUG(1, ("vfs_default_durable_reconnect (%s): "
>-			  "stat_ex.%s differs: "
>-			  "cookie:%llu != stat:%llu, "
>-			  "denying durable reconnect\n",
>-			  name,
>-			  "st_ex_ino",
>-			  (unsigned long long)cookie_st->st_ex_ino,
>-			  (unsigned long long)fsp_st->st_ex_ino));
>-		return false;
>-	}
>-
> 	if (cookie_st->st_ex_mode != fsp_st->st_ex_mode) {
> 		DEBUG(1, ("vfs_default_durable_reconnect (%s): "
> 			  "stat_ex.%s differs: "
>-- 
>2.13.6
>

Flags:

jra: review+

Actions: View

Attachments on bug 13318: 14015 | 14313