Merge commit 'linus/master' into bkl/core

[karo-tx-linux.git] / fs / cifs / connect.c

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index d91a6085d55c6f4294006256564386bfa93635c0..95c2ea67edfb8f240d286885caddd51031aa82fc 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -846,9 +846,6 @@ cifs_parse_mount_options(char *options, const char *devname,
        /* default to using server inode numbers where available */
        vol->server_ino = 1;
 
-       /* XXX: default to fsc for testing until mount.cifs pieces are done */
-       vol->fsc = 1;
-
        if (!options)
                return 1;
 
@@ -1264,6 +1261,12 @@ cifs_parse_mount_options(char *options, const char *devname,
                } else if ((strnicmp(data, "nocase", 6) == 0) ||
                           (strnicmp(data, "ignorecase", 10)  == 0)) {
                        vol->nocase = 1;
+               } else if (strnicmp(data, "mand", 4) == 0) {
+                       /* ignore */
+               } else if (strnicmp(data, "nomand", 6) == 0) {
+                       /* ignore */
+               } else if (strnicmp(data, "_netdev", 7) == 0) {
+                       /* ignore */
                } else if (strnicmp(data, "brl", 3) == 0) {
                        vol->nobrl =  0;
                } else if ((strnicmp(data, "nobrl", 5) == 0) ||
@@ -1540,6 +1543,7 @@ cifs_get_tcp_session(struct smb_vol *volume_info)
        if (volume_info->UNCip && volume_info->UNC) {
                rc = cifs_fill_sockaddr((struct sockaddr *)&addr,
                                        volume_info->UNCip,
+                                       strlen(volume_info->UNCip),
                                        volume_info->port);
                if (!rc) {
                        /* we failed translating address */