Author: mdf
Date: Thu Oct 14 23:26:08 2010
New Revision: 213882
URL: http://svn.freebsd.org/changeset/base/213882
Log:
Fixes to mps_user_command():
- fix the leak of command struct on error
- simplify the cleanup logic
- EINPROGRESS is not a fatal error
- buggy comment and error message
Reviewed by: ken
Modified:
head/sys/dev/mps/mps_user.c
Modified: head/sys/dev/mps/mps_user.c
==============================================================================
--- head/sys/dev/mps/mps_user.c Thu Oct 14 22:45:14 2010 (r213881)
+++ head/sys/dev/mps/mps_user.c Thu Oct 14 23:26:08 2010 (r213882)
@@ -579,7 +579,7 @@ mps_user_command(struct mps_softc *sc, s
MPI2_REQUEST_HEADER *hdr;
MPI2_DEFAULT_REPLY *rpl;
void *buf = NULL;
- struct mps_command *cm;
+ struct mps_command *cm = NULL;
int err = 0;
int sz;
@@ -631,11 +631,12 @@ mps_user_command(struct mps_softc *sc, s
mps_lock(sc);
err = mps_map_command(sc, cm);
- if (err != 0) {
- mps_printf(sc, "mps_user_command: request timed out\n");
+ if (err != 0 && err != EINPROGRESS) {
+ mps_printf(sc, "%s: invalid request: error %d\n",
+ __func__, err);
goto Ret;
}
- msleep(cm, &sc->mps_mtx, 0, "mpsuser", 0); /* 30 seconds */
+ msleep(cm, &sc->mps_mtx, 0, "mpsuser", 0);
rpl = (MPI2_DEFAULT_REPLY *)cm->cm_reply;
sz = rpl->MsgLength * 4;
@@ -652,22 +653,14 @@ mps_user_command(struct mps_softc *sc, s
copyout(rpl, cmd->rpl, sz);
if (buf != NULL)
copyout(buf, cmd->buf, cmd->len);
- mps_lock(sc);
-
mps_dprint(sc, MPS_INFO, "mps_user_command: reply size %d\n", sz );
- mps_free_command(sc, cm);
-Ret:
- mps_unlock(sc);
- if (buf != NULL)
- free(buf, M_MPSUSER);
- return (err);
-
RetFreeUnlocked:
mps_lock(sc);
- mps_free_command(sc, cm);
+ if (cm != NULL)
+ mps_free_command(sc, cm);
+Ret:
mps_unlock(sc);
-
if (buf != NULL)
free(buf, M_MPSUSER);
return (err);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
