LU-12101 socklnd: fix infinite loop in ksocknal_push()

[fs/lustre-release.git] / lustre / include / lustre_sec.h

diff --git a/lustre/include/lustre_sec.h b/lustre/include/lustre_sec.h
index bad065e..b7bd9e6 100644 (file)
--- a/lustre/include/lustre_sec.h
+++ b/lustre/include/lustre_sec.h
@@ -23,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2016, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -869,6 +869,17 @@ struct ptlrpc_sec {
         /** owning import */
         struct obd_import              *ps_import;
        spinlock_t                      ps_lock;
+       /** mtime of SELinux policy file */
+       time_t                          ps_sepol_mtime;
+       /** next check time of SELinux policy file */
+       ktime_t                         ps_sepol_checknext;
+       /**
+        * SELinux policy info
+        * sepol string format is:
+        * <mode>:<policy name>:<policy version>:<policy hash>
+        */
+       char                            ps_sepol[LUSTRE_NODEMAP_SEPOL_LENGTH
+                                                + 1];
 
        /*
         * garbage collection
@@ -954,12 +965,7 @@ struct ptlrpc_bulk_sec_desc {
         __u8            bsd_data[0];    /* policy-specific token */
 };
 
-
-/*
- * lprocfs
- */
-struct proc_dir_entry;
-extern struct proc_dir_entry *sptlrpc_proc_root;
+extern struct dentry *sptlrpc_debugfs_dir;
 
 /*
  * round size up to next power of 2, for slab allocation.
@@ -1092,6 +1098,7 @@ int  sptlrpc_cli_unwrap_early_reply(struct ptlrpc_request *req,
 void sptlrpc_cli_finish_early_reply(struct ptlrpc_request *early_req);
 
 void sptlrpc_request_out_callback(struct ptlrpc_request *req);
+int sptlrpc_get_sepol(struct ptlrpc_request *req);
 
 /*
  * exported higher interface of import & request
@@ -1193,10 +1200,6 @@ int sptlrpc_current_user_desc_size(void);
 int sptlrpc_pack_user_desc(struct lustre_msg *msg, int offset);
 int sptlrpc_unpack_user_desc(struct lustre_msg *req, int offset, int swabbed);
 
-
-#define CFS_CAP_CHOWN_MASK (1 << CFS_CAP_CHOWN)
-#define CFS_CAP_SYS_RESOURCE_MASK (1 << CFS_CAP_SYS_RESOURCE)
-
 /** @} sptlrpc */
 
 #endif /* _LUSTRE_SEC_H_ */