string: factorize skip_spaces and export it to be generally available

[safe/jmp/linux-2.6] / include / linux / bsg.h

diff --git a/include/linux/bsg.h b/include/linux/bsg.h
index e8406c5..ecb4730 100644 (file)
--- a/include/linux/bsg.h
+++ b/include/linux/bsg.h
@@ -1,12 +1,22 @@
 #ifndef BSG_H
 #define BSG_H
 
+#include <linux/types.h>
+
 #define BSG_PROTOCOL_SCSI              0
 
 #define BSG_SUB_PROTOCOL_SCSI_CMD      0
 #define BSG_SUB_PROTOCOL_SCSI_TMF      1
 #define BSG_SUB_PROTOCOL_SCSI_TRANSPORT        2
 
+/*
+ * For flags member below
+ * sg.h sg_io_hdr also has bits defined for it's flags member. However
+ * none of these bits are implemented/used by bsg. The bits below are
+ * allocated to not conflict with sg.h ones anyway.
+ */
+#define BSG_FLAG_Q_AT_TAIL 0x10 /* default, == 0 at this bit, is Q_AT_HEAD */
+
 struct sg_io_v4 {
        __s32 guard;            /* [i] 'Q' to differentiate from v3 */
        __u32 protocol;         /* [i] 0 -> SCSI , .... */
@@ -56,19 +66,25 @@ struct sg_io_v4 {
 #if defined(CONFIG_BLK_DEV_BSG)
 struct bsg_class_device {
        struct device *class_dev;
-       struct device *dev;
+       struct device *parent;
        int minor;
        struct request_queue *queue;
+       struct kref ref;
+       void (*release)(struct device *);
 };
 
-extern int bsg_register_queue(struct request_queue *, struct device *, const char *);
+extern int bsg_register_queue(struct request_queue *q,
+                             struct device *parent, const char *name,
+                             void (*release)(struct device *));
 extern void bsg_unregister_queue(struct request_queue *);
 #else
-static inline int bsg_register_queue(struct request_queue * rq, struct device *dev, const char *name)
+static inline int bsg_register_queue(struct request_queue *q,
+                                    struct device *parent, const char *name,
+                                    void (*release)(struct device *))
 {
        return 0;
 }
-static inline void bsg_unregister_queue(struct request_queue *rq)
+static inline void bsg_unregister_queue(struct request_queue *q)
 {
 }
 #endif