X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Flinux%2Flinux-prim.c;h=0940c80f29c94c8f6e2ada7991fb52ec43348455;hb=d7249d9d70ac0fcfa665ece78634b495bc9a22cd;hp=4d10dcb89bd3e8c502ed3d2b8383793450e73922;hpb=07ff616a18cc602460724e6693e142782cad0fcc;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/linux/linux-prim.c b/libcfs/libcfs/linux/linux-prim.c
index 4d10dcb..0940c80 100644
--- a/libcfs/libcfs/linux/linux-prim.c
+++ b/libcfs/libcfs/linux/linux-prim.c
@@ -31,54 +31,23 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LNET
+
+#include <linux/kallsyms.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/fs_struct.h>
+#include <linux/fs.h>
 #include <linux/sched.h>
-
-#include <libcfs/libcfs.h>
+#ifdef HAVE_SCHED_HEADERS
+#include <linux/sched/mm.h>
+#endif
+#include <linux/uaccess.h>
 
 #if defined(CONFIG_KGDB)
 #include <asm/kgdb.h>
 #endif
 
-void cfs_init_timer(struct timer_list *t)
-{
-	init_timer(t);
-}
-EXPORT_SYMBOL(cfs_init_timer);
-
-void cfs_timer_init(struct timer_list *t, cfs_timer_func_t *func, void *arg)
-{
-	init_timer(t);
-	t->function = func;
-	t->data = (unsigned long)arg;
-}
-EXPORT_SYMBOL(cfs_timer_init);
-
-void cfs_timer_arm(struct timer_list *t, cfs_time_t deadline)
-{
-	mod_timer(t, deadline);
-}
-EXPORT_SYMBOL(cfs_timer_arm);
-
-void cfs_timer_disarm(struct timer_list *t)
-{
-	del_timer(t);
-}
-EXPORT_SYMBOL(cfs_timer_disarm);
-
-int  cfs_timer_is_armed(struct timer_list *t)
-{
-	return timer_pending(t);
-}
-EXPORT_SYMBOL(cfs_timer_is_armed);
-
-cfs_time_t cfs_timer_deadline(struct timer_list *t)
-{
-	return t->expires;
-}
-EXPORT_SYMBOL(cfs_timer_deadline);
+#include <libcfs/linux/linux-time.h>
+#include <libcfs/linux/linux-wait.h>
 
 #ifndef HAVE_KTIME_GET_TS64
 void ktime_get_ts64(struct timespec64 *ts)
@@ -134,69 +103,100 @@ time64_t ktime_get_seconds(void)
 EXPORT_SYMBOL(ktime_get_seconds);
 #endif /* HAVE_KTIME_GET_SECONDS */
 
-sigset_t
-cfs_block_allsigs(void)
+static int (*cfs_apply_workqueue_attrs_t)(struct workqueue_struct *wq,
+					  const struct workqueue_attrs *attrs);
+
+int cfs_apply_workqueue_attrs(struct workqueue_struct *wq,
+			      const struct workqueue_attrs *attrs)
 {
-	unsigned long	flags;
-	sigset_t	old;
-
-	spin_lock_irqsave(&current->sighand->siglock, flags);
-	old = current->blocked;
-	sigfillset(&current->blocked);
-	recalc_sigpending();
-	spin_unlock_irqrestore(&current->sighand->siglock, flags);
-	return old;
+	if (cfs_apply_workqueue_attrs_t)
+		return cfs_apply_workqueue_attrs_t(wq, attrs);
+	return 0;
+}
+EXPORT_SYMBOL_GPL(cfs_apply_workqueue_attrs);
+
+#ifndef HAVE_XARRAY_SUPPORT
+struct kmem_cache (*radix_tree_node_cachep);
+#endif
+
+void __init cfs_arch_init(void)
+{
+#ifndef HAVE_WAIT_VAR_EVENT
+	wait_bit_init();
+#endif
+	cfs_apply_workqueue_attrs_t =
+		(void *)kallsyms_lookup_name("apply_workqueue_attrs");
+#ifndef HAVE_XARRAY_SUPPORT
+	radix_tree_node_cachep =
+		(void *)kallsyms_lookup_name("radix_tree_node_cachep");
+#endif
 }
