From b8197f0c4e9635d993afa78438e3ea713413134c Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Fri, 5 Aug 2011 10:28:01 -0400
Subject: [PATCH] --- yaml --- r: 262632 b: refs/heads/master c:
 f9e8c45002cacad536b338dfa9e910e341a49c31 h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/fs/cifs/inode.c | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index ef27fadd9d35..e81cf4190671 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0193e072268fe62c4b19ad4b05cd0d4b23c43bb9
+refs/heads/master: f9e8c45002cacad536b338dfa9e910e341a49c31
diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c
index 9b018c8334fa..a7b2dcd4a53e 100644
--- a/trunk/fs/cifs/inode.c
+++ b/trunk/fs/cifs/inode.c
@@ -764,20 +764,10 @@ char *cifs_build_path_to_root(struct smb_vol *vol, struct cifs_sb_info *cifs_sb,
 	if (full_path == NULL)
 		return full_path;
 
-	if (dfsplen) {
+	if (dfsplen)
 		strncpy(full_path, tcon->treeName, dfsplen);
-		/* switch slash direction in prepath depending on whether
-		 * windows or posix style path names
-		 */
-		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) {
-			int i;
-			for (i = 0; i < dfsplen; i++) {
-				if (full_path[i] == '\\')
-					full_path[i] = '/';
-			}
-		}
-	}
 	strncpy(full_path + dfsplen, vol->prepath, pplen);
+	convert_delimiter(full_path, CIFS_DIR_SEP(cifs_sb));
 	full_path[dfsplen + pplen] = 0; /* add trailing null */
 	return full_path;
 }