Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] move block_device_operations to blkdev.h

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro 08f85851 647b3d00

+19 -14
+1
fs/ext2/xip.c
··· 11 11 #include <linux/buffer_head.h> 12 12 #include <linux/ext2_fs_sb.h> 13 13 #include <linux/ext2_fs.h> 14 + #include <linux/blkdev.h> 14 15 #include "ext2.h" 15 16 #include "xip.h" 16 17
+17
include/linux/blkdev.h
··· 1057 1057 1058 1058 #endif /* CONFIG_BLK_DEV_INTEGRITY */ 1059 1059 1060 + struct file; 1061 + struct inode; 1062 + 1063 + struct block_device_operations { 1064 + int (*open) (struct inode *, struct file *); 1065 + int (*release) (struct inode *, struct file *); 1066 + int (*ioctl) (struct inode *, struct file *, unsigned, unsigned long); 1067 + long (*unlocked_ioctl) (struct file *, unsigned, unsigned long); 1068 + long (*compat_ioctl) (struct file *, unsigned, unsigned long); 1069 + int (*direct_access) (struct block_device *, sector_t, 1070 + void **, unsigned long *); 1071 + int (*media_changed) (struct gendisk *); 1072 + int (*revalidate_disk) (struct gendisk *); 1073 + int (*getgeo)(struct block_device *, struct hd_geometry *); 1074 + struct module *owner; 1075 + }; 1076 + 1060 1077 #else /* CONFIG_BLOCK */ 1061 1078 /* 1062 1079 * stubs for when the block layer is configured out
+1 -14
include/linux/fs.h
··· 1270 1270 * to have different dirent layouts depending on the binary type. 1271 1271 */ 1272 1272 typedef int (*filldir_t)(void *, const char *, int, loff_t, u64, unsigned); 1273 - 1274 - struct block_device_operations { 1275 - int (*open) (struct inode *, struct file *); 1276 - int (*release) (struct inode *, struct file *); 1277 - int (*ioctl) (struct inode *, struct file *, unsigned, unsigned long); 1278 - long (*unlocked_ioctl) (struct file *, unsigned, unsigned long); 1279 - long (*compat_ioctl) (struct file *, unsigned, unsigned long); 1280 - int (*direct_access) (struct block_device *, sector_t, 1281 - void **, unsigned long *); 1282 - int (*media_changed) (struct gendisk *); 1283 - int (*revalidate_disk) (struct gendisk *); 1284 - int (*getgeo)(struct block_device *, struct hd_geometry *); 1285 - struct module *owner; 1286 - }; 1273 + struct block_device_operations; 1287 1274 1288 1275 /* These macros are for out of kernel modules to test that 1289 1276 * the kernel supports the unlocked_ioctl and compat_ioctl