From 34a2b4072f10ddc1282a9e209f8e8204540c9af1 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Thu, 13 Aug 2009 20:37:42 +0200 Subject: [PATCH] Fix files wiped out by merge --- bacula/src/stored/lock.c | 8 ++++---- bacula/src/stored/wait.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bacula/src/stored/lock.c b/bacula/src/stored/lock.c index 40a134b0dc..a1e7aa69b6 100644 --- a/bacula/src/stored/lock.c +++ b/bacula/src/stored/lock.c @@ -332,11 +332,11 @@ const char *DEVICE::print_blocked() const /* * Check if the device is blocked or not */ -bool is_device_unmounted(DEVICE *dev) +bool DEVICE::is_device_unmounted() { bool stat; - int blocked = dev->blocked(); - stat = (blocked == BST_UNMOUNTED) || - (blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP); + int blk = blocked(); + stat = (blk == BST_UNMOUNTED) || + (blk == BST_UNMOUNTED_WAITING_FOR_SYSOP); return stat; } diff --git a/bacula/src/stored/wait.c b/bacula/src/stored/wait.c index 3cdf8e095a..573f97baca 100644 --- a/bacula/src/stored/wait.c +++ b/bacula/src/stored/wait.c @@ -69,7 +69,7 @@ int wait_for_sysop(DCR *dcr) */ volume_unused(dcr); - unmounted = is_device_unmounted(dev); + unmounted = dev->is_device_unmounted(); dev->poll = false; /* * Wait requested time (dev->rem_wait_sec). However, we also wake up every @@ -145,7 +145,7 @@ int wait_for_sysop(DCR *dcr) /* * Check if user unmounted the device while we were waiting */ - unmounted = is_device_unmounted(dev); + unmounted = dev->is_device_unmounted(); if (!unmounted && dev->vol_poll_interval && (total_waited >= dev->vol_poll_interval)) { -- 2.39.5