diff options
author | NeilBrown <neilb@suse.com> | 2018-05-21 14:35:12 +1000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-25 18:29:10 +0200 |
commit | 18f92a6e3d6bd00941ddfb5837835348f72d39dc (patch) | |
tree | 5b8d2921d3e2a2e135e03825365dadbddc0434f1 /drivers/staging/lustre/include | |
parent | f497115d4cf8a430c5d9902ce35716ba5f9c21ef (diff) | |
download | op-kernel-dev-18f92a6e3d6bd00941ddfb5837835348f72d39dc.zip op-kernel-dev-18f92a6e3d6bd00941ddfb5837835348f72d39dc.tar.gz |
staging: lustre: discard cfs_cap_t, use kernel_cap_t
lustre only sends 32bits of capabilities in on-the-wire RPC calls.
It current strips off higher bits and uses a 32bit cfs_cap_t
throughout.
Though there is a small memory cost, it is cleaner to use
kernel_cap_t throughout and only truncate when marshalling
data for RPC calls.
So this patch replaces cfs_cap_t with kernel_cap_t throughout,
and where a cfs_cap_t was previous stored in a __u32, we now
store cap.cap[0] instead.
With this, we can remove include/linux/libcfs/curproc.h
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/include')
-rw-r--r-- | drivers/staging/lustre/include/linux/libcfs/curproc.h | 69 | ||||
-rw-r--r-- | drivers/staging/lustre/include/linux/libcfs/libcfs.h | 1 |
2 files changed, 0 insertions, 70 deletions
diff --git a/drivers/staging/lustre/include/linux/libcfs/curproc.h b/drivers/staging/lustre/include/linux/libcfs/curproc.h deleted file mode 100644 index fc6f6eb..0000000 --- a/drivers/staging/lustre/include/linux/libcfs/curproc.h +++ /dev/null @@ -1,69 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see - * http://www.gnu.org/licenses/gpl-2.0.html - * - * GPL HEADER END - */ -/* - * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - * - * Copyright (c) 2011, 2012, Intel Corporation. - */ -/* - * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. - * - * libcfs/include/libcfs/curproc.h - * - * Lustre curproc API declaration - * - * Author: Nikita Danilov <nikita@clusterfs.com> - */ - -#ifndef __LIBCFS_CURPROC_H__ -#define __LIBCFS_CURPROC_H__ - -/* - * Plus, platform-specific constant - * - * and opaque scalar type - * - * kernel_cap_t - */ - -typedef u32 cfs_cap_t; - -static inline cfs_cap_t cfs_curproc_cap_pack(void) -{ - /* cfs_cap_t is only the first word of kernel_cap_t */ - return (cfs_cap_t)(current_cap().cap[0]); -} - -/* __LIBCFS_CURPROC_H__ */ -#endif -/* - * Local variables: - * c-indentation-style: "K&R" - * c-basic-offset: 8 - * tab-width: 8 - * fill-column: 80 - * scroll-step: 1 - * End: - */ diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/libcfs.h index 4c91ef4..7259544 100644 --- a/drivers/staging/lustre/include/linux/libcfs/libcfs.h +++ b/drivers/staging/lustre/include/linux/libcfs/libcfs.h @@ -86,7 +86,6 @@ #include <linux/libcfs/libcfs_string.h> #include <linux/libcfs/libcfs_hash.h> #include <linux/libcfs/libcfs_fail.h> -#include <linux/libcfs/curproc.h> #define LIBCFS_VERSION "0.7.0" |