Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
cifs: cope with negative dentries in cifs_get_root
cifs: convert prefixpath delimiters in cifs_build_path_to_root
CIFS: Fix missing a decrement of inFlight value
cifs: demote DFS referral lookup errors to cFYI
Revert "cifs: advertise the right receive buffer size to the server"
+14
-18
+3
-2
fs/cifs/cifs_dfs_ref.c
+3
-2
fs/cifs/cifs_dfs_ref.c
···
141
141
142
142
rc = dns_resolve_server_name_to_ip(*devname, &srvIP);
143
143
if (rc < 0) {
144
-
cERROR(1, "%s: Failed to resolve server part of %s to IP: %d",
145
-
__func__, *devname, rc);
144
+
cFYI(1, "%s: Failed to resolve server part of %s to IP: %d",
145
+
__func__, *devname, rc);
146
146
goto compose_mount_options_err;
147
147
}
148
+
148
149
/* md_len = strlen(...) + 12 for 'sep+prefixpath='
149
150
* assuming that we have 'unc=' and 'ip=' in
150
151
* the original sb_mountdata
+4
fs/cifs/cifsfs.c
+4
fs/cifs/cifsfs.c
+2
-2
fs/cifs/dns_resolve.c
+2
-2
fs/cifs/dns_resolve.c
···
79
79
/* Perform the upcall */
80
80
rc = dns_query(NULL, hostname, len, NULL, ip_addr, NULL);
81
81
if (rc < 0)
82
-
cERROR(1, "%s: unable to resolve: %*.*s",
83
-
__func__, len, len, hostname);
82
+
cFYI(1, "%s: unable to resolve: %*.*s",
83
+
__func__, len, len, hostname);
84
84
else
85
85
cFYI(1, "%s: resolved: %*.*s to %s",
86
86
__func__, len, len, hostname, *ip_addr);
+2
-12
fs/cifs/inode.c
+2
-12
fs/cifs/inode.c
···
764
764
if (full_path == NULL)
765
765
return full_path;
766
766
767
-
if (dfsplen) {
767
+
if (dfsplen)
768
768
strncpy(full_path, tcon->treeName, dfsplen);
769
-
/* switch slash direction in prepath depending on whether
770
-
* windows or posix style path names
771
-
*/
772
-
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) {
773
-
int i;
774
-
for (i = 0; i < dfsplen; i++) {
775
-
if (full_path[i] == '\\')
776
-
full_path[i] = '/';
777
-
}
778
-
}
779
-
}
780
769
strncpy(full_path + dfsplen, vol->prepath, pplen);
770
+
convert_delimiter(full_path, CIFS_DIR_SEP(cifs_sb));
781
771
full_path[dfsplen + pplen] = 0; /* add trailing null */
782
772
return full_path;
783
773
}
+1
-2
fs/cifs/sess.c
+1
-2
fs/cifs/sess.c
···
124
124
/* that we use in next few lines */
125
125
/* Note that header is initialized to zero in header_assemble */
126
126
pSMB->req.AndXCommand = 0xFF;
127
-
pSMB->req.MaxBufferSize = cpu_to_le16(min_t(u32, CIFSMaxBufSize - 4,
128
-
USHRT_MAX));
127
+
pSMB->req.MaxBufferSize = cpu_to_le16(ses->server->maxBuf);
129
128
pSMB->req.MaxMpxCount = cpu_to_le16(ses->server->maxReq);
130
129
pSMB->req.VcNumber = get_next_vcnum(ses);
131
130