summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorAlexander Viro <viro@math.psu.edu>2002-10-15 04:25:13 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-10-15 04:25:13 -0700
commitc6973580141ce5a4904436b29c0dc5f3d9982951 (patch)
treebc7b03694fe455c3c0751f2d7aa96fe87d87f4d9 /include/linux
parent8b290eb199620bd66049bf972ef0d995576cf3b9 (diff)
[PATCH] block ioctl cleanup
guts of blkpg.c and blkdev_ioctl() sanitized up and moved into a new file - drivers/block/ioctl.c. blkpg.c is gone.
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/blkpg.h1
-rw-r--r--include/linux/fs.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/blkpg.h b/include/linux/blkpg.h
index 3cfedb07f803..571618972e30 100644
--- a/include/linux/blkpg.h
+++ b/include/linux/blkpg.h
@@ -57,7 +57,6 @@ struct blkpg_partition {
#ifdef __KERNEL__
extern char * partition_name(dev_t dev);
-extern int blk_ioctl(struct block_device *bdev, unsigned int cmd, unsigned long arg);
#endif /* __KERNEL__ */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 93148f1659b0..cac13f931cec 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1087,6 +1087,7 @@ extern struct file_operations def_blk_fops;
extern struct address_space_operations def_blk_aops;
extern struct file_operations def_fifo_fops;
extern int ioctl_by_bdev(struct block_device *, unsigned, unsigned long);
+extern int blkdev_ioctl(struct inode *, struct file *, unsigned, unsigned long);
extern int blkdev_get(struct block_device *, mode_t, unsigned, int);
extern int blkdev_put(struct block_device *, int);
extern int bd_claim(struct block_device *, void *);