![Artem Bityutskiy](/assets/img/avatar_default.png)
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6: (9356 commits) [media] rc: update for bitop name changes fs: simplify iget & friends fs: pull inode->i_lock up out of writeback_single_inode fs: rename inode_lock to inode_hash_lock fs: move i_wb_list out from under inode_lock fs: move i_sb_list out from under inode_lock fs: remove inode_lock from iput_final and prune_icache fs: Lock the inode LRU list separately fs: factor inode disposal fs: protect inode->i_state with inode->i_lock lib, arch: add filter argument to show_mem and fix private implementations SLUB: Write to per cpu data when allocating it slub: Fix debugobjects with lockless fastpath autofs4: Do not potentially dereference NULL pointer returned by fget() in autofs_dev_ioctl_setpipefd() autofs4 - remove autofs4_lock autofs4 - fix d_manage() return on rcu-walk autofs4 - fix autofs4_expire_indirect() traversal autofs4 - fix dentry leak in autofs4_expire_direct() autofs4 - reinstate last used update on access vfs - check non-mountpoint dentry might block in __follow_mount_rcu() ... NOTE! This merge commit was created to fix compilation error. The block tree was merged upstream and removed the 'elv_queue_empty()' function which the new 'mtdswap' driver is using. So a simple merge of the mtd tree with upstream does not compile. And the mtd tree has already be published, so re-basing it is not an option. To fix this unfortunate situation, I had to merge upstream into the mtd-2.6.git tree without committing, put the fixup patch on top of this, and then commit this. The result is that we do not have commits which do not compile. In other words, this merge commit "merges" 3 things: the MTD tree, the upstream tree, and the fixup patch.
94 lines
2.7 KiB
C
94 lines
2.7 KiB
C
/*
|
|
* Copyright © 2003-2010 David Woodhouse <dwmw2@infradead.org>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*
|
|
*/
|
|
|
|
#ifndef __MTD_TRANS_H__
|
|
#define __MTD_TRANS_H__
|
|
|
|
#include <linux/mutex.h>
|
|
#include <linux/kref.h>
|
|
#include <linux/sysfs.h>
|
|
|
|
struct hd_geometry;
|
|
struct mtd_info;
|
|
struct mtd_blktrans_ops;
|
|
struct file;
|
|
struct inode;
|
|
|
|
struct mtd_blktrans_dev {
|
|
struct mtd_blktrans_ops *tr;
|
|
struct list_head list;
|
|
struct mtd_info *mtd;
|
|
struct mutex lock;
|
|
int devnum;
|
|
bool bg_stop;
|
|
unsigned long size;
|
|
int readonly;
|
|
int open;
|
|
struct kref ref;
|
|
struct gendisk *disk;
|
|
struct attribute_group *disk_attributes;
|
|
struct task_struct *thread;
|
|
struct request_queue *rq;
|
|
spinlock_t queue_lock;
|
|
void *priv;
|
|
};
|
|
|
|
struct mtd_blktrans_ops {
|
|
char *name;
|
|
int major;
|
|
int part_bits;
|
|
int blksize;
|
|
int blkshift;
|
|
|
|
/* Access functions */
|
|
int (*readsect)(struct mtd_blktrans_dev *dev,
|
|
unsigned long block, char *buffer);
|
|
int (*writesect)(struct mtd_blktrans_dev *dev,
|
|
unsigned long block, char *buffer);
|
|
int (*discard)(struct mtd_blktrans_dev *dev,
|
|
unsigned long block, unsigned nr_blocks);
|
|
void (*background)(struct mtd_blktrans_dev *dev);
|
|
|
|
/* 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);
|
|
int (*release)(struct mtd_blktrans_dev *dev);
|
|
|
|
/* Called on {de,}registration and on subsequent addition/removal
|
|
of devices, with mtd_table_mutex held. */
|
|
void (*add_mtd)(struct mtd_blktrans_ops *tr, struct mtd_info *mtd);
|
|
void (*remove_dev)(struct mtd_blktrans_dev *dev);
|
|
|
|
struct list_head devs;
|
|
struct list_head list;
|
|
struct module *owner;
|
|
};
|
|
|
|
extern int register_mtd_blktrans(struct mtd_blktrans_ops *tr);
|
|
extern int deregister_mtd_blktrans(struct mtd_blktrans_ops *tr);
|
|
extern int add_mtd_blktrans_dev(struct mtd_blktrans_dev *dev);
|
|
extern int del_mtd_blktrans_dev(struct mtd_blktrans_dev *dev);
|
|
extern int mtd_blktrans_cease_background(struct mtd_blktrans_dev *dev);
|
|
|
|
|
|
#endif /* __MTD_TRANS_H__ */
|