patch-2.1.89 linux/fs/coda/psdev.c

Next file: linux/fs/coda/super.c
Previous file: linux/fs/coda/pioctl.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.88/linux/fs/coda/psdev.c linux/fs/coda/psdev.c
@@ -41,7 +41,7 @@
 
 #include <linux/coda.h>
 #include <linux/coda_linux.h>
-#include <linux/coda_cnode.h>
+#include <linux/coda_fs_i.h>
 #include <linux/coda_psdev.h>
 #include <linux/coda_cache.h>
 #include <linux/coda_sysctl.h>
@@ -129,7 +129,7 @@
 	if ( !vcp ) 
 	        return -ENXIO;
 
-	poll_wait(&(vcp->vc_waitq), wait);
+	poll_wait(file, &(vcp->vc_waitq), wait);
 	if (!q_empty(&(vcp->vc_pending)))
                 mask |= POLLIN | POLLRDNORM;
 
@@ -347,7 +347,8 @@
 	   can profit from setting the C_DYING flag on the root 
 	   cnode of Coda filesystems */
         if (coda_super_info[minor].sbi_root) {
-                struct cnode *cnp = ITOC(coda_super_info[minor].sbi_root);
+                struct coda_inode_info *cnp = 
+			ITOC(coda_super_info[minor].sbi_root);
                 cnp->c_flags |= C_DYING;
         } else 
 		vcp->vc_inuse = 0;	

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov