diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2003-06-23 15:40:56 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2003-06-23 15:40:56 +0100 |
| commit | 2588333601e4e50fe8bf29aadbc882d4c7ce25b7 (patch) | |
| tree | 2ba04b0b88555605e68919368e680dbb89e7d44e /include/linux/mtd | |
| parent | d05828871c2f5a0475e6071363232c48ba43b2c8 (diff) | |
Replace mtd_blktrans ->ioctl() method with ->getgeo() and ->flush()
... and also fix the embarrassing bug where NFTL and INFTL will
barf and exit if the add_mtd_blktrans_dev() function _exists_,
rather than actually calling it and barfing if it returns non-zero :)
Diffstat (limited to 'include/linux/mtd')
| -rw-r--r-- | include/linux/mtd/blktrans.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/include/linux/mtd/blktrans.h b/include/linux/mtd/blktrans.h index ab9639b36e25..4ebc2e5a16e2 100644 --- a/include/linux/mtd/blktrans.h +++ b/include/linux/mtd/blktrans.h @@ -1,5 +1,5 @@ /* - * $Id: blktrans.h,v 1.4 2003/05/21 01:01:32 dwmw2 Exp $ + * $Id: blktrans.h,v 1.5 2003/06/23 12:00:08 dwmw2 Exp $ * * (C) 2003 David Woodhouse <dwmw2@infradead.org> * @@ -12,6 +12,7 @@ #include <asm/semaphore.h> +struct hd_geometry; struct mtd_info; struct mtd_blktrans_ops; struct file; @@ -42,17 +43,13 @@ struct mtd_blktrans_ops { int (*writesect)(struct mtd_blktrans_dev *dev, unsigned long block, char *buffer); - /* HDIO_GETGEO and HDIO_GETGEO_BIG are the only non-private - ioctls which are expected to be passed through */ - int (*ioctl)(struct mtd_blktrans_dev *dev, - struct inode * inode, struct file * file, - unsigned int cmd, unsigned long arg); + /* Block layer ioctls */ + int (*getgeo)(struct mtd_blktrans_dev *dev, struct hd_geometry *geo); + int (*flush)(struct mtd_blktrans_dev *dev); /* Called with mtd_table_mutex held; no race with add/remove */ - int (*open)(struct mtd_blktrans_dev *dev, - struct inode *i, struct file *f); - int (*release)(struct mtd_blktrans_dev *dev, - struct inode *i, struct file *f); + int (*open)(struct mtd_blktrans_dev *dev); + int (*release)(struct mtd_blktrans_dev *dev); /* Called on {de,}registration and on subsequent addition/removal of devices, with mtd_table_mutex held. */ |