d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmcsd(4): properly set BIO error when partition switching fails

Browse Source 
While at it, remove redundant braces and goto in mmcsd_task().

Reported by:	Coverity
CID:		1419639
This commit is contained in:
Marius Strobl 2021-01-22 00:09:09 +01:00
parent 2dcbf0462e
commit 3b433ed765
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/mmc/mmcsd.c
View File

@ -1440,6 +1440,7 @@ mmcsd_task(void *arg)
mmcbus = sc->mmcbus;
while (1) {
bio_error = 0;
MMCSD_DISK_LOCK(part);
do {
if (part->running == 0)
@ -1481,21 +1482,18 @@ mmcsd_task(void *arg)
if (block < part->eend && end > part->eblock)
part->eblock = part->eend = 0;
block = mmcsd_rw(part, bp);
} else if (bp->bio_cmd == BIO_DELETE) {
} else if (bp->bio_cmd == BIO_DELETE)
block = mmcsd_delete(part, bp);
} else {
else
bio_error = EOPNOTSUPP;
goto release;
}
release:
MMCBUS_RELEASE_BUS(mmcbus, dev);
if (block < end) {
bp->bio_error = (bio_error == 0) ? EIO : bio_error;
bp->bio_resid = (end - block) * sz;
bp->bio_flags |= BIO_ERROR;
} else {
} else
bp->bio_resid = 0;
}
biodone(bp);
}
out: