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-5170 utils: Add support for --list-commands option
[fs/lustre-release.git]
/
lustre
/
fld
/
fld_handler.c
diff --git
a/lustre/fld/fld_handler.c
b/lustre/fld/fld_handler.c
index
0e80de8
..
3750704
100644
(file)
--- a/
lustre/fld/fld_handler.c
+++ b/
lustre/fld/fld_handler.c
@@
-15,11
+15,7
@@
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
*
* GPL HEADER END
*/
@@
-27,7
+23,7
@@
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 201
3
, Intel Corporation.
+ * Copyright (c) 2011, 201
5
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-256,12
+252,12
@@
int fld_server_lookup(const struct lu_env *env, struct lu_server_fld *fld,
if (index == 0 && rc == LDD_F_SV_TYPE_MDT) {
/* On server side, all entries should be in cache.
* If we can not find it in cache, just return error */
if (index == 0 && rc == LDD_F_SV_TYPE_MDT) {
/* On server side, all entries should be in cache.
* If we can not find it in cache, just return error */
- CERROR("%s: Cannot find sequence
"LPX64"
: rc = %d\n",
+ CERROR("%s: Cannot find sequence
%#llx
: rc = %d\n",
fld->lsf_name, seq, -ENOENT);
RETURN(-ENOENT);
} else {
if (fld->lsf_control_exp == NULL) {
fld->lsf_name, seq, -ENOENT);
RETURN(-ENOENT);
} else {
if (fld->lsf_control_exp == NULL) {
- CERROR("%s: lookup
"LPX64"
, but not connects to MDT0"
+ CERROR("%s: lookup
%#llx
, but not connects to MDT0"
"yet: rc = %d.\n", fld->lsf_name, seq, -EIO);
RETURN(-EIO);
}
"yet: rc = %d.\n", fld->lsf_name, seq, -EIO);
RETURN(-EIO);
}
@@
-334,7
+330,7
@@
static int fld_handle_read(struct tgt_session_info *tsi)
RETURN(err_serious(-EPROTO));
req_capsule_set_size(tsi->tsi_pill, &RMF_GENERIC_DATA, RCL_SERVER,
RETURN(err_serious(-EPROTO));
req_capsule_set_size(tsi->tsi_pill, &RMF_GENERIC_DATA, RCL_SERVER,
- PAGE_
CACHE_
SIZE);
+ PAGE_SIZE);
rc = req_capsule_server_pack(tsi->tsi_pill);
if (unlikely(rc != 0))
rc = req_capsule_server_pack(tsi->tsi_pill);
if (unlikely(rc != 0))
@@
-343,7
+339,7
@@
static int fld_handle_read(struct tgt_session_info *tsi)
data = req_capsule_server_get(tsi->tsi_pill, &RMF_GENERIC_DATA);
rc = fld_server_read(tsi->tsi_env, lu_site2seq(site)->ss_server_fld,
data = req_capsule_server_get(tsi->tsi_pill, &RMF_GENERIC_DATA);
rc = fld_server_read(tsi->tsi_env, lu_site2seq(site)->ss_server_fld,
- in, data, PAGE_
CACHE_
SIZE);
+ in, data, PAGE_SIZE);
RETURN(rc);
}
RETURN(rc);
}
@@
-392,19
+388,17
@@
int fid_is_local(const struct lu_env *env,
}
return result;
}
}
return result;
}
-EXPORT_SYMBOL(fid_is_local);
static void fld_server_proc_fini(struct lu_server_fld *fld);
static void fld_server_proc_fini(struct lu_server_fld *fld);
-#ifdef
LPROC
FS
+#ifdef
CONFIG_PROC_
FS
static int fld_server_proc_init(struct lu_server_fld *fld)
{
int rc = 0;
ENTRY;
static int fld_server_proc_init(struct lu_server_fld *fld)
{
int rc = 0;
ENTRY;
- fld->lsf_proc_dir = lprocfs_seq_register(fld->lsf_name,
- fld_type_proc_dir,
- fld_server_proc_list, fld);
+ fld->lsf_proc_dir = lprocfs_register(fld->lsf_name, fld_type_proc_dir,
+ fld_server_proc_list, fld);
if (IS_ERR(fld->lsf_proc_dir)) {
rc = PTR_ERR(fld->lsf_proc_dir);
RETURN(rc);
if (IS_ERR(fld->lsf_proc_dir)) {
rc = PTR_ERR(fld->lsf_proc_dir);
RETURN(rc);
@@
-474,7
+468,9
@@
int fld_server_init(const struct lu_env *env, struct lu_server_fld *fld,
GOTO(out_index, rc);
fld->lsf_control_exp = NULL;
GOTO(out_index, rc);
fld->lsf_control_exp = NULL;
+ fld->lsf_seq_lookup = fld_server_lookup;
+ fld->lsf_seq_lookup = fld_server_lookup;
RETURN(0);
out_index:
fld_index_fini(env, fld);
RETURN(0);
out_index:
fld_index_fini(env, fld);