avoid messages about idr_remove called for id which is not allocated.

Branch HEAD
b=16583
i=zam
i=panda

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 7bf1c3d..f286dd9 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -13,6 +13,13 @@ tbd  Sun Microsystems, Inc.
         removed cwd "./" (refer to Bugzilla 14399).
 
 Severity   : minor
+Bugzilla   : 16583
+Frequency  : rare
+Description: avoid messages about idr_remove called for id  which is not allocated. 
+Details    : Move assigment s_dev for clustered nfs to end of initialization, for avoid
+             problem with error handling.
+
+Severity   : minor
 Bugzilla   : 16109
 Frequency  : rare
 Description: avoid Already found the key in hash [CONN_UNUSED_HASH] messages

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 2fc698c..df6a220 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -459,7 +459,6 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt)
         }
 
         sbi->ll_sdev_orig = sb->s_dev;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
         /* We set sb->s_dev equal on all lustre clients in order to support
          * NFS export clustering.  NFSD requires that the FSID be the same
          * on all clients. */
@@ -469,7 +468,6 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt)
         /* XXX: this will not work with LMV */
         sb->s_dev = get_uuid2int(sbi2mdc(sbi)->cl_target_uuid.uuid,
                                  strlen(sbi2mdc(sbi)->cl_target_uuid.uuid));
-#endif
 
         obd = class_name2obd(dt);
         if (!obd) {