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
/
mtd
/
blktrans.h
diff --git
a/include/linux/mtd/blktrans.h
b/include/linux/mtd/blktrans.h
index
f46afec
..
9a6e2f9
100644
(file)
--- a/
include/linux/mtd/blktrans.h
+++ b/
include/linux/mtd/blktrans.h
@@
-10,7
+10,7
@@
#ifndef __MTD_TRANS_H__
#define __MTD_TRANS_H__
#ifndef __MTD_TRANS_H__
#define __MTD_TRANS_H__
-#include <
asm/semaphore
.h>
+#include <
linux/mutex
.h>
struct hd_geometry;
struct mtd_info;
struct hd_geometry;
struct mtd_info;
@@
-22,9
+22,8
@@
struct mtd_blktrans_dev {
struct mtd_blktrans_ops *tr;
struct list_head list;
struct mtd_info *mtd;
struct mtd_blktrans_ops *tr;
struct list_head list;
struct mtd_info *mtd;
- struct
semaphore sem
;
+ struct
mutex lock
;
int devnum;
int devnum;
- int blksize;
unsigned long size;
int readonly;
void *blkcore_priv; /* gendisk in 2.5, devfs_handle in 2.4 */
unsigned long size;
int readonly;
void *blkcore_priv; /* gendisk in 2.5, devfs_handle in 2.4 */
@@
-36,6
+35,8
@@
struct mtd_blktrans_ops {
char *name;
int major;
int part_bits;
char *name;
int major;
int part_bits;
+ int blksize;
+ int blkshift;
/* Access functions */
int (*readsect)(struct mtd_blktrans_dev *dev,
/* Access functions */
int (*readsect)(struct mtd_blktrans_dev *dev,