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: introduce lod device
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
sec.c
diff --git
a/lustre/ptlrpc/sec.c
b/lustre/ptlrpc/sec.c
index
bfcd1ec
..
315e99a
100644
(file)
--- a/
lustre/ptlrpc/sec.c
+++ b/
lustre/ptlrpc/sec.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.
@@
-40,9
+38,6
@@
* Author: Eric Mei <ericm@clusterfs.com>
*/
* Author: Eric Mei <ericm@clusterfs.com>
*/
-#ifndef EXPORT_SYMTAB
-#define EXPORT_SYMTAB
-#endif
#define DEBUG_SUBSYSTEM S_SEC
#include <libcfs/libcfs.h>
#define DEBUG_SUBSYSTEM S_SEC
#include <libcfs/libcfs.h>
@@
-827,6
+822,7
@@
void sptlrpc_req_set_flavor(struct ptlrpc_request *req, int opcode)
case OST_READ:
case MDS_READPAGE:
case MGS_CONFIG_READ:
case OST_READ:
case MDS_READPAGE:
case MGS_CONFIG_READ:
+ case OBD_IDX_READ:
req->rq_bulk_read = 1;
break;
case OST_WRITE:
req->rq_bulk_read = 1;
break;
case OST_WRITE:
@@
-2113,7
+2109,7
@@
int sptlrpc_svc_alloc_rs(struct ptlrpc_request *req, int msglen)
rc = policy->sp_sops->alloc_rs(req, msglen);
if (unlikely(rc == -ENOMEM)) {
/* failed alloc, try emergency pool */
rc = policy->sp_sops->alloc_rs(req, msglen);
if (unlikely(rc == -ENOMEM)) {
/* failed alloc, try emergency pool */
-
rs = lustre_get_emerg_rs(req->rq_rqbd->rqbd_service
);
+
rs = lustre_get_emerg_rs(req->rq_rqbd->rqbd_svcpt
);
if (rs == NULL)
RETURN(-ENOMEM);
if (rs == NULL)
RETURN(-ENOMEM);