diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
commit | 3797ba0b62debb71af4606910acacc9896a9ae3b (patch) | |
tree | 414eea76253c7871bfdf3bd9d1817771eb40917c /fs/partitions | |
parent | 2b6c0c580795a4404f72d2a794214dd9e080709d (diff) |
Merge with Linux 2.4.0-test2.
Diffstat (limited to 'fs/partitions')
-rw-r--r-- | fs/partitions/check.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/partitions/check.c b/fs/partitions/check.c index 631323769..b0941569b 100644 --- a/fs/partitions/check.c +++ b/fs/partitions/check.c @@ -312,9 +312,9 @@ static void devfs_register_partition (struct gendisk *dev, int minor, int part) devfs_flags |= DEVFS_FL_REMOVABLE; sprintf (devname, "part%d", part); dev->part[minor + part].de = - devfs_register (dir, devname, 0, devfs_flags, + devfs_register (dir, devname, devfs_flags, dev->major, minor + part, - S_IFBLK | S_IRUSR | S_IWUSR, 0, 0, + S_IFBLK | S_IRUSR | S_IWUSR, dev->fops, NULL); } @@ -350,8 +350,8 @@ static void devfs_register_disc (struct gendisk *dev, int minor) devfs_mk_symlink (devfs_handle, symlink, 0, DEVFS_FL_DEFAULT, dirname + pos, 0, &slave, NULL); dev->part[minor].de = - devfs_register (dir, "disc", 4, devfs_flags, dev->major, minor, - S_IFBLK | S_IRUSR | S_IWUSR, 0, 0, dev->fops,NULL); + devfs_register (dir, "disc", devfs_flags, dev->major, minor, + S_IFBLK | S_IRUSR | S_IWUSR, dev->fops, NULL); devfs_auto_unregister (dev->part[minor].de, slave); if (!dev->de_arr) devfs_auto_unregister (slave, dir); |