CVS: is/fs25 vfs.c,1.2,1.3

Update of /cvsroot/intermezzo/is/fs25
In directory usw-pr-cvs1:/tmp/cvs-serv30330

Modified Files:
	vfs.c 
Log Message:
* ignore is_read_only() for now
* kdev_t fixes


Index: vfs.c
===================================================================
RCS file: /cvsroot/intermezzo/is/fs25/vfs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- vfs.c	11 Oct 2002 23:28:57 -0000	1.2
+++ vfs.c	11 Oct 2002 23:38:48 -0000	1.3
@@ -44,5 +44,4 @@
  *  Copyright (C) 1991, 1992  Linus Torvalds
  */
-
 /*
  * Some corrections by tytso.
@@ -184,10 +183,10 @@
         int minor = presto_f2m(fset);
         int errorval = izo_channels[minor].uc_errorval;
-        kdev_t dev = fset->fset_dentry->d_inode->i_dev;
+        kdev_t dev = to_kdev_t(fset->fset_dentry->d_inode->i_dev);
 
         if (errorval && errorval == (long)value && !is_read_only(dev)) {
                 CDEBUG(D_SUPER, "setting device %s read only\n", kdevname(dev));
                 BLKDEV_FAIL(dev, 1);
-                izo_channels[minor].uc_errorval = -dev;
+                izo_channels[minor].uc_errorval = -kdev_val(dev);
         }
 }
@@ -290,5 +289,5 @@
 {
         rb->rb_mode = (__u32)inode->i_mode;
-        rb->rb_rdev = (__u32)inode->i_rdev;
+        rb->rb_rdev = (__u32)kdev_t_to_nr(inode->i_rdev);
         rb->rb_uid  = (__u64)inode->i_uid;
         rb->rb_gid  = (__u64)inode->i_gid;



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf