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-1581 utils: osd_write_ldd() wrapper
[fs/lustre-release.git]
/
lustre
/
mdt
/
mdt_idmap.c
diff --git
a/lustre/mdt/mdt_idmap.c
b/lustre/mdt/mdt_idmap.c
index
2d9e825
..
135151a
100644
(file)
--- a/
lustre/mdt/mdt_idmap.c
+++ b/
lustre/mdt/mdt_idmap.c
@@
-1,6
+1,4
@@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@
-26,7
+24,7
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright
(c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-39,9
+37,6
@@
* Author: Fan Yong <fanyong@clusterfs.com>
*/
* Author: Fan Yong <fanyong@clusterfs.com>
*/
-#ifndef EXPORT_SYMTAB
-#define EXPORT_SYMTAB
-#endif
#define DEBUG_SUBSYSTEM S_MDS
#ifndef AUTOCONF_INCLUDED
#define DEBUG_SUBSYSTEM S_MDS
#ifndef AUTOCONF_INCLUDED
@@
-64,6
+59,7
@@
#include <linux/slab.h>
#include <libcfs/libcfs.h>
#include <linux/slab.h>
#include <libcfs/libcfs.h>
+#include <libcfs/lucache.h>
#include <obd.h>
#include <obd_class.h>
#include <obd_support.h>
#include <obd.h>
#include <obd_class.h>
#include <obd_support.h>
@@
-72,7
+68,6
@@
#include <lustre_dlm.h>
#include <lustre_sec.h>
#include <lustre_lib.h>
#include <lustre_dlm.h>
#include <lustre_sec.h>
#include <lustre_lib.h>
-#include <lustre_ucache.h>
#include "mdt_internal.h"
#include "mdt_internal.h"
@@
-213,10
+208,10
@@
int mdt_init_idmap(struct mdt_thread_info *info)
ENTRY;
if (exp_connect_rmtclient(exp)) {
ENTRY;
if (exp_connect_rmtclient(exp)) {
- cfs_
down(&med->med_idmap_sem
);
+ cfs_
mutex_lock(&med->med_idmap_mutex
);
if (!med->med_idmap)
med->med_idmap = lustre_idmap_init();
if (!med->med_idmap)
med->med_idmap = lustre_idmap_init();
- cfs_
up(&med->med_idmap_sem
);
+ cfs_
mutex_unlock(&med->med_idmap_mutex
);
if (IS_ERR(med->med_idmap)) {
long err = PTR_ERR(med->med_idmap);
if (IS_ERR(med->med_idmap)) {
long err = PTR_ERR(med->med_idmap);
@@
-243,12
+238,12
@@
int mdt_init_idmap(struct mdt_thread_info *info)
void mdt_cleanup_idmap(struct mdt_export_data *med)
{
void mdt_cleanup_idmap(struct mdt_export_data *med)
{
- cfs_
down(&med->med_idmap_sem
);
+ cfs_
mutex_lock(&med->med_idmap_mutex
);
if (med->med_idmap != NULL) {
lustre_idmap_fini(med->med_idmap);
med->med_idmap = NULL;
}
if (med->med_idmap != NULL) {
lustre_idmap_fini(med->med_idmap);
med->med_idmap = NULL;
}
- cfs_
up(&med->med_idmap_sem
);
+ cfs_
mutex_unlock(&med->med_idmap_mutex
);
}
static inline void mdt_revoke_export_locks(struct obd_export *exp)
}
static inline void mdt_revoke_export_locks(struct obd_export *exp)