git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
linux
/
loop.h
diff --git
a/include/linux/loop.h
b/include/linux/loop.h
index
6521244
..
1ea7d84
100644
(file)
--- a/
include/linux/loop.h
+++ b/
include/linux/loop.h
@@
-17,6
+17,7
@@
#include <linux/bio.h>
#include <linux/blkdev.h>
#include <linux/spinlock.h>
#include <linux/bio.h>
#include <linux/blkdev.h>
#include <linux/spinlock.h>
+#include <linux/mutex.h>
/* Possible states of device */
enum {
/* Possible states of device */
enum {
@@
-44,6
+45,7
@@
struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
uid_t lo_key_owner; /* Who set the key */
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
uid_t lo_key_owner; /* Who set the key */
+ xid_t lo_xid;
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
@@
-52,16
+54,15
@@
struct loop_device {
unsigned lo_blocksize;
void *key_data;
unsigned lo_blocksize;
void *key_data;
-
int
old_gfp_mask;
+
gfp_t
old_gfp_mask;
spinlock_t lo_lock;
struct bio *lo_bio;
struct bio *lo_biotail;
int lo_state;
spinlock_t lo_lock;
struct bio *lo_bio;
struct bio *lo_biotail;
int lo_state;
- struct semaphore lo_sem;
- struct semaphore lo_ctl_mutex;
- struct semaphore lo_bh_mutex;
- atomic_t lo_pending;
+ struct mutex lo_ctl_mutex;
+ struct task_struct *lo_thread;
+ wait_queue_head_t lo_event;
request_queue_t *lo_queue;
};
request_queue_t *lo_queue;
};
@@
-71,7
+72,10
@@
struct loop_device {
/*
* Loop flags
*/
/*
* Loop flags
*/
-#define LO_FLAGS_READ_ONLY 1
+enum {
+ LO_FLAGS_READ_ONLY = 1,
+ LO_FLAGS_USE_AOPS = 2,
+};
#include <asm/posix_types.h> /* for __kernel_old_dev_t */
#include <asm/types.h> /* for __u64 */
#include <asm/posix_types.h> /* for __kernel_old_dev_t */
#include <asm/types.h> /* for __u64 */