diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-05-31 14:08:44 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-05-31 14:18:39 -0700 |
| commit | e5b5ce0c14e8028911dea0dc37f8558cf2a3280f (patch) | |
| tree | b1acfa63748c4131434d1ead8a71559dd6a506b2 /src/property/disk.lisp | |
| parent | eafc7f5367698872e79918c225a605ff2e320520 (diff) | |
| download | consfigurator-e5b5ce0c14e8028911dea0dc37f8558cf2a3280f.tar.gz | |
don't try to create, or queue for closure, already opened volumes
This better controls the side effects of the changed functions.
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/property/disk.lisp')
| -rw-r--r-- | src/property/disk.lisp | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/src/property/disk.lisp b/src/property/disk.lisp index b6d306e..436116f 100644 --- a/src/property/disk.lisp +++ b/src/property/disk.lisp @@ -201,9 +201,6 @@ Return values, if any, should be ignored.") (defmethod open-volume ((volume opened-volume) file) (copy-volume-and-contents volume)) -(defmethod create-volume ((volume opened-volume) file) - (values)) - (defgeneric make-opened-volume (volume device-file) (:documentation "Where there is a class which is a subclass of both the class of VOLUME and @@ -632,8 +629,13 @@ single attempt will be made to close all volumes opened up to that point." (multiple-value-bind (opened opened-contents) (open-volume volume file) (setq opened-volumes - (append opened-contents - (cons opened opened-volumes))) + (append + opened-contents + ;; Don't queue for closure volumes which were + ;; already open before we began. + (if (subtypep (class-of volume) 'opened-volume) + opened-volumes + (cons opened opened-volumes)))) (dolist (opened-volume (or opened-contents `(,opened))) (when (slot-boundp opened-volume 'volume-contents) (open-volume-and-contents @@ -720,13 +722,22 @@ argument, recursively create each of VOLUMES and any contents thereof. **THIS FUNCTION UNCONDITIONALLY FORMATS DISKS, POTENTIALLY DESTROYING DATA.**" (let (opened-volumes) (labels - ((create-volume-and-contents (volume file) - (create-volume volume file) + ((create-volume-and-contents + (volume file + &aux + (already-opened (subtypep (class-of volume) 'opened-volume))) + (unless already-opened + (create-volume volume file)) (when (slot-boundp volume 'volume-contents) (multiple-value-bind (opened opened-contents) (open-volume volume file) (setq opened-volumes - (append opened-contents (cons opened opened-volumes))) + (append opened-contents + ;; Don't queue for closure volumes which were + ;; already open before we began. + (if already-opened + opened-volumes + (cons opened opened-volumes)))) (if opened-contents (dolist (opened-volume opened-contents) (when (slot-boundp opened-volume 'volume-contents) |