LU-3437 mdd: Fix ACL/def_ACL during object creation.

[fs/lustre-release.git] / lustre / osd-zfs / osd_oi.c

diff --git a/lustre/osd-zfs/osd_oi.c b/lustre/osd-zfs/osd_oi.c
index e059cf7..706b9e4 100644 (file)
--- a/lustre/osd-zfs/osd_oi.c
+++ b/lustre/osd-zfs/osd_oi.c
@@ -28,7 +28,7 @@
  * Use is subject to license terms.
  */
 /*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  * Use is subject to license terms.
  */
 /*
@@ -43,9 +43,6 @@
  * Author: Di Wang <di.wang@intel.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_OSD
 
 #include <lustre_ver.h>
@@ -96,13 +93,11 @@ static const struct named_oid oids[] = {
        { MGS_CONFIGS_OID,              NULL /*MOUNT_CONFIGS_DIR*/ },
        { FID_SEQ_SRV_OID,              "seq_srv" },
        { FID_SEQ_CTL_OID,              "seq_ctl" },
-       { MDD_CAPA_KEYS_OID,            NULL /*CAPA_KEYS*/ },
        { FLD_INDEX_OID,                "fld" },
        { MDD_LOV_OBJ_OID,              LOV_OBJID },
        { OFD_HEALTH_CHECK_OID,         HEALTH_CHECK },
        { ACCT_USER_OID,                "acct_usr_inode" },
        { ACCT_GROUP_OID,               "acct_grp_inode" },
-       { MDD_ORPHAN_OID,               NULL },
        { 0,                            NULL }
 };
 
@@ -352,7 +347,7 @@ static struct osd_seq *osd_find_or_add_seq(const struct lu_env *env,
                sprintf(key, "d%d", i);
                rc = osd_oi_find_or_create(env, osd, odb, key, &sdb);
                if (rc)
-                       GOTO(out, osd_seq = ERR_PTR(rc));
+                       GOTO(out, rc);
                osd_seq->os_compat_dirs[i] = sdb;
        }