Changeset 55f8c6e7 in mainline for uspace/srv/volsrv
- Timestamp:
- 2015-10-29T17:10:30Z (10 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- dc2d582
- Parents:
- 03661d19
- Location:
- uspace/srv/volsrv
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/volsrv/mkfs.c
r03661d19 r55f8c6e7 59 59 va_end(ap); 60 60 61 log_msg(LOG_DEFAULT, LVL_NOTE, "Calling task_spawn()");62 63 61 va_start(ap, path); 64 62 task_id_t id; … … 66 64 int rc = task_spawn(&id, &wait, path, cnt, ap); 67 65 va_end(ap); 68 69 log_msg(LOG_DEFAULT, LVL_NOTE, "task_spawn() -> rc = %d", rc);70 66 71 67 if (rc != EOK) { … … 75 71 } 76 72 77 log_msg(LOG_DEFAULT, LVL_NOTE, "task_spawn() -> id = %d", (int)id);78 79 73 if (!id) { 80 74 log_msg(LOG_DEFAULT, LVL_ERROR, "Error spawning %s " … … 83 77 } 84 78 85 log_msg(LOG_DEFAULT, LVL_NOTE, "call task_wait()");86 87 79 task_exit_t texit; 88 80 int retval; 89 81 rc = task_wait(&wait, &texit, &retval); 90 log_msg(LOG_DEFAULT, LVL_NOTE, "task_wait() -> rc = %d", rc);91 82 if (rc != EOK) { 92 83 log_msg(LOG_DEFAULT, LVL_ERROR, "Error waiting for %s (%s)", … … 95 86 } 96 87 97 log_msg(LOG_DEFAULT, LVL_NOTE, "task_wait() -> texit = %d", (int)texit);98 88 if (texit != TASK_EXIT_NORMAL) { 99 89 log_msg(LOG_DEFAULT, LVL_ERROR, "Command %s unexpectedly " … … 102 92 } 103 93 104 log_msg(LOG_DEFAULT, LVL_NOTE, "task_wait() -> retval = %d", (int)retval);105 94 if (retval != 0) { 106 95 log_msg(LOG_DEFAULT, LVL_ERROR, "Command %s returned non-zero " … … 141 130 return rc; 142 131 143 log_msg(LOG_DEFAULT, LVL_NOTE, "volsrv_part_mkfs: Run '%s %s'.",144 cmd, svc_name);145 146 132 rc = cmd_runl(cmd, cmd, svc_name, NULL); 147 133 free(svc_name); -
uspace/srv/volsrv/part.c
r03661d19 r55f8c6e7 141 141 return EEXIST; 142 142 143 log_msg(LOG_DEFAULT, LVL_ NOTE, "vol_part_add()");143 log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_add_locked()"); 144 144 part = vol_part_new(); 145 145 if (part == NULL) … … 154 154 } 155 155 156 log_msg(LOG_DEFAULT, LVL_ NOTE, "Probe partition %s", part->svc_name);156 log_msg(LOG_DEFAULT, LVL_DEBUG, "Probe partition %s", part->svc_name); 157 157 rc = volsrv_part_is_empty(sid, &empty); 158 158 if (rc != EOK) { … … 255 255 int rc; 256 256 257 log_msg(LOG_DEFAULT, LVL_ NOTE, "vol_part_empty_part()");257 log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_empty_part()"); 258 258 259 259 rc = volsrv_part_empty(part->svc_id); 260 260 if (rc != EOK) { 261 log_msg(LOG_DEFAULT, LVL_ NOTE, "vol_part_empty_part() - failed %d",261 log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_empty_part() - failed %d", 262 262 rc); 263 263 return rc; 264 264 } 265 265 266 log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_empty_part() - success");267 266 part->pcnt = vpc_empty; 268 267 return EOK; … … 273 272 int rc; 274 273 275 log_msg(LOG_DEFAULT, LVL_ NOTE, "vol_part_mkfs_part()");274 log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_mkfs_part()"); 276 275 277 276 rc = volsrv_part_mkfs(part->svc_id, fstype); 278 277 if (rc != EOK) { 279 log_msg(LOG_DEFAULT, LVL_ NOTE, "vol_part_mkfs_part() - failed %d",278 log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_mkfs_part() - failed %d", 280 279 rc); 281 280 return rc; 282 281 } 283 282 284 log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_mkfs_part() - success");285 283 part->pcnt = vpc_fs; 286 284 part->fstype = fstype; -
uspace/srv/volsrv/volsrv.c
r03661d19 r55f8c6e7 141 141 142 142 sid = IPC_GET_ARG1(*icall); 143 log_msg(LOG_DEFAULT, LVL_ NOTE, "vol_part_info_srv(%zu)",143 log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_info_srv(%zu)", 144 144 sid); 145 145 rc = vol_part_find_by_id(sid, &part); 146 146 if (rc != EOK) { 147 147 async_answer_0(iid, ENOENT); 148 log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_info_srv(%zu) - "149 "not found", sid);150 148 return; 151 149 } … … 154 152 if (rc != EOK) { 155 153 async_answer_0(iid, EIO); 156 log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_info_srv(%zu) - "157 "get info failed (%d)", sid, rc);158 154 return; 159 155 } … … 164 160 async_answer_0(callid, EREFUSED); 165 161 async_answer_0(iid, EREFUSED); 166 log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_info_srv(%zu) - "167 "read receive failed", sid);168 162 return; 169 163 } … … 172 166 async_answer_0(callid, EINVAL); 173 167 async_answer_0(iid, EINVAL); 174 log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_info_srv(%zu) - "175 "incorrect size", sid);176 168 return; 177 169 } … … 182 174 async_answer_0(callid, rc); 183 175 async_answer_0(iid, rc); 184 log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_info_srv(%zu) - " 185 "data read failed", sid); 186 return; 187 } 188 189 log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_info_srv(%zu) - " 190 "success", sid); 176 return; 177 } 178 191 179 async_answer_0(iid, EOK); 192 180 } … … 199 187 200 188 sid = IPC_GET_ARG1(*icall); 201 log_msg(LOG_DEFAULT, LVL_ NOTE, "vol_part_empty_srv(%zu)", sid);189 log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_empty_srv(%zu)", sid); 202 190 203 191 rc = vol_part_find_by_id(sid, &part); 204 192 if (rc != EOK) { 205 log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_empty_srv(%zu) - "206 "partition not found", sid);207 193 async_answer_0(iid, ENOENT); 208 194 return; 209 195 } 210 196 211 log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_empty_srv(%zu) - "212 "call vol_part_empty_part()", sid);213 197 rc = vol_part_empty_part(part); 214 198 if (rc != EOK) { … … 230 214 fstype = IPC_GET_ARG2(*icall); 231 215 232 log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_mkfs_srv(%zu, %d)", sid,233 fstype);234 235 216 rc = vol_part_find_by_id(sid, &part); 236 217 if (rc != EOK) { 237 log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_mkfs_srv(%zu) - "238 "partition not found", sid);239 218 async_answer_0(iid, ENOENT); 240 219 return; 241 220 } 242 221 243 log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_mkfs_srv(%zu) - "244 "call vol_part_mkfs_part()", sid);245 222 rc = vol_part_mkfs_part(part, fstype); 246 223 if (rc != EOK) {
Note:
See TracChangeset
for help on using the changeset viewer.
