LU-13581 build: xarray and lockdep_is_held const clash

[fs/lustre-release.git] / libcfs / include / libcfs / curproc.h

diff --git a/libcfs/include/libcfs/curproc.h b/libcfs/include/libcfs/curproc.h
index d1bda93..cf2be32 100644 (file)
--- a/libcfs/include/libcfs/curproc.h
+++ b/libcfs/include/libcfs/curproc.h
@@ -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
- * 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
  */
@@ -55,19 +51,16 @@ typedef __u32 cfs_cap_t;
 #define CFS_CAP_SYS_BOOT               23
 #define CFS_CAP_SYS_RESOURCE           24
 
-#define CFS_CAP_FS_MASK ((1 << CFS_CAP_CHOWN) |                 \
-                         (1 << CFS_CAP_DAC_OVERRIDE) |          \
-                         (1 << CFS_CAP_DAC_READ_SEARCH) |       \
-                         (1 << CFS_CAP_FOWNER) |                \
-                         (1 << CFS_CAP_FSETID ) |               \
-                         (1 << CFS_CAP_LINUX_IMMUTABLE) |       \
-                         (1 << CFS_CAP_SYS_ADMIN) |             \
-                         (1 << CFS_CAP_SYS_BOOT) |              \
-                         (1 << CFS_CAP_SYS_RESOURCE))
+#define CFS_CAP_FS_MASK        (BIT(CFS_CAP_CHOWN)             |       \
+                        BIT(CFS_CAP_DAC_OVERRIDE)      |       \
+                        BIT(CFS_CAP_DAC_READ_SEARCH)   |       \
+                        BIT(CFS_CAP_FOWNER)            |       \
+                        BIT(CFS_CAP_FSETID )           |       \
+                        BIT(CFS_CAP_LINUX_IMMUTABLE)   |       \
+                        BIT(CFS_CAP_SYS_ADMIN)         |       \
+                        BIT(CFS_CAP_SYS_BOOT)          |       \
+                        BIT(CFS_CAP_SYS_RESOURCE))
 
-void cfs_cap_raise(cfs_cap_t cap);
-void cfs_cap_lower(cfs_cap_t cap);
-int cfs_cap_raised(cfs_cap_t cap);
 cfs_cap_t cfs_curproc_cap_pack(void);
 void cfs_curproc_cap_unpack(cfs_cap_t cap);
 int cfs_capable(cfs_cap_t cap);