From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 19 Apr 2007 08:39:23 +0000 (+0000)
Subject: Correct usage of MTIOCLRERR ioctl for clearing persistant errors
X-Git-Tag: Release-7.0.0~6558
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6ec7ba64e03af0381479c04ba4d5b06ab09873a7;p=bacula%2Fbacula

Correct usage of MTIOCLRERR ioctl for clearing persistant errors
     on Solaris.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4570 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/stored/dev.c b/bacula/src/stored/dev.c
index b7e286da2e..445a43e658 100644
--- a/bacula/src/stored/dev.c
+++ b/bacula/src/stored/dev.c
@@ -1810,14 +1810,10 @@ void DEVICE::clrerror(int func)
    /* On some systems such as NetBSD, this clears all errors */
    get_os_tape_file();
 
-/* Found on Linux */
+/* Found on Solaris */
 #ifdef MTIOCLRERR
 {
-   struct mtop mt_com;
-   mt_com.mt_op = MTIOCLRERR;
-   mt_com.mt_count = 1;
-   /* Clear any error condition on the tape */
-   tape_ioctl(m_fd, MTIOCTOP, (char *)&mt_com);
+   tape_ioctl(m_fd, MTIOCLRERR);
    Dmsg0(200, "Did MTIOCLRERR\n");
 }
 #endif
diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index e26acae711..61fec2c702 100644
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,9 @@
               Technical notes on version 2.1
 
 General:
+19Apr07
+kes  Correct usage of MTIOCLRERR ioctl for clearing persistant errors
+     on Solaris.
 18Apr07
 kes  The bgnome-console (gnome-console) and bwx-console (wx-console) are
      deprecated. No additional bugs will be fixed, and they will be dropped