Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
e6a02a7
..
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.
*/
/*
* Use is subject to license terms.
*/
/*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012,
2013,
Intel Corporation.
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-43,9
+43,6
@@
* Author: Di Wang <di.wang@intel.com>
*/
* Author: Di Wang <di.wang@intel.com>
*/
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
#define DEBUG_SUBSYSTEM S_OSD
#include <lustre_ver.h>
#define DEBUG_SUBSYSTEM S_OSD
#include <lustre_ver.h>
@@
-350,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)
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;
}
osd_seq->os_compat_dirs[i] = sdb;
}