- landing b_fid.

[fs/lustre-release.git] / lustre / utils / obd.c

diff --git a/lustre/utils/obd.c b/lustre/utils/obd.c
index 765793b..3313169 100644 (file)
--- a/lustre/utils/obd.c
+++ b/lustre/utils/obd.c
@@ -2308,7 +2308,6 @@ int jt_llog_cancel(int argc, char **argv)
         return rc;
 
 }
-
 int jt_llog_check(int argc, char **argv)
 {
         struct obd_ioctl_data data;
@@ -2376,7 +2375,6 @@ int jt_llog_remove(int argc, char **argv)
 
         return rc;
 }
-
 int jt_obd_reint_sync(int argc, char **argv)
 {
         struct obd_ioctl_data data;
@@ -2388,9 +2386,10 @@ int jt_obd_reint_sync(int argc, char **argv)
         IOC_PACK(argv[0], data);
         rc = l_ioctl(OBD_DEV_ID, OBD_IOC_CMOBD_SYNC, buf);
        
-        if (rc)
-                fprintf(stderr, "OBD_IOC_CMOBD_SYNC failed: rc=%d\n",
-                        rc);
+        if (rc) {
+                fprintf(stderr, "OBD_IOC_CMOBD_SYNC failed: %s\n",
+                        strerror(errno));
+        }
         return rc;  
                
 }
@@ -2406,13 +2405,13 @@ int jt_obd_cache_on(int argc, char **argv)
         IOC_PACK(argv[0], data);
         rc = l_ioctl(OBD_DEV_ID, OBD_IOC_COBD_CON, buf);
        
-        if (rc)
-                fprintf(stderr, "OBD_IOC_CMOBD_SYNC failed: rc=%d\n",
-                        rc);
+        if (rc) {
+                fprintf(stderr, "OBD_IOC_COBD_CON failed: %s\n",
+                        strerror(errno));
+        }
         return rc;  
                
 }
-
 int jt_obd_cache_off(int argc, char **argv)
 {
         struct obd_ioctl_data data;
@@ -2423,18 +2422,14 @@ int jt_obd_cache_off(int argc, char **argv)
                return CMD_HELP; 
         IOC_PACK(argv[0], data);
         rc = l_ioctl(OBD_DEV_ID, OBD_IOC_COBD_COFF, buf);
-        if (rc)
-                fprintf(stderr, "OBD_IOC_CMOBD_SYNC failed: rc=%d\n",
-                        rc);
+        if (rc) {
+                fprintf(stderr, "OBD_IOC_COBD_COFF failed: %s\n",
+                        strerror(errno));
+        }
         return rc;  
 }
-
 int jt_obd_snap_add(int argc, char **argv)
 {
-#if 1
-        return -1;
-#else
-# error "FIX the missing #defines before committing"        
         struct obd_ioctl_data data;
         int rc = 0;
       
@@ -2456,20 +2451,21 @@ int jt_obd_snap_add(int argc, char **argv)
         rc = l_ioctl(SMFS_DEV_ID, OBD_IOC_SMFS_SNAP_ADD, buf);
         
         unregister_ioc_dev(SMFS_DEV_ID);       
+        if (rc) {
+                fprintf(stderr, "OBD_IOC_SNAP_ADD failed: rc=%s\n", 
+                        strerror(errno));
+        }
  
-        if (rc)
-                fprintf(stderr, "OBD_IOC_SNAP_ADD failed: rc=%d\n", rc);
         return rc;
-#endif
 }
-
 static void signal_server(int sig)
 {
         if (sig == SIGINT) {
                 do_disconnect("sigint", 1);
                 exit(1);
         } else
-                fprintf(stderr, "%s: got signal %d\n", jt_cmdname("sigint"), sig);
+                fprintf(stderr, "%s: got signal %d\n", 
+                        jt_cmdname("sigint"), sig);
 }
 
 int obd_initialize(int argc, char **argv)