patch-2.4.20 linux-2.4.20/include/linux/intermezzo_psdev.h
Next file: linux-2.4.20/include/linux/iobuf.h
Previous file: linux-2.4.20/include/linux/intermezzo_lib.h
Back to the patch index
Back to the overall index
- Lines: 96
- Date:
Thu Nov 28 15:53:15 2002
- Orig file:
linux-2.4.19/include/linux/intermezzo_psdev.h
- Orig date:
Sun Nov 11 10:20:21 2001
diff -urN linux-2.4.19/include/linux/intermezzo_psdev.h linux-2.4.20/include/linux/intermezzo_psdev.h
@@ -1,57 +1,42 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ */
+
#ifndef __PRESTO_PSDEV_H
#define __PRESTO_PSDEV_H
-#ifdef PRESTO_DEVEL
-# define PRESTO_FS_NAME "izofs"
-# define PRESTO_PSDEV_NAME "/dev/izo"
-# define PRESTO_PSDEV_MAJOR 186
-#else
-# define PRESTO_FS_NAME "InterMezzo"
-# define PRESTO_PSDEV_NAME "/dev/intermezzo"
-# define PRESTO_PSDEV_MAJOR 185
-#endif
-
-#define MAX_PRESTODEV 16
-
+#define MAX_CHANNEL 16
+#define PROCNAME_SIZE 32
+#include <linux/locks.h>
+#include <linux/smp_lock.h>
#include <linux/version.h>
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0))
-#define wait_queue_head_t struct wait_queue *
-#define DECLARE_WAITQUEUE(name,task) \
- struct wait_queue name = { task, NULL }
-#define init_waitqueue_head(arg)
-#else
-#ifndef __initfunc
-#define __initfunc(arg) arg
-#endif
-#endif
-
-
-/* represents state of a /dev/presto */
+/* represents state of an instance reached with /dev/intermezzo */
/* communication pending & processing queues */
-struct upc_comm {
+struct upc_channel {
unsigned int uc_seq;
- wait_queue_head_t uc_waitq; /* Lento wait queue */
- struct list_head uc_pending;
- struct list_head uc_processing;
- int uc_pid; /* Lento's pid */
- int uc_hard; /* allows signals during upcalls */
+ wait_queue_head_t uc_waitq; /* Lento wait queue */
+ struct list_head uc_pending;
+ struct list_head uc_processing;
+ spinlock_t uc_lock;
+ int uc_pid; /* Lento's pid */
+ int uc_hard; /* allows signals during upcalls */
int uc_no_filter;
int uc_no_journal;
int uc_no_upcall;
- int uc_timeout; /* . sec: signals will dequeue upc */
+ int uc_timeout; /* . sec: signals will dequeue upc */
long uc_errorval; /* for testing I/O failures */
struct list_head uc_cache_list;
- int uc_minor;
- char * uc_devname;
+ int uc_minor;
};
-#define ISLENTO(minor) (current->pid == upc_comms[minor].uc_pid \
- || current->p_pptr->pid == upc_comms[minor].uc_pid)
+#define ISLENTO(minor) (current->pid == izo_channels[minor].uc_pid \
+ || current->p_pptr->pid == izo_channels[minor].uc_pid \
+ || current->p_pptr->p_pptr->pid == izo_channels[minor].uc_pid)
-extern struct upc_comm upc_comms[MAX_PRESTODEV];
+extern struct upc_channel izo_channels[MAX_CHANNEL];
-/* messages between presto filesystem in kernel and Venus */
+/* message types between presto filesystem in kernel */
#define REQ_READ 1
#define REQ_WRITE 2
#define REQ_ASYNC 4
@@ -60,10 +45,10 @@
struct upc_req {
struct list_head rq_chain;
caddr_t rq_data;
- u_short rq_flags;
- u_short rq_bufsize;
- u_short rq_rep_size;
- u_short rq_opcode; /* copied from data to save lookup */
+ int rq_flags;
+ int rq_bufsize;
+ int rq_rep_size;
+ int rq_opcode; /* copied from data to save lookup */
int rq_unique;
wait_queue_head_t rq_sleep; /* process' wait queue */
unsigned long rq_posttime;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)