From: tappro <tappro>
Date: Wed, 13 Apr 2005 13:02:39 +0000 (+0000)
Subject: b=5881
X-Git-Tag: 1.4.10~1262
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=714e10c59e803e8b472dd51baf84199bc09ec7fa;p=fs%2Flustre-release.git

b=5881

-replace CERROR with CDEBUG()
-check strings before using.
---

diff --git a/lustre/smfs/smfs_lib.c b/lustre/smfs/smfs_lib.c
index cf89a4e..6194a17 100644
--- a/lustre/smfs/smfs_lib.c
+++ b/lustre/smfs/smfs_lib.c
@@ -98,8 +98,10 @@ int smfs_options(char *data, char **devstr, char **namestr,
         }
 
         //save dev & type for further use
-        *devstr = strcpy(ret + strlen(ret) + 1, *devstr);//, strlen(*devstr));
-        *namestr = strcpy(*devstr + strlen(*devstr) + 1, *namestr);//, strlen(*namestr));
+        if (*devstr)
+                *devstr = strcpy(ret + strlen(ret) + 1, *devstr);
+        if (*namestr)
+                *namestr = strcpy(*devstr + strlen(*devstr) + 1, *namestr);
         
         OBD_FREE(temp, strlen(data) + 1);
         
@@ -323,7 +325,7 @@ int smfs_fill_super(struct super_block *sb, void *data, int silent)
                 goto out_err;
         }
 
-        CERROR("mount opts: %s\n", (char *)data);
+        CDEBUG(D_SUPER, "mount opts: %s\n", (char *)data);
 
         smb = smfs_init_smb(sb);
         if (!smb)
@@ -345,7 +347,7 @@ int smfs_fill_super(struct super_block *sb, void *data, int silent)
                 goto out_err;
         }
         
-        CERROR("backfs mount opts: %s\n", opts);
+        CDEBUG(D_SUPER, "backfs mount opts: %s\n", opts);
 
         err = smfs_mount_cache(smb, devstr, typestr, opts);
         if (err) {