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-1303 lod: transfer default striping from parent/fs
[fs/lustre-release.git]
/
lustre
/
lmv
/
lmv_fld.c
diff --git
a/lustre/lmv/lmv_fld.c
b/lustre/lmv/lmv_fld.c
index
c2b9757
..
1adcb54
100644
(file)
--- a/
lustre/lmv/lmv_fld.c
+++ b/
lustre/lmv/lmv_fld.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.
*/
/*
@@
-34,9
+32,6
@@
* Lustre is a trademark of Sun Microsystems, Inc.
*/
* Lustre is a trademark of Sun Microsystems, Inc.
*/
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
#define DEBUG_SUBSYSTEM S_LMV
#ifdef __KERNEL__
#include <linux/slab.h>
#define DEBUG_SUBSYSTEM S_LMV
#ifdef __KERNEL__
#include <linux/slab.h>
@@
-50,8
+45,8
@@
#include <liblustre.h>
#endif
#include <liblustre.h>
#endif
-#include <lustre/lustre_idl.h>
#include <obd_support.h>
#include <obd_support.h>
+#include <lustre/lustre_idl.h>
#include <lustre_fid.h>
#include <lustre_lib.h>
#include <lustre_net.h>
#include <lustre_fid.h>
#include <lustre_lib.h>
#include <lustre_net.h>
@@
-68,18
+63,19
@@
int lmv_fld_lookup(struct lmv_obd *lmv,
ENTRY;
LASSERT(fid_is_sane(fid));
ENTRY;
LASSERT(fid_is_sane(fid));
- rc = fld_client_lookup(&lmv->lmv_fld, fid_seq(fid), mds, NULL);
+ rc = fld_client_lookup(&lmv->lmv_fld, fid_seq(fid), mds,
+ LU_SEQ_RANGE_MDT, NULL);
if (rc) {
if (rc) {
- CERROR("Error while looking for mds number. Seq "LP
U
64
+ CERROR("Error while looking for mds number. Seq "LP
X
64
", err = %d\n", fid_seq(fid), rc);
RETURN(rc);
}
", err = %d\n", fid_seq(fid), rc);
RETURN(rc);
}
-
- CDEBUG(D_INODE, "FLD lookup got mds #
"LPU64"
for fid="DFID"\n",
+
+ CDEBUG(D_INODE, "FLD lookup got mds #
%x
for fid="DFID"\n",
*mds, PFID(fid));
if (*mds >= lmv->desc.ld_tgt_count) {
*mds, PFID(fid));
if (*mds >= lmv->desc.ld_tgt_count) {
- CERROR("FLD lookup got invalid mds #
"LPU64" (max: %d
) "
+ CERROR("FLD lookup got invalid mds #
%x (max: %x
) "
"for fid="DFID"\n", *mds, lmv->desc.ld_tgt_count,
PFID(fid));
rc = -EINVAL;
"for fid="DFID"\n", *mds, lmv->desc.ld_tgt_count,
PFID(fid));
rc = -EINVAL;