land portals part of b_hd_sec on HEAD.

diff --git a/lnet/include/libcfs/libcfs.h b/lnet/include/libcfs/libcfs.h
index dd79d5e..b6f582c 100644 (file)
--- a/lnet/include/libcfs/libcfs.h
+++ b/lnet/include/libcfs/libcfs.h
@@ -66,6 +66,7 @@ extern unsigned int portal_printk;
 #define S_CONFOBD     0x00400000
 #define S_LMV         0x00800000
 #define S_CMOBD       0x01000000
 #define S_CONFOBD     0x00400000
 #define S_LMV         0x00800000
 #define S_CMOBD       0x01000000

+#define S_SEC         0x02000000

 /* If you change these values, please keep these files up to date...
  *    portals/utils/debug.c
  *    utils/lconf
 /* If you change these values, please keep these files up to date...
  *    portals/utils/debug.c
  *    utils/lconf


@@ -99,6 +100,7 @@ extern unsigned int portal_printk;
 #define D_CONFIG      0x01000000
 #define D_CONSOLE     0x02000000
 #define D_QUOTA       0x04000000
 #define D_CONFIG      0x01000000
 #define D_CONSOLE     0x02000000
 #define D_QUOTA       0x04000000

+#define D_SEC         0x08000000

 /* If you change these values, please keep these files up to date...
  *    portals/utils/debug.c
  *    utils/lconf
 /* If you change these values, please keep these files up to date...
  *    portals/utils/debug.c
  *    utils/lconf

diff --git a/lnet/include/libcfs/portals_lib.h b/lnet/include/libcfs/portals_lib.h
index f6b12c2..8be849b 100644 (file)
--- a/lnet/include/libcfs/portals_lib.h
+++ b/lnet/include/libcfs/portals_lib.h
@@ -39,6 +39,11 @@
 #define MAX(a,b) (((a)>(b)) ? (a): (b))
 #define MKSTR(ptr) ((ptr))? (ptr) : ""
 
 #define MAX(a,b) (((a)>(b)) ? (a): (b))
 #define MKSTR(ptr) ((ptr))? (ptr) : ""
 

+static inline int size_round4 (int val)
+{
+        return (val + 3) & (~0x3);
+}
+

 static inline int size_round (int val)
 {
         return (val + 7) & (~0x7);
 static inline int size_round (int val)
 {
         return (val + 7) & (~0x7);

diff --git a/lnet/include/lnet/types.h b/lnet/include/lnet/types.h
index 6b31187..f07534b 100644 (file)
--- a/lnet/include/lnet/types.h
+++ b/lnet/include/lnet/types.h
@@ -14,6 +14,7 @@ typedef ptl_err_t ptl_ni_fail_t;
 typedef __u32 ptl_uid_t;
 typedef __u32 ptl_jid_t;
 typedef __u64 ptl_nid_t;
 typedef __u32 ptl_uid_t;
 typedef __u32 ptl_jid_t;
 typedef __u64 ptl_nid_t;

+typedef __u32 ptl_netid_t;

 typedef __u32 ptl_pid_t;
 typedef __u32 ptl_pt_index_t;
 typedef __u32 ptl_ac_index_t;
 typedef __u32 ptl_pid_t;
 typedef __u32 ptl_pt_index_t;
 typedef __u32 ptl_ac_index_t;

diff --git a/lnet/utils/debug.c b/lnet/utils/debug.c
index 62c43a0..df78d08 100644 (file)
--- a/lnet/utils/debug.c
+++ b/lnet/utils/debug.c
@@ -66,7 +66,7 @@ static const char *portal_debug_subsystems[] =
          "pinger", "filter", "ptlbd", "echo", 
          "ldlm", "lov", "router", "cobd", 
          "sm", "asobd", "confobd", "lmv", 
          "pinger", "filter", "ptlbd", "echo", 
          "ldlm", "lov", "router", "cobd", 
          "sm", "asobd", "confobd", "lmv", 

-         "cmobd", NULL};
+         "cmobd", "sec", NULL};

 static const char *portal_debug_masks[] =
         {"trace", "inode", "super", "ext2", 
          "malloc", "cache", "info", "ioctl",
 static const char *portal_debug_masks[] =
         {"trace", "inode", "super", "ext2", 
          "malloc", "cache", "info", "ioctl",


@@ -74,7 +74,7 @@ static const char *portal_debug_masks[] =
          "other", "dentry", "portals", "page", 
          "dlmtrace", "error", "emerg", "ha", 
          "rpctrace", "vfstrace", "reada", "mmap",
          "other", "dentry", "portals", "page", 
          "dlmtrace", "error", "emerg", "ha", 
          "rpctrace", "vfstrace", "reada", "mmap",

-         "config", "console", "quota", NULL};
+         "config", "console", "quota", "sec", NULL};

 
 struct debug_daemon_cmd {
         char *cmd;
 
 struct debug_daemon_cmd {
         char *cmd;


@@ -665,6 +665,8 @@ static struct mod_paths {
         {"lvfs", "lustre/lvfs"},
         {"obdclass", "lustre/obdclass"},
         {"llog_test", "lustre/obdclass"},
         {"lvfs", "lustre/lvfs"},
         {"obdclass", "lustre/obdclass"},
         {"llog_test", "lustre/obdclass"},

+        {"ptlrpcs", "lustre/sec"},
+        {"ptlrpcs_gss", "lustre/sec/gss"},

         {"ptlrpc", "lustre/ptlrpc"},
         {"obdext2", "lustre/obdext2"},
         {"ost", "lustre/ost"},
         {"ptlrpc", "lustre/ptlrpc"},
         {"obdext2", "lustre/obdext2"},
         {"ost", "lustre/ost"},