cifs: add "mfsymlinks" mount option

[pandora-kernel.git] / fs / cifs / connect.c

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 88c84a3..435b912 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -100,11 +100,13 @@ struct smb_vol {
        bool noautotune:1;
        bool nostrictsync:1; /* do not force expensive SMBflush on every sync */
        bool fsc:1;     /* enable fscache */
+       bool mfsymlinks:1; /* use Minshall+French Symlinks */
        unsigned int rsize;
        unsigned int wsize;
        bool sockopt_tcp_nodelay:1;
        unsigned short int port;
        char *prepath;
+       struct sockaddr_storage srcaddr; /* allow binding to a local IP */
        struct nls_table *local_nls;
 };
 
@@ -1046,6 +1048,22 @@ cifs_parse_mount_options(char *options, const char *devname,
                                                    "long\n");
                                return 1;
                        }
+               } else if (strnicmp(data, "srcaddr", 7) == 0) {
+                       vol->srcaddr.ss_family = AF_UNSPEC;
+
+                       if (!value || !*value) {
+                               printk(KERN_WARNING "CIFS: srcaddr value"
+                                      " not specified.\n");
+                               return 1;       /* needs_arg; */
+                       }
+                       i = cifs_convert_address((struct sockaddr *)&vol->srcaddr,
+                                                value, strlen(value));
+                       if (i < 0) {
+                               printk(KERN_WARNING "CIFS:  Could not parse"
+                                      " srcaddr: %s\n",
+                                      value);
+                               return 1;
+                       }
                } else if (strnicmp(data, "prefixpath", 10) == 0) {
                        if (!value || !*value) {
                                printk(KERN_WARNING
@@ -1325,6 +1343,8 @@ cifs_parse_mount_options(char *options, const char *devname,
                                "/proc/fs/cifs/LookupCacheEnabled to 0\n");
                } else if (strnicmp(data, "fsc", 3) == 0) {
                        vol->fsc = true;
+               } else if (strnicmp(data, "mfsymlinks", 10) == 0) {
+                       vol->mfsymlinks = true;
                } else
                        printk(KERN_WARNING "CIFS: Unknown mount option %s\n",
                                                data);
@@ -1374,8 +1394,36 @@ cifs_parse_mount_options(char *options, const char *devname,
        return 0;
 }
 
+/** Returns true if srcaddr isn't specified and rhs isn't
+ * specified, or if srcaddr is specified and
+ * matches the IP address of the rhs argument.
+ */
 static bool
-match_address(struct TCP_Server_Info *server, struct sockaddr *addr)
+srcip_matches(struct sockaddr *srcaddr, struct sockaddr *rhs)
+{
+       switch (srcaddr->sa_family) {
+       case AF_UNSPEC:
+               return (rhs->sa_family == AF_UNSPEC);
+       case AF_INET: {
+               struct sockaddr_in *saddr4 = (struct sockaddr_in *)srcaddr;
+               struct sockaddr_in *vaddr4 = (struct sockaddr_in *)rhs;
+               return (saddr4->sin_addr.s_addr == vaddr4->sin_addr.s_addr);
+       }
+       case AF_INET6: {
+               struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)srcaddr;
+               struct sockaddr_in6 *vaddr6 = (struct sockaddr_in6 *)&rhs;
+               return ipv6_addr_equal(&saddr6->sin6_addr, &vaddr6->sin6_addr);
+       }
+       default:
+               WARN_ON(1);
+               return false; /* don't expect to be here */
+       }
+}
+
+
+static bool
+match_address(struct TCP_Server_Info *server, struct sockaddr *addr,
+             struct sockaddr *srcaddr)
 {
        struct sockaddr_in *addr4 = (struct sockaddr_in *)addr;
        struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)addr;
@@ -1402,6 +1450,9 @@ match_address(struct TCP_Server_Info *server, struct sockaddr *addr)
                break;
        }
 
+       if (!srcip_matches(srcaddr, (struct sockaddr *)&server->srcaddr))
+               return false;
+
        return true;
 }
 
@@ -1469,7 +1520,8 @@ cifs_find_tcp_session(struct sockaddr *addr, struct smb_vol *vol)
                if (server->tcpStatus == CifsNew)
                        continue;
 
-               if (!match_address(server, addr))
+               if (!match_address(server, addr,
+                                  (struct sockaddr *)&vol->srcaddr))
                        continue;
 
                if (!match_security(server, vol))
@@ -1584,6 +1636,8 @@ cifs_get_tcp_session(struct smb_vol *volume_info)
         * no need to spinlock this init of tcpStatus or srv_count
         */
        tcp_ses->tcpStatus = CifsNew;
+       memcpy(&tcp_ses->srcaddr, &volume_info->srcaddr,
+              sizeof(tcp_ses->srcaddr));
        ++tcp_ses->srv_count;
 
        if (addr.ss_family == AF_INET6) {
@@ -1740,6 +1794,8 @@ cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb_vol *volume_info)
        if (ses == NULL)
                goto get_ses_fail;
 
+       ses->tilen = 0;
+       ses->tiblob = NULL;
        /* new SMB session uses our server ref */
        ses->server = server;
        if (server->addr.sockAddr6.sin6_family == AF_INET6)
@@ -1997,6 +2053,33 @@ static void rfc1002mangle(char *target, char *source, unsigned int length)
 
 }
 
+static int
+bind_socket(struct TCP_Server_Info *server)
+{
+       int rc = 0;
+       if (server->srcaddr.ss_family != AF_UNSPEC) {
+               /* Bind to the specified local IP address */
+               struct socket *socket = server->ssocket;
+               rc = socket->ops->bind(socket,
+                                      (struct sockaddr *) &server->srcaddr,
+                                      sizeof(server->srcaddr));
+               if (rc < 0) {
+                       struct sockaddr_in *saddr4;
+                       struct sockaddr_in6 *saddr6;
+                       saddr4 = (struct sockaddr_in *)&server->srcaddr;
+                       saddr6 = (struct sockaddr_in6 *)&server->srcaddr;
+                       if (saddr6->sin6_family == AF_INET6)
+                               cERROR(1, "cifs: "
+                                      "Failed to bind to: %pI6c, error: %d\n",
+                                      &saddr6->sin6_addr, rc);
+                       else
+                               cERROR(1, "cifs: "
+                                      "Failed to bind to: %pI4, error: %d\n",
+                                      &saddr4->sin_addr.s_addr, rc);
+               }
+       }
+       return rc;
+}
 
 static int
 ipv4_connect(struct TCP_Server_Info *server)
@@ -2022,6 +2105,10 @@ ipv4_connect(struct TCP_Server_Info *server)
                cifs_reclassify_socket4(socket);
        }
 
+       rc = bind_socket(server);
+       if (rc < 0)
+               return rc;
+
        /* user overrode default port */
        if (server->addr.sockAddr.sin_port) {
                rc = socket->ops->connect(socket, (struct sockaddr *)
@@ -2184,6 +2271,10 @@ ipv6_connect(struct TCP_Server_Info *server)
                cifs_reclassify_socket6(socket);
        }
 
+       rc = bind_socket(server);
+       if (rc < 0)
+               return rc;
+
        /* user overrode default port */
        if (server->addr.sockAddr6.sin6_port) {
                rc = socket->ops->connect(socket,
@@ -2466,6 +2557,14 @@ static void setup_cifs_sb(struct smb_vol *pvolume_info,
                cFYI(1, "mounting share using direct i/o");
                cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_DIRECT_IO;
        }
+       if (pvolume_info->mfsymlinks) {
+               if (pvolume_info->sfu_emul) {
+                       cERROR(1,  "mount option mfsymlinks ignored if sfu "
+                                  "mount option is used");
+               } else {
+                       cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_MF_SYMLINKS;
+               }
+       }
 
        if ((pvolume_info->cifs_acl) && (pvolume_info->dynperm))
                cERROR(1, "mount option dynperm ignored if cifsacl "