diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
| commit | 8624512aa908741ba2795200133eae0d7f4557ea (patch) | |
| tree | d5d3036fccf2604f4c98dedc11e8adb929d6b52e /fs/devfs | |
| parent | 7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff) | |
Merge with 2.3.48.
Diffstat (limited to 'fs/devfs')
| -rw-r--r-- | fs/devfs/base.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/fs/devfs/base.c b/fs/devfs/base.c index ed9e04d69..ad50e21b9 100644 --- a/fs/devfs/base.c +++ b/fs/devfs/base.c @@ -729,7 +729,6 @@ static struct devfs_entry *search_for_entry_in_dir (struct devfs_entry *parent, 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 @@ static int get_removable_partition (struct devfs_entry *dir, const char *name, /* 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 @@ static void devfs_read_inode (struct inode *inode) 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 @@ static void devfs_read_inode (struct inode *inode) 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 @@ static struct super_operations devfs_sops = { 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 dentry *devfs_follow_link (struct dentry *dentry, 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, |