Prepare for Build 33

[fs/lustre-release.git] / lustre / liblustre / lutil.c

diff --git a/lustre/liblustre/lutil.c b/lustre/liblustre/lutil.c
index 1a832bb..ba0fd2f 100644 (file)
--- a/lustre/liblustre/lutil.c
+++ b/lustre/liblustre/lutil.c
@@ -77,14 +77,14 @@ void *inter_module_get(char *arg)
                 return ldlm_namespace_cleanup;
         else if (!strcmp(arg, "ldlm_replay_locks"))
                 return ldlm_replay_locks;
-#ifdef HAVE_QUOTA_SUPPORT
-        else if (!strcmp(arg, "osc_quota_interface"))
-                return &osc_quota_interface;
         else if (!strcmp(arg, "mdc_quota_interface"))
                 return &mdc_quota_interface;
+        else if (!strcmp(arg, "lmv_quota_interface"))
+                return &lmv_quota_interface;
+        else if (!strcmp(arg, "osc_quota_interface"))
+                return &osc_quota_interface;
         else if (!strcmp(arg, "lov_quota_interface"))
                 return &lov_quota_interface;
-#endif
         else
                 return NULL;
 }
@@ -129,6 +129,7 @@ void liblustre_init_random()
                 if (syscall(SYS_read, _rand_dev_fd,
                             &seed, sizeof(seed)) == sizeof(seed)) {
                         ll_srand(seed[0], seed[1]);
+                        syscall(SYS_close, _rand_dev_fd);
                         return;
                 }
                 syscall(SYS_close, _rand_dev_fd);
@@ -228,6 +229,34 @@ int liblustre_init_current(char *comm)
         return 0;
 }
 
+void cfs_cap_raise(cfs_cap_t cap)
+{
+        current->cap_effective |= (1 << cap);
+}
+
+void cfs_cap_lower(cfs_cap_t cap)
+{
+        current->cap_effective &= ~(1 << cap);
+}
+
+int cfs_cap_raised(cfs_cap_t cap)
+{
+        return current->cap_effective & (1 << cap);
+}
+
+cfs_cap_t cfs_curproc_cap_pack(void) {
+        return cfs_current()->cap_effective;
+}
+
+void cfs_curproc_cap_unpack(cfs_cap_t cap) {
+        cfs_current()->cap_effective = cap;
+}
+
+int cfs_capable(cfs_cap_t cap)
+{
+        return cfs_cap_raised(cap);
+}
+
 int init_lib_portals()
 {
         int rc;