-EXPORT_SYMBOL(cfs_block_allsigs);
 
-sigset_t cfs_block_sigs(unsigned long sigs)
+int cfs_kernel_write(struct file *filp, const void *buf, size_t count,
+		     loff_t *pos)
 {
-	unsigned long  flags;
-	sigset_t	old;
-
-	spin_lock_irqsave(&current->sighand->siglock, flags);
-	old = current->blocked;
-	sigaddsetmask(&current->blocked, sigs);
-	recalc_sigpending();
-	spin_unlock_irqrestore(&current->sighand->siglock, flags);
-	return old;
+#ifdef HAVE_NEW_KERNEL_WRITE
+	return kernel_write(filp, buf, count, pos);
+#else
+	mm_segment_t __old_fs = get_fs();
+	int rc;
+
+	set_fs(KERNEL_DS);
+	rc = vfs_write(filp, (__force const char __user *)buf, count, pos);
+	set_fs(__old_fs);
+
+	return rc;
+#endif
 }
-EXPORT_SYMBOL(cfs_block_sigs);
+EXPORT_SYMBOL(cfs_kernel_write);
 
-/* Block all signals except for the @sigs */
-sigset_t cfs_block_sigsinv(unsigned long sigs)
+ssize_t cfs_kernel_read(struct file *file, void *buf, size_t count, loff_t *pos)
 {
-	unsigned long flags;
-	sigset_t old;
-
-	spin_lock_irqsave(&current->sighand->siglock, flags);
-	old = current->blocked;
-	sigaddsetmask(&current->blocked, ~sigs);
-	recalc_sigpending();
-	spin_unlock_irqrestore(&current->sighand->siglock, flags);
-	return old;
+#ifdef HAVE_KERNEL_READ_LAST_POSP
+	return kernel_read(file, buf, count, pos);
+#else
+	ssize_t size = kernel_read(file, *pos, buf, count);
+
+	if (size > 0)
+		*pos += size;
+	return size;
+#endif
 }
-EXPORT_SYMBOL(cfs_block_sigsinv);
+EXPORT_SYMBOL(cfs_kernel_read);
 
-void
-cfs_restore_sigs(sigset_t old)
+#ifndef HAVE_KSET_FIND_OBJ
+struct kobject *kset_find_obj(struct kset *kset, const char *name)
 {
-	unsigned long  flags;
+	struct kobject *ret = NULL;
+	struct kobject *k;
 
-	spin_lock_irqsave(&current->sighand->siglock, flags);
-	current->blocked = old;
-	recalc_sigpending();
-	spin_unlock_irqrestore(&current->sighand->siglock, flags);
+	spin_lock(&kset->list_lock);
+
+	list_for_each_entry(k, &kset->list, entry) {
+		if (kobject_name(k) && !strcmp(kobject_name(k), name)) {
+			if (kref_get_unless_zero(&k->kref))
+				ret = k;
+			break;
+		}
+	}
+
+	spin_unlock(&kset->list_lock);
+	return ret;
 }
-EXPORT_SYMBOL(cfs_restore_sigs);
+EXPORT_SYMBOL_GPL(kset_find_obj);
+#endif
 
-void
-cfs_clear_sigpending(void)
+#ifndef HAVE_KSTRTOBOOL_FROM_USER
+int kstrtobool_from_user(const char __user *s, size_t count, bool *res)
 {
-	unsigned long flags;
-
-	spin_lock_irqsave(&current->sighand->siglock, flags);
-	clear_tsk_thread_flag(current, TIF_SIGPENDING);
-	spin_unlock_irqrestore(&current->sighand->siglock, flags);
+	/* Longest string needed to differentiate, newline, terminator */
+	char buf[4];
+
+	count = min(count, sizeof(buf) - 1);
+	if (copy_from_user(buf, s, count))
+		return -EFAULT;
+	buf[count] = '\0';
+	return strtobool(buf, res);
 }
-EXPORT_SYMBOL(cfs_clear_sigpending);
+EXPORT_SYMBOL(kstrtobool_from_user);
+#endif /* !HAVE_KSTRTOBOOL_FROM_USER */