diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-18 07:09:26 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-18 07:09:26 +0000 |
| commit | 589a66af41f445f6030a2aa432ca038ea578d70d (patch) | |
| tree | dff9935a1d9c66a8dd1f42e6ec14bbba06039c3c /sys/arch/amd64 | |
| parent | ea79ce5a66fb430f0635b68bd23274aaaee0de3b (diff) | |
simplify error return case from writedisklabel()
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/disksubr.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/arch/amd64/amd64/disksubr.c b/sys/arch/amd64/amd64/disksubr.c index 7d047a3cafa..bd5ee824c59 100644 --- a/sys/arch/amd64/amd64/disksubr.c +++ b/sys/arch/amd64/amd64/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.51 2007/06/18 05:25:06 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.52 2007/06/18 07:09:25 deraadt Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -128,7 +128,7 @@ int writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *osdep) { - int error, partoff = -1, cyl = 0; + int error = EIO, partoff = -1, cyl = 0; struct disklabel *dlp; struct buf *bp = NULL; @@ -136,10 +136,8 @@ writedisklabel(dev_t dev, void (*strat)(struct buf *), bp = geteblk((int)lp->d_secsize); bp->b_dev = dev; - if (readdoslabel(bp, strat, lp, osdep, &partoff, &cyl, 1) != NULL) { - error = EIO; + if (readdoslabel(bp, strat, lp, osdep, &partoff, &cyl, 1) != NULL) goto done; - } /* Read it in, slap the new label in, and write it back out */ bp->b_blkno = partoff + LABELSECTOR; |