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-5885 lfsck: deadlock when remove striped dir
[fs/lustre-release.git]
/
lustre
/
fid
/
fid_request.c
diff --git
a/lustre/fid/fid_request.c
b/lustre/fid/fid_request.c
index
14de931
..
520cc63
100644
(file)
--- a/
lustre/fid/fid_request.c
+++ b/
lustre/fid/fid_request.c
@@
-42,13
+42,8
@@
#define DEBUG_SUBSYSTEM S_FID
#define DEBUG_SUBSYSTEM S_FID
-#ifdef __KERNEL__
-# include <libcfs/libcfs.h>
-# include <linux/module.h>
-#else /* __KERNEL__ */
-# include <liblustre.h>
-#endif
-
+#include <linux/module.h>
+#include <libcfs/libcfs.h>
#include <obd.h>
#include <obd_class.h>
#include <obd_support.h>
#include <obd.h>
#include <obd_class.h>
#include <obd_support.h>
@@
-213,7
+208,7
@@
static int seq_client_alloc_meta(const struct lu_env *env,
/* Allocate new sequence for client. */
static int seq_client_alloc_seq(const struct lu_env *env,
/* Allocate new sequence for client. */
static int seq_client_alloc_seq(const struct lu_env *env,
-
struct lu_client_seq *seq, seqno_t
*seqnr)
+
struct lu_client_seq *seq, u64
*seqnr)
{
int rc;
ENTRY;
{
int rc;
ENTRY;
@@
-276,7
+271,7
@@
static void seq_fid_alloc_fini(struct lu_client_seq *seq)
* Allocate the whole seq to the caller.
**/
int seq_client_get_seq(const struct lu_env *env,
* Allocate the whole seq to the caller.
**/
int seq_client_get_seq(const struct lu_env *env,
- struct lu_client_seq *seq,
seqno_t
*seqnr)
+ struct lu_client_seq *seq,
u64
*seqnr)
{
wait_queue_t link;
int rc;
{
wait_queue_t link;
int rc;
@@
-341,7
+336,7
@@
int seq_client_alloc_fid(const struct lu_env *env,
seq->lcs_fid.f_oid = seq->lcs_width;
while (1) {
seq->lcs_fid.f_oid = seq->lcs_width;
while (1) {
-
seqno_t
seqnr;
+
u64
seqnr;
if (!fid_is_zero(&seq->lcs_fid) &&
fid_oid(&seq->lcs_fid) < seq->lcs_width) {
if (!fid_is_zero(&seq->lcs_fid) &&
fid_oid(&seq->lcs_fid) < seq->lcs_width) {
@@
-575,7
+570,6
@@
int client_fid_fini(struct obd_device *obd)
}
EXPORT_SYMBOL(client_fid_fini);
}
EXPORT_SYMBOL(client_fid_fini);
-#ifdef __KERNEL__
struct proc_dir_entry *seq_type_proc_dir;
static int __init fid_mod_init(void)
struct proc_dir_entry *seq_type_proc_dir;
static int __init fid_mod_init(void)
@@
-610,4
+604,3
@@
MODULE_DESCRIPTION("Lustre FID Module");
MODULE_LICENSE("GPL");
cfs_module(fid, "0.1.0", fid_mod_init, fid_mod_exit);
MODULE_LICENSE("GPL");
cfs_module(fid, "0.1.0", fid_mod_init, fid_mod_exit);
-#endif /* __KERNEL__ */