Re: [PATCH 1/7] cifs: merge __{cifs,smb2}_reconnect[_tcon]() into cifs_tree_connect()

[Paulo Alcantara <pc@cjr.nz>]

Paulo Alcantara <pc@cjr.nz> writes:

> Stefan Metzmacher <metze@samba.org> writes:
>
>>> +		if (tcon->ipc) {
>>> +			scnprintf(tree, MAX_TREE_SIZE, "\\\\%s\\IPC$", share);
>>> +			rc = ops->tree_connect(xid, tcon->ses, tree, tcon, nlsc);
>>> +		} else {
>>> +			scnprintf(tree, MAX_TREE_SIZE, "\\%s", share);
>>> +			rc = ops->tree_connect(xid, tcon->ses, tree, tcon, nlsc);
>>> +			if (!rc) {
>>> +				rc = update_super_prepath(tcon, prefix, prefix_len);
>>> +				break;
>>> +			}
>>> +		}
>>
>> The original code used:
>>
>> -		scnprintf(tree, MAX_TREE_SIZE, "\\%.*s", (int)share_len,
>> -			  share);
>>
>> So it's no longer identical.
>>
>> Was the share_len code added after my initial patch?
>
> Yep.  See
>
>       e4af35fa55b0 (cifs: handle hostnames that resolve to same ip in failover)
>       bacd704a95ad (cifs: handle prefix paths in reconnect)

Oh, that's really wrong, sorry.  I should have kept the usage of
"share_len" in scnprintf() for this commit.  So, in patch 6/7, it should
use directly "share" instead.

Thanks for pointing that out.  I'll send v2 with that fix.