[SSI] openssi/kernel/include/cluster/ssi ssidev.h,1.8,1.9

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

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


Index: ssidev.h
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/include/cluster/ssi/ssidev.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ssidev.h    21 Oct 2004 23:40:51 -0000      1.8
+++ ssidev.h    28 Oct 2004 23:20:57 -0000      1.9
@@ -131,8 +131,8 @@
 extern ssize_t ssidev_write(struct rmtfb_cli *, char *, size_t, loff_t *);
 extern int ssidev_ioctl(struct rmtfb_cli *, unsigned int, unsigned long);
 extern int ssidev_do_select(int, fd_set_bits *, long *);
-extern int ssidev_do_poll(unsigned int, unsigned int, unsigned int,
-                         struct pollfd *[], poll_table *, long);
+extern int ssidev_do_poll(unsigned int, struct poll_list *,
+                         struct poll_wqueues *, long);
 extern int ssidev_do_poll_getf(ics_chunk_t *);
 extern int ssidev_do_poll_node(ics_chunk_t *, unsigned int, poll_table *);
 extern int ssidev_do_poll_nodes(ssidev_poll_cli_t *, poll_table *, long *);
@@ -159,8 +159,7 @@
 extern int ssidev_file_is_remote(struct file *);
 extern long ssidev_fcntl(u_int, u_int, u_long, struct rmtfb_cli *);
 extern int ssidev_fasync(int, struct rmtfb_cli *, int);
-extern int ssidev_get_inode_server(struct inode *inode, struct file *file,
-                                  clusternode_t *server);
+extern int ssidev_get_inode_server(struct inode *inode, clusternode_t *server);
 extern int ssipty_is_local(int);
 extern int ssipty_get_pty(int *, int);
 extern int ssipty_put_pty(int);
@@ -235,11 +234,12 @@
        int major = MAJOR(linuxdev);
        int minor = MINOR(linuxdev);
 
-       /* 121 is a hack for GFS. */
        SSI_ASSERT(S_ISBLK(mode) || S_ISCHR(mode));
        return ((major == UNNAMED_MAJOR && minor >= 1
-                && minor <= UNNAMED_HACK_LEN) ||
+                && minor <= UNNAMED_HACK_LEN));
+       /* SSI_XXX: 121 was a hack for GFS.
                (S_ISBLK(mode) && major == 121));
+       */
 }
 
 #else



-------------------------------------------------------
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/