VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / fs / smbfs / proc.c

diff --git a/fs/smbfs/proc.c b/fs/smbfs/proc.c
index 21c9022..8096d74 100644 (file)
--- a/fs/smbfs/proc.c
+++ b/fs/smbfs/proc.c
@@ -56,6 +56,7 @@ static struct smb_ops smb_ops_os2;
 static struct smb_ops smb_ops_win95;
 static struct smb_ops smb_ops_winNT;
 static struct smb_ops smb_ops_unix;
+static struct smb_ops smb_ops_null;
 
 static void
 smb_init_dirent(struct smb_sb_info *server, struct smb_fattr *fattr);
@@ -981,6 +982,9 @@ smb_newconn(struct smb_sb_info *server, struct smb_conn_opt *opt)
        smbiod_wake_up();
        if (server->opt.capabilities & SMB_CAP_UNIX)
                smb_proc_query_cifsunix(server);
+
+       server->conn_complete++;
+       wake_up_interruptible_all(&server->conn_wq);
        return error;
 
 out:
@@ -2305,16 +2309,14 @@ smb_proc_readdir_long(struct file *filp, void *dirent, filldir_t filldir,
         */
        mask = param + 12;
 
-       mask_len = smb_encode_path(server, mask, SMB_MAXPATHLEN+1, dir, &star);
-       if (mask_len < 0) {
-               result = mask_len;
+       result = smb_encode_path(server, mask, SMB_MAXPATHLEN+1, dir, &star);
+       if (result <= 0)
                goto out_free;
-       }
-       mask_len--;     /* mask_len is strlen, not #bytes */
+       mask_len = result - 1;  /* mask_len is strlen, not #bytes */
+       result = 0;
        first = 1;
        VERBOSE("starting mask_len=%d, mask=%s\n", mask_len, mask);
 
-       result = 0;
        entries_seen = 2;
        ff_eos = 0;
 
@@ -2370,7 +2372,7 @@ smb_proc_readdir_long(struct file *filp, void *dirent, filldir_t filldir,
                if (req->rq_rcls != 0) {
                        result = smb_errno(req);
                        PARANOIA("name=%s, result=%d, rcls=%d, err=%d\n",
-                                mask, result, server->rcls, server->err);
+                                mask, result, req->rq_rcls, req->rq_err);
                        break;
                }
 
@@ -2460,8 +2462,6 @@ smb_proc_readdir_long(struct file *filp, void *dirent, filldir_t filldir,
                        /*
                         * Update the mask string for the next message.
                         */
-                       if (mask_len < 0)
-                               mask_len = 0;
                        if (mask_len > 255)
                                mask_len = 255;
                        if (mask_len)
@@ -2526,7 +2526,7 @@ smb_proc_getattr_ff(struct smb_sb_info *server, struct dentry *dentry,
        result = smb_add_request(req);
        if (result < 0)
                goto out_free;
-       if (server->rcls != 0) {
+       if (req->rq_rcls != 0) {
                result = smb_errno(req);
 #ifdef SMBFS_PARANOIA
                if (result != -ENOENT)
@@ -2639,7 +2639,7 @@ smb_proc_getattr_trans2(struct smb_sb_info *server, struct dentry *dir,
        result = smb_add_request(req);
        if (result < 0)
                goto out;
-       if (server->rcls != 0) {
+       if (req->rq_rcls != 0) {
                VERBOSE("for %s: result=%d, rcls=%d, err=%d\n",
                        &param[6], result, req->rq_rcls, req->rq_err);
                result = smb_errno(req);
@@ -2793,11 +2793,46 @@ out:
        return result;
 }
 
+static int
+smb_proc_ops_wait(struct smb_sb_info *server)
+{
+       int result;
+
+       result = wait_event_interruptible_timeout(server->conn_wq,
+                               server->conn_complete, 30*HZ);
+
+       if (!result || signal_pending(current))
+               return -EIO;
+
+       return 0;
+}
+
 static int
 smb_proc_getattr_null(struct smb_sb_info *server, struct dentry *dir,
-                     struct smb_fattr *attr)
+                         struct smb_fattr *fattr)
 {
-       return -EIO;
+       int result;
+
+       if (smb_proc_ops_wait(server) < 0)
+               return -EIO;
+
+       smb_init_dirent(server, fattr);
+       result = server->ops->getattr(server, dir, fattr);
+       smb_finish_dirent(server, fattr);
+
+       return result;
+}
+
+static int
+smb_proc_readdir_null(struct file *filp, void *dirent, filldir_t filldir,
+                     struct smb_cache_control *ctl)
+{
+       struct smb_sb_info *server = server_from_dentry(filp->f_dentry);
+
+       if (smb_proc_ops_wait(server) < 0)
+               return -EIO;
+
+       return server->ops->readdir(filp, dirent, filldir, ctl);
 }
 
 int
@@ -3218,7 +3253,7 @@ smb_proc_read_link(struct smb_sb_info *server, struct dentry *d,
        if (result < 0)
                goto out_free;
        DEBUG1("for %s: result=%d, rcls=%d, err=%d\n",
-               &param[6], result, server->rcls, server->err);
+               &param[6], result, req->rq_rcls, req->rq_err);
 
        /* copy data up to the \0 or buffer length */
        result = len;
@@ -3268,7 +3303,7 @@ smb_proc_symlink(struct smb_sb_info *server, struct dentry *d,
                goto out_free;
 
        DEBUG1("for %s: result=%d, rcls=%d, err=%d\n",
-               &param[6], result, server->rcls, server->err);
+               &param[6], result, req->rq_rcls, req->rq_err);
        result = 0;
 
 out_free:
@@ -3315,7 +3350,7 @@ smb_proc_link(struct smb_sb_info *server, struct dentry *dentry,
                goto out_free;
 
        DEBUG1("for %s: result=%d, rcls=%d, err=%d\n",
-              &param[6], result, server->rcls, server->err);
+              &param[6], result, req->rq_rcls, req->rq_err);
        result = 0;
 
 out_free:
@@ -3431,6 +3466,7 @@ static struct smb_ops smb_ops_unix =
 /* Place holder until real ops are in place */
 static struct smb_ops smb_ops_null =
 {
+       .readdir        = smb_proc_readdir_null,
        .getattr        = smb_proc_getattr_null,
 };