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-1347 style: removes obsolete EXPORT_SYMTAB macros v2
[fs/lustre-release.git]
/
lustre
/
osd-zfs
/
osd_handler.c
diff --git
a/lustre/osd-zfs/osd_handler.c
b/lustre/osd-zfs/osd_handler.c
index
22928c4
..
9944e78
100644
(file)
--- a/
lustre/osd-zfs/osd_handler.c
+++ b/
lustre/osd-zfs/osd_handler.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.
*
*/
@@
-44,9
+44,6
@@
* Author: Johann Lombardi <johann@whamcloud.com>
*/
* Author: Johann Lombardi <johann@whamcloud.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>
@@
-57,6
+54,7
@@
#include <obd_class.h>
#include <lustre_disk.h>
#include <lustre_fid.h>
#include <obd_class.h>
#include <lustre_disk.h>
#include <lustre_fid.h>
+#include <md_object.h>
#include "osd_internal.h"
#include "osd_internal.h"
@@
-78,7
+76,7
@@
struct lu_context_key osd_key;
static char *root_tag = "osd_mount, rootdb";
/* Slab for OSD object allocation */
static char *root_tag = "osd_mount, rootdb";
/* Slab for OSD object allocation */
-
cfs_mem_cache_t
*osd_object_kmem;
+
struct kmem_cache
*osd_object_kmem;
static struct lu_kmem_descr osd_caches[] = {
{
static struct lu_kmem_descr osd_caches[] = {
{
@@
-319,7
+317,7
@@
int osd_statfs(const struct lu_env *env, struct dt_device *d,
ENTRY;
rc = udmu_objset_statfs(&osd->od_objset, osfs);
ENTRY;
rc = udmu_objset_statfs(&osd->od_objset, osfs);
- if (
rc
)
+ if (
unlikely(rc)
)
RETURN(rc);
osfs->os_bavail -= min_t(obd_size,
OSD_GRANT_FOR_LOCAL_OIDS / osfs->os_bsize,
RETURN(rc);
osfs->os_bavail -= min_t(obd_size,
OSD_GRANT_FOR_LOCAL_OIDS / osfs->os_bsize,
@@
-832,15
+830,6
@@
static int osd_prepare(const struct lu_env *env, struct lu_device *pdev,
int rc = 0;
ENTRY;
int rc = 0;
ENTRY;
- if (dev->ld_site && lu_device_is_md(dev->ld_site->ls_top_dev)) {
- /* MDT/MDD still use old infrastructure to create
- * special files */
- rc = llo_local_objects_setup(env, lu2md_dev(pdev),
- lu2dt_dev(dev));
- if (rc)
- RETURN(rc);
- }
-
if (osd->od_quota_slave != NULL)
/* set up quota slave objects */
rc = qsd_prepare(env, osd->od_quota_slave);
if (osd->od_quota_slave != NULL)
/* set up quota slave objects */
rc = qsd_prepare(env, osd->od_quota_slave);