/[base]/head/sys/boot/zfs/zfs.c
ViewVC logotype

Diff of /head/sys/boot/zfs/zfs.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 198419 by ps, Thu Dec 11 16:48:35 2008 UTC revision 198420 by rnoland, Fri Oct 23 18:44:53 2009 UTC
# Line 100  zfs_open(const char *upath, struct open_ Line 100  zfs_open(const char *upath, struct open_
100          f->f_fsdata = (void *)fp;          f->f_fsdata = (void *)fp;
101    
102          if (spa->spa_root_objset.os_type != DMU_OST_ZFS) {          if (spa->spa_root_objset.os_type != DMU_OST_ZFS) {
103                  printf("Unexpected object set type %lld\n",                  printf("Unexpected object set type %llu\n",
104                      spa->spa_root_objset.os_type);                      spa->spa_root_objset.os_type);
105                  rc = EIO;                  rc = EIO;
106                  goto out;                  goto out;
# Line 413  zfs_dev_init(void) Line 413  zfs_dev_init(void)
413                  if (vdev_probe(vdev_read, (void*) (uintptr_t) fd, 0))                  if (vdev_probe(vdev_read, (void*) (uintptr_t) fd, 0))
414                          close(fd);                          close(fd);
415    
416                  for (slice = 1; slice <= 4; slice++) {                  for (slice = 1; slice <= 128; slice++) {
417                          sprintf(devname, "disk%dp%d:", unit, slice);                          sprintf(devname, "disk%dp%d:", unit, slice);
418                          fd = open(devname, O_RDONLY);                          fd = open(devname, O_RDONLY);
419                          if (fd == -1) {                          if (fd == -1) {
Legend:
Removed from v.198419  
changed lines
  Added in v.198420
  ViewVC Help
Powered by ViewVC 1.1.27