[CIFS] DFS build fixes

Also includes a few minor changes suggested by Christoph

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 8 insertions, 4 deletions

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index db3746c891b5..65d0ba72e78f 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1,7 +1,7 @@
 /*
  *   fs/cifs/connect.c
  *
- *   Copyright (C) International Business Machines  Corp., 2002,2007
+ *   Copyright (C) International Business Machines  Corp., 2002,2008
  *   Author(s): Steve French (sfrench@us.ibm.com)
  *
  *   This library is free software; you can redistribute it and/or modify
@@ -1410,7 +1410,7 @@ connect_to_dfs_path(int xid, struct cifsSesInfo *pSesInfo,
                     const char *old_path, const struct nls_table *nls_codepage,
                     int remap)
 {
-        unsigned char *referrals = NULL;
+        struct dfs_info3_param *referrals = NULL;
         unsigned int num_referrals;
         int rc = 0;
 
@@ -1429,12 +1429,14 @@ connect_to_dfs_path(int xid, struct cifsSesInfo *pSesInfo,
 int
 get_dfs_path(int xid, struct cifsSesInfo *pSesInfo, const char *old_path,
              const struct nls_table *nls_codepage, unsigned int *pnum_referrals,
-             unsigned char **preferrals, int remap)
+             struct dfs_info3_param **preferrals, int remap)
 {
         char *temp_unc;
         int rc = 0;
+        unsigned char *targetUNCs;
 
         *pnum_referrals = 0;
+        *preferrals = NULL;
 
         if (pSesInfo->ipc_tid == 0) {
                 temp_unc = kmalloc(2 /* for slashes */ +
@@ -1454,8 +1456,10 @@ get_dfs_path(int xid, struct cifsSesInfo *pSesInfo, const char *old_path,
                 kfree(temp_unc);
         }
         if (rc == 0)
-                rc = CIFSGetDFSRefer(xid, pSesInfo, old_path, preferrals,
+                rc = CIFSGetDFSRefer(xid, pSesInfo, old_path, &targetUNCs,
                                      pnum_referrals, nls_codepage, remap);
+        /* BB map targetUNCs to dfs_info3 structures, here or
+                in CIFSGetDFSRefer BB */
 
         return rc;
 }