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-4423 gss: Fix typo in sec_gss.c
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
sec_bulk.c
diff --git
a/lustre/ptlrpc/sec_bulk.c
b/lustre/ptlrpc/sec_bulk.c
index
504353b
..
bb1e782
100644
(file)
--- a/
lustre/ptlrpc/sec_bulk.c
+++ b/
lustre/ptlrpc/sec_bulk.c
@@
-136,14
+136,13
@@
static struct shrinker *pools_shrinker;
/*
* /proc/fs/lustre/sptlrpc/encrypt_page_pools
*/
/*
* /proc/fs/lustre/sptlrpc/encrypt_page_pools
*/
-int sptlrpc_proc_read_enc_pool(char *page, char **start, off_t off, int count,
- int *eof, void *data)
+int sptlrpc_proc_enc_pool_seq_show(struct seq_file *m, void *v)
{
int rc;
spin_lock(&page_pools.epp_lock);
{
int rc;
spin_lock(&page_pools.epp_lock);
-
rc = snprintf(page, count
,
+
rc = seq_printf(m
,
"physical pages: %lu\n"
"pages per pool: %lu\n"
"max pages: %lu\n"
"physical pages: %lu\n"
"pages per pool: %lu\n"
"max pages: %lu\n"
@@
-221,7
+220,7
@@
static void enc_pools_release_free_pages(long npages)
p_idx++;
g_idx = 0;
}
p_idx++;
g_idx = 0;
}
- };
+ }
/* free unused pools */
while (p_idx_max1 < p_idx_max2) {
/* free unused pools */
while (p_idx_max1 < p_idx_max2) {
@@
-420,8
+419,8
@@
static int enc_pools_add_pages(int npages)
goto out_pools;
for (j = 0; j < PAGES_PER_POOL && alloced < npages; j++) {
goto out_pools;
for (j = 0; j < PAGES_PER_POOL && alloced < npages; j++) {
- pools[i][j] = alloc_page(
__GFP_IO
|
-
__GFP_HIGHMEM);
+ pools[i][j] = alloc_page(
GFP_NOFS
|
+ __GFP_HIGHMEM);
if (pools[i][j] == NULL)
goto out_pools;
if (pools[i][j] == NULL)
goto out_pools;
@@
-449,7
+448,7
@@
out:
static inline void enc_pools_wakeup(void)
{
static inline void enc_pools_wakeup(void)
{
-
LASSERT(spin_is_locked(&page_pools.epp_lock)
);
+
assert_spin_locked(&page_pools.epp_lock
);
if (unlikely(page_pools.epp_waitqlen)) {
LASSERT(waitqueue_active(&page_pools.epp_waitq));
if (unlikely(page_pools.epp_waitqlen)) {
LASSERT(waitqueue_active(&page_pools.epp_waitq));