[SSI] openssi/kernel/fs select.c,1.4,1.5

Update of /cvsroot/ssic-linux/openssi/kernel/fs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6063/fs

Modified Files:
        select.c 
Log Message:
Make cluster/ssi/util and fs/select.o build.


Index: select.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/fs/select.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- select.c    20 Oct 2004 03:23:34 -0000      1.4
+++ select.c    28 Oct 2004 23:20:56 -0000      1.5
@@ -249,22 +249,24 @@
 
 int do_select(int n, fd_set_bits *fds, long *timeout)
 {
-       poll_table table, *wait;
+       struct poll_wqueues table;
+       poll_table *wait;
        int retval, tmpret, ucount;
        ssidev_poll_cli_t *pcp;
 
-       read_lock(&current->files->file_lock);
+       spin_lock(&current->files->file_lock);
        retval = max_select_fd(n, fds);
-       read_unlock(&current->files->file_lock);
+       spin_unlock(&current->files->file_lock);
 
        if (retval < 0)
                return retval;
        n = retval;
+
        pcp = ssidev_poll_cli_alloc(0, ssidev_select_return);
        if (pcp == NULL)
                return -ENOMEM;
        poll_initwait(&table);
-       wait = &table;
+       wait = &table.pt;
        if (!*timeout)
                wait = NULL;
        retval = 0;
@@ -287,12 +289,12 @@
                }
                if (retval < 0 || ucount > 0 || *timeout == 0)
                        break;
-               if (wait->error < 0) {
-                       retval = wait->error;
+               if (table.error < 0) {
+                       retval = table.error;
                        break;
                }
-               poll_freewait(wait);
-               poll_initwait(wait);
+               poll_freewait(&table);
+               poll_initwait(&table);
        }
        ssidev_poll_cli_free(pcp);
        poll_freewait(&table);
@@ -513,12 +515,16 @@
        return ret;
 }
 
+#ifndef CONFIG_SSI
+
 struct poll_list {
        struct poll_list *next;
        int len;
        struct pollfd entries[0];
 };
 
+#endif
+
 #define POLLFD_PER_PAGE  ((PAGE_SIZE-sizeof(struct poll_list)) / sizeof(struct 
pollfd))
 
 #ifdef CONFIG_SSI



-------------------------------------------------------
This Newsletter Sponsored by: Macrovision 
For reliable Linux application installations, use the industry's leading
setup authoring tool, InstallShield X. Learn more and evaluate 
today. http://clk.atdmt.com/MSI/go/ins0030000001msi/direct/01/