projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
[cascardo/linux.git]
/
include
/
linux
/
loop.h
diff --git
a/include/linux/loop.h
b/include/linux/loop.h
index
191a595
..
46169a7
100644
(file)
--- a/
include/linux/loop.h
+++ b/
include/linux/loop.h
@@
-63,7
+63,9
@@
struct loop_device {
struct task_struct *lo_thread;
wait_queue_head_t lo_event;
struct task_struct *lo_thread;
wait_queue_head_t lo_event;
- request_queue_t *lo_queue;
+ struct request_queue *lo_queue;
+ struct gendisk *lo_disk;
+ struct list_head lo_list;
};
#endif /* __KERNEL__ */
};
#endif /* __KERNEL__ */
@@
-74,6
+76,7
@@
struct loop_device {
enum {
LO_FLAGS_READ_ONLY = 1,
LO_FLAGS_USE_AOPS = 2,
enum {
LO_FLAGS_READ_ONLY = 1,
LO_FLAGS_USE_AOPS = 2,
+ LO_FLAGS_AUTOCLEAR = 4,
};
#include <asm/posix_types.h> /* for __kernel_old_dev_t */
};
#include <asm/posix_types.h> /* for __kernel_old_dev_t */