From: Kevin C. <kc...@us...> - 2005-04-05 21:41:13
|
Update of /cvsroot/evms/evms2/engine/plugins/replace In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16408 Modified Files: replace.c Log Message: No need to check for the SOFLAG_NEW flag in rep_can_delete(). This is a left-over from a long time ago when that flag was used for additional purposes. That check also causes problems when trying to cleanup replace objects that are discovered following an interrupted replace operation. Index: replace.c =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/replace/replace.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- replace.c 5 Apr 2005 21:38:45 -0000 1.58 +++ replace.c 5 Apr 2005 21:41:04 -0000 1.59 @@ -117,20 +117,9 @@ LOG_ENTRY(); - if (obj->plugin == my_plugin_record) { - - /* - * Only a new replace object, i.e., one that has not been committed yet, - * can be deleted. - */ - if (!(obj->flags & SOFLAG_NEW)) { - LOG_DEBUG("Replace object %s cannot be deleted because it is in progress.\n", - obj->name); - rc = EINVAL; - } - - } else { + if (obj->plugin != my_plugin_record) { LOG_ERROR("%s is not a replace object. I can't delete it.\n", obj->name); + rc = EINVAL; } LOG_EXIT_INT(rc); |