Author: adrian.chadd
Date: Fri Jul 10 05:19:58 2009
New Revision: 14179
Modified:
playpen/LUSCA_HEAD_storework/src/fs/aufs/store_rebuild_aufs.c
Log:
* Remove the extra ipcClose() calls - just do it all in the rebuild complete
code.
* Handle the COMPLETED, VERSION and PROGRESS swap log ops.
Modified: playpen/LUSCA_HEAD_storework/src/fs/aufs/store_rebuild_aufs.c
==============================================================================
--- playpen/LUSCA_HEAD_storework/src/fs/aufs/store_rebuild_aufs.c
(original)
+++ playpen/LUSCA_HEAD_storework/src/fs/aufs/store_rebuild_aufs.c Fri Jul
10 05:19:58 2009
@@ -273,8 +273,6 @@
if (r <= 0) {
/* Error or EOF */
debug(47, 1) ("storeAufsRebuildHelperRead: %s: read returned
%d;
error/eof?\n", sd->path, r);
- ipcClose(rb->helper.pid, rb->helper.r_fd, rb->helper.w_fd);
- rb->helper.pid = rb->helper.r_fd = rb->helper.w_fd = -1;
storeAufsDirRebuildComplete(rb);
return;
}
@@ -285,10 +283,16 @@
while (i + sizeof(storeSwapLogData) < rb->rbuf.used) {
memcpy(&s, rb->rbuf.buf + i, sizeof(storeSwapLogData));
switch (s.op) {
+ case SWAP_LOG_VERSION:
+ break;
case SWAP_LOG_PROGRESS:
storeRebuildProgress(rb->sd->index,
((storeSwapLogProgress *)(&s))->total,
((storeSwapLogProgress
*)(&s))->progress);
break;
+ case SWAP_LOG_COMPLETED:
+ debug(47, 1) (" %s: completed rebuild\n",
sd->path);
+ storeAufsDirRebuildComplete(rb);
+ return;
default:
rb->n_read++;
storeAufsDirRebuildFromSwapLogObject(rb, s);
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"lusca-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/lusca-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
