Attachment 303378 Details for Bug 443681 – patch -- Fix UNC path prefix on QueryUnixPathInfo to have correct slash

[patch] patch -- Fix UNC path prefix on QueryUnixPathInfo to have correct slash

0001-CIFS-Fix-UNC-path-prefix-on-QueryUnixPathInfo-to-h.patch (text/plain), 2.85 KB, created by Jeff Layton on 2008-04-22 20:46:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2008-04-22 20:46:44 UTC

Size: 2.85 KB

patch

obsolete

>From 076d8423a98659a92837b07aa494cb74bfefe77c Mon Sep 17 00:00:00 2001
>From: Steve French <sfrench@us.ibm.com>
>Date: Fri, 18 Apr 2008 23:26:26 +0000
>Subject: [PATCH] [CIFS] Fix UNC path prefix on QueryUnixPathInfo to have correct slash
>
>When a share was in DFS and the server was Unix/Linux, we were sending paths of the form
>    \\server\share/dir/file
>rather than
>    //server/share/dir/file
>
>There was some discussion between me and jra over whether we should use
>    /server/share/dir/file
>as MS sometimes says - but the documentation for this claims it should be
>doubleslash for this type of UNC-like path format and that works, so leaving
>it as doubleslash but converting the \ to / in the the //server/share portion.
>
>This gets Samba to now correctly return STATUS_PATH_NOT_COVERED when it is
>supposed to (Windows already did since the direction of the slash was not an issue
>for them).  Still need another minor change to fully enable DFS (need to finish
>some chages to SMBGetDFSRefer
>
>Signed-off-by: Steve French <sfrench@us.ibm.com>
>---
> fs/cifs/inode.c |   15 +++++++++++----
> 1 files changed, 11 insertions(+), 4 deletions(-)
>
>diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
>index bc673c8..e1031b9 100644
>--- a/fs/cifs/inode.c
>+++ b/fs/cifs/inode.c
>@@ -161,12 +161,14 @@ static void cifs_unix_info_to_inode(struct inode *inode,
> 	spin_unlock(&inode->i_lock);
> }
> 
>-static const unsigned char *cifs_get_search_path(struct cifsTconInfo *pTcon,
>-					const char *search_path)
>+static const unsigned char *cifs_get_search_path(struct cifs_sb_info *cifs_sb,
>+						const char *search_path)
> {
> 	int tree_len;
> 	int path_len;
>+	int i;
> 	char *tmp_path;
>+	struct cifsTconInfo *pTcon = cifs_sb->tcon;
> 
> 	if (!(pTcon->Flags & SMB_SHARE_IS_IN_DFS))
> 		return search_path;
>@@ -180,6 +182,11 @@ static const unsigned char *cifs_get_search_path(struct cifsTconInfo *pTcon,
> 		return search_path;
> 
> 	strncpy(tmp_path, pTcon->treeName, tree_len);
>+	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS)
>+		for (i = 0; i < tree_len; i++) {
>+			if (tmp_path[i] == '\\')
>+				tmp_path[i] = '/';
>+		}
> 	strncpy(tmp_path+tree_len, search_path, path_len);
> 	tmp_path[tree_len+path_len] = 0;
> 	return tmp_path;
>@@ -199,7 +206,7 @@ int cifs_get_inode_info_unix(struct inode **pinode,
> 	pTcon = cifs_sb->tcon;
> 	cFYI(1, ("Getting info on %s", search_path));
> 
>-	full_path = cifs_get_search_path(pTcon, search_path);
>+	full_path = cifs_get_search_path(cifs_sb, search_path);
> 
> try_again_CIFSSMBUnixQPathInfo:
> 	/* could have done a find first instead but this returns more info */
>@@ -402,7 +409,7 @@ int cifs_get_inode_info(struct inode **pinode,
> 			return -ENOMEM;
> 		pfindData = (FILE_ALL_INFO *)buf;
> 
>-		full_path = cifs_get_search_path(pTcon, search_path);
>+		full_path = cifs_get_search_path(cifs_sb, search_path);
> 
> try_again_CIFSSMBQPathInfo:
> 		/* could do find first instead but this returns more info */
>-- 
>1.5.3.6
>

Actions: View | Diff

Attachments on bug 443681: 303378