-/* -*- 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.
* Author: Eric Mei <ericm@clusterfs.com>
*/
-#ifndef EXPORT_SYMTAB
-#define EXPORT_SYMTAB
-#endif
#define DEBUG_SUBSYSTEM S_SEC
#include <libcfs/libcfs.h>
static
struct ptlrpc_sec_policy * sptlrpc_wireflavor2policy(__u32 flavor)
{
- static CFS_DECLARE_MUTEX(load_mutex);
+ static CFS_DEFINE_MUTEX(load_mutex);
static cfs_atomic_t loaded = CFS_ATOMIC_INIT(0);
struct ptlrpc_sec_policy *policy;
__u16 number = SPTLRPC_FLVR_POLICY(flavor);
break;
/* try to load gss module, once */
- cfs_mutex_down(&load_mutex);
+ cfs_mutex_lock(&load_mutex);
if (cfs_atomic_read(&loaded) == 0) {
if (cfs_request_module("ptlrpc_gss") == 0)
CDEBUG(D_SEC,
cfs_atomic_set(&loaded, 1);
}
- cfs_mutex_up(&load_mutex);
+ cfs_mutex_unlock(&load_mutex);
}
return policy;
char *sptlrpc_secflags2str(__u32 flags, char *buf, int bufsize)
{
- buf[0] = '\0';
+ buf[0] = '\0';
- if (flags & PTLRPC_SEC_FL_REVERSE)
- strncat(buf, "reverse,", bufsize);
- if (flags & PTLRPC_SEC_FL_ROOTONLY)
- strncat(buf, "rootonly,", bufsize);
- if (flags & PTLRPC_SEC_FL_UDESC)
- strncat(buf, "udesc,", bufsize);
- if (flags & PTLRPC_SEC_FL_BULK)
- strncat(buf, "bulk,", bufsize);
- if (buf[0] == '\0')
- strncat(buf, "-,", bufsize);
+ if (flags & PTLRPC_SEC_FL_REVERSE)
+ strlcat(buf, "reverse,", bufsize);
+ if (flags & PTLRPC_SEC_FL_ROOTONLY)
+ strlcat(buf, "rootonly,", bufsize);
+ if (flags & PTLRPC_SEC_FL_UDESC)
+ strlcat(buf, "udesc,", bufsize);
+ if (flags & PTLRPC_SEC_FL_BULK)
+ strlcat(buf, "bulk,", bufsize);
+ if (buf[0] == '\0')
+ strlcat(buf, "-,", bufsize);
- buf[bufsize - 1] = '\0';
- return buf;
+ return buf;
}
EXPORT_SYMBOL(sptlrpc_secflags2str);
case OST_READ:
case MDS_READPAGE:
case MGS_CONFIG_READ:
+ case OBD_IDX_READ:
req->rq_bulk_read = 1;
break;
case OST_WRITE:
sptlrpc_flavor2name(&sf, str, sizeof(str)));
}
- cfs_mutex_down(&imp->imp_sec_mutex);
+ cfs_mutex_lock(&imp->imp_sec_mutex);
newsec = sptlrpc_sec_create(imp, svc_ctx, &sf, sp);
if (newsec) {
rc = -EPERM;
}
- cfs_mutex_up(&imp->imp_sec_mutex);
+ cfs_mutex_unlock(&imp->imp_sec_mutex);
out:
sptlrpc_sec_put(sec);
RETURN(rc);
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);
}
EXPORT_SYMBOL(sptlrpc_cli_unwrap_bulk_write);
+#ifdef HAVE_SERVER_SUPPORT
/**
* Performe transformation upon outgoing bulk read.
*/
}
EXPORT_SYMBOL(sptlrpc_svc_prep_bulk);
+#endif /* HAVE_SERVER_SUPPORT */
+
/****************************************
* user descriptor helpers *
****************************************/