b=6143

r=wangdi

changes for smfs support:
1. realdev in prepare() is set to device name, not to 'smfs'. This fixes bug 6143.
2. backdev is not used, instead of it real device name used for --dev parameter in smfs configuration.

diff --git a/lustre/utils/lconf b/lustre/utils/lconf
index 1accff7..e70629f 100755 (executable)
--- a/lustre/utils/lconf
+++ b/lustre/utils/lconf
@@ -1727,7 +1727,7 @@ class CONFDEV(Module):
     def __init__(self, db, name, target_uuid, uuid):
         Module.__init__(self, 'CONFDEV', db)
         self.devpath = self.db.get_val('devpath','')
-        self.backdevpath = self.db.get_val('backdevpath','')
+        self.backdevpath = self.db.get_val('devpath','')
         self.size = self.db.get_val_int('devsize', 0)
         self.journal_size = self.db.get_val_int('journalsize', 0)
         self.fstype = self.db.get_val('fstype', '')
@@ -1871,7 +1871,7 @@ class CONFDEV(Module):
                            self.backdevpath)
 
         if self.fstype == 'smfs':
-            realdev = self.fstype
+            realdev = blkdev
         else:
             realdev = blkdev
                
@@ -2016,7 +2016,7 @@ class MDSDEV(Module):
     def __init__(self,db):
         Module.__init__(self, 'MDSDEV', db)
         self.devpath = self.db.get_val('devpath','')
-        self.backdevpath = self.db.get_val('backdevpath','')
+        self.backdevpath = self.db.get_val('devpath','')
         self.size = self.db.get_val_int('devsize', 0)
         self.journal_size = self.db.get_val_int('journalsize', 0)
         self.fstype = self.db.get_val('fstype', '')
@@ -2205,7 +2205,7 @@ class OSD(Module):
         Module.__init__(self, 'OSD', db)
         self.osdtype = self.db.get_val('osdtype')
         self.devpath = self.db.get_val('devpath', '')
-        self.backdevpath = self.db.get_val('backdevpath', '')
+        self.backdevpath = self.db.get_val('devpath', '')
         self.size = self.db.get_val_int('devsize', 0)
         self.journal_size = self.db.get_val_int('journalsize', 0)
         self.inode_size = self.db.get_val_int('inodesize', 0)