From 0f8ce07719c0adb2699513d19102660252c2b9e4 Mon Sep 17 00:00:00 2001 From: shadow Date: Mon, 18 Aug 2008 15:53:00 +0000 Subject: [PATCH] void messages about idr_remove called for id which is not allocated. Branch b1_8_gate b=16583 i=zam i=panda --- lustre/llite/llite_lib.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index e54f64f..a9328fd 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -372,14 +372,6 @@ static int client_common_fill_super(struct super_block *sb, if (data->ocd_connect_flags & OBD_CONNECT_JOIN) sbi->ll_flags |= LL_SBI_JOIN; - sbi->ll_sdev_orig = sb->s_dev; - /* 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. */ - /* s_dev is also used in lt_compare() to compare two fs, but that is - * only a node-local comparison. */ - sb->s_dev = get_uuid2int(sbi2mdc(sbi)->cl_target_uuid.uuid, - strlen(sbi2mdc(sbi)->cl_target_uuid.uuid)); obd = class_name2obd(osc); if (!obd) { CERROR("OSC %s: not setup or attached\n", osc); @@ -541,6 +533,16 @@ static int client_common_fill_super(struct super_block *sb, if (data != NULL) OBD_FREE(data, sizeof(*data)); sb->s_root->d_op = &ll_d_root_ops; + + sbi->ll_sdev_orig = sb->s_dev; + /* 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. */ + /* s_dev is also used in lt_compare() to compare two fs, but that is + * only a node-local comparison. */ + sb->s_dev = get_uuid2int(sbi2mdc(sbi)->cl_target_uuid.uuid, + strlen(sbi2mdc(sbi)->cl_target_uuid.uuid)); + RETURN(err); out_root: -- 1.8.3.1