patch-2.3.48 linux/fs/devfs/base.c

• Lines: 68
• Date: Sat Feb 26 20:33:42 2000
• Orig file: v2.3.47/linux/fs/devfs/base.c
• Orig date: Wed Feb 16 17:03:52 2000

diff -u --recursive --new-file v2.3.47/linux/fs/devfs/base.c linux/fs/devfs/base.c
@@ -729,7 +729,6 @@
     return search_for_entry (parent,
 			     curr->u.symlink.linkname, curr->u.symlink.length,
 			     FALSE, FALSE, NULL, TRUE);
-    return curr;
 }   /*  End Function search_for_entry_in_dir  */
 
 static struct devfs_entry *create_entry (struct devfs_entry *parent,
@@ -2185,6 +2184,7 @@
 /*  Superblock operations follow  */
 
 extern struct inode_operations devfs_iops;
+static struct file_operations devfs_fops;
 
 static void devfs_read_inode (struct inode *inode)
 {
@@ -2206,6 +2206,7 @@
     inode->i_blocks = 0;
     inode->i_blksize = 1024;
     inode->i_op = &devfs_iops;
+    inode->i_fop = &devfs_fops;
     inode->i_rdev = NODEV;
     if ( S_ISCHR (di->mode) )
 	inode->i_rdev = MKDEV (di->de->u.fcb.u.device.major,
@@ -2219,7 +2220,7 @@
 	else printk ("%s: read_inode(%d): no block device from bdget()\n",
 		     DEVFS_NAME, (int) inode->i_ino);
     }
-    else if ( S_ISFIFO (di->mode) ) inode->i_op = &fifo_inode_operations;
+    else if ( S_ISFIFO (di->mode) ) inode->i_fop = &def_fifo_fops;
     else if ( S_ISREG (di->mode) ) inode->i_size = di->de->u.fcb.u.file.size;
     inode->i_mode = di->mode;
     inode->i_uid = di->uid;
@@ -2322,7 +2323,6 @@
 { 
     read_inode:    devfs_read_inode,
     write_inode:   devfs_write_inode,
-    notify_change: devfs_notify_change,
     put_super:     devfs_put_super,
     statfs:        devfs_statfs,
 };
@@ -3126,16 +3126,16 @@
 
 static struct inode_operations devfs_iops =
 {
-    default_file_ops: &devfs_fops,
-    lookup:           devfs_lookup,
-    link:             devfs_link,
-    unlink:           devfs_unlink,
-    symlink:          devfs_symlink,
-    mkdir:            devfs_mkdir,
-    rmdir:            devfs_rmdir,
-    mknod:            devfs_mknod,
-    readlink:         devfs_readlink,
-    follow_link:      devfs_follow_link,
+	lookup:		devfs_lookup,
+	link:		devfs_link,
+	unlink:		devfs_unlink,
+	symlink:	devfs_symlink,
+	mkdir:		devfs_mkdir,
+	rmdir:		devfs_rmdir,
+	mknod:		devfs_mknod,
+	readlink:	devfs_readlink,
+	follow_link:	devfs_follow_link,
+	setattr:	devfs_notify_change,
 };
 
 static struct super_block *devfs_read_super (struct super_block *sb,