Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

2009-07-07 15:07:39 -07:00 · 2009-07-07 15:07:39 -07:00 · 53970c3123
parent 4731673919 23e01e6cde
commit 53970c3123
1 changed files with 0 additions and 4 deletions
--- a/lib/libzfs/libzfs_pool.c
+++ b/lib/libzfs/libzfs_pool.c
@ -59,10 +59,6 @@ static int read_efi_label(nvlist_t *config, diskaddr_t *sb);
 #define	BOOTCMD	"installboot(1M)"
 #endif

-#define	DISK_ROOT	"/dev/dsk"
-#define	RDISK_ROOT	"/dev/rdsk"
-#define	BACKUP_SLICE	"s2"
-
 /*
 * ====================================================================
 *   zpool property functions