put file_ops->checkpoint under CONFIG_CHECKPOINT
Subsystems (30)
PATCH 1/1 put file_ops->checkpoint under CONFIG_CHECKPOINT
It is a matter of preference, and what we had before was correct, but we've been asked to just put the method under #ifdef CONFIG_CHECKPOINT. So do so, and get rid of the #else dummy defines.
I did quite a bit of find . -type f -print0 | xargs -0 grep -Hn and hope I found all cases. Even a make allyesconfig didn't point to anything I might have missed.
--- drivers/char/mem.c | 4 ++++ drivers/char/random.c | 4 ++++ drivers/char/tty_io.c | 7 ++++--- fs/adfs/dir.c | 2 ++ fs/adfs/file.c | 2 ++ fs/affs/dir.c | 2 ++ fs/affs/file.c | 2 ++ fs/befs/linuxvfs.c | 2 ++ fs/bfs/dir.c | 2 ++ fs/bfs/file.c | 2 ++ fs/btrfs/file.c | 2 ++ fs/btrfs/inode.c | 2 ++ fs/btrfs/super.c | 2 ++ fs/cramfs/inode.c | 2 ++ fs/ecryptfs/file.c | 4 ++++ fs/ecryptfs/miscdev.c | 2 ++ fs/efs/dir.c | 2 ++ fs/eventfd.c | 4 ++-- fs/eventpoll.c | 5 ++--- fs/exofs/dir.c | 2 ++ fs/exofs/file.c | 4 +++- fs/ext2/dir.c | 2 ++ fs/ext2/file.c | 4 ++++ fs/ext3/dir.c | 2 ++ fs/ext3/file.c | 2 ++ fs/ext4/dir.c | 2 ++ fs/ext4/file.c | 2 ++ fs/fat/dir.c | 2 ++ fs/fat/file.c | 2 ++ fs/freevxfs/vxfs_lookup.c | 2 ++ fs/hfs/dir.c | 2 ++ fs/hfs/inode.c | 2 ++ fs/hfsplus/dir.c | 2 ++ fs/hfsplus/inode.c | 2 ++ fs/hostfs/hostfs_kern.c | 8 ++++++-- fs/hpfs/dir.c | 2 ++ fs/hpfs/file.c | 2 ++ fs/hppfs/hppfs.c | 4 ++++ fs/isofs/dir.c | 2 ++ fs/jffs2/dir.c | 2 ++ fs/jffs2/file.c | 2 ++ fs/jfs/file.c | 2 ++ fs/jfs/namei.c | 2 ++ fs/minix/dir.c | 2 ++ fs/minix/file.c | 2 ++ fs/nfs/dir.c | 2 ++ fs/nfs/file.c | 2 ++ fs/nilfs2/dir.c | 2 ++ fs/nilfs2/file.c | 4 +++- fs/ntfs/dir.c | 2 ++ fs/ntfs/file.c | 2 ++ fs/omfs/dir.c | 2 ++ fs/omfs/file.c | 2 ++ fs/openpromfs/inode.c | 4 ++++ fs/pipe.c | 9 ++++++--- fs/qnx4/dir.c | 2 ++ fs/ramfs/file-mmu.c | 2 ++ fs/ramfs/file-nommu.c | 2 ++ fs/read_write.c | 2 ++ fs/reiserfs/dir.c | 2 ++ fs/reiserfs/file.c | 2 ++ fs/romfs/mmap-nommu.c | 2 ++ fs/romfs/super.c | 2 ++ fs/squashfs/dir.c | 2 ++ fs/sysv/dir.c | 2 ++ fs/sysv/file.c | 2 ++ fs/ubifs/debug.c | 4 +++- fs/ubifs/dir.c | 2 ++ fs/ubifs/file.c | 2 ++ fs/udf/dir.c | 2 ++ fs/udf/file.c | 2 ++ fs/ufs/dir.c | 2 ++ fs/ufs/file.c | 2 ++ fs/xfs/linux-2.6/xfs_file.c | 4 ++++ include/linux/fs.h | 4 ++-- mm/filemap.c | 2 -- mm/mmap.c | 2 -- 77 files changed, 177 insertions(+), 22 deletions(-)
drivers/char/mem.c +4 -0
@@ -763,7 +763,9 @@ static const struct file_operations null_fops = { .read = read_null, .write = write_null, .splice_write = splice_write_null, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };#ifdef CONFIG_DEVPORT
@@ -780,7 +782,9 @@ static const struct file_operations zero_fops = { .read = read_zero, .write = write_zero, .mmap = mmap_zero, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };/*
drivers/char/random.c +4 -0
@@ -1169,7 +1169,9 @@ const struct file_operations random_fops = { .poll = random_poll, .unlocked_ioctl = random_ioctl, .fasync = random_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct file_operations urandom_fops = {
@@ -1177,7 +1179,9 @@ const struct file_operations urandom_fops = { .write = random_write, .unlocked_ioctl = random_ioctl, .fasync = random_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };/***************************************************************
drivers/char/tty_io.c +4 -3
@@ -155,9 +155,6 @@ static int tty_fasync(int fd, struct file *filp, int on);#ifdef CONFIG_CHECKPOINT static int tty_file_checkpoint (struct ckpt_ctx *ctx,struct file *file);static int tty_file_collect (struct ckpt_ctx *ctx,struct file *file); -#else -#define tty_file_checkpoint NULL -#define tty_file_collect NULL#endif /* CONFIG_CHECKPOINT */ static void release_tty (struct tty_struct *tty,int idx);static void __proc_set_tty (struct task_struct *tsk,struct tty_struct *tty);
@@ -425,8 +422,10 @@ static const struct file_operations tty_fops = { .open = tty_open, .release = tty_release, .fasync = tty_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = tty_file_checkpoint, .collect = tty_file_collect, +#endif }; static const struct file_operations console_fops = {
@@ -449,8 +448,10 @@ static const struct file_operations hung_up_tty_fops = { .unlocked_ioctl = hung_up_tty_ioctl, .compat_ioctl = hung_up_tty_compat_ioctl, .release = tty_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = tty_file_checkpoint, .collect = tty_file_collect, +#endif };static DEFINE_SPINLOCK (redirect_lock);
fs/adfs/dir.c +2 -0
@@ -198,7 +198,9 @@ const struct file_operations adfs_dir_operations = { .llseek = generic_file_llseek, .readdir = adfs_readdir, .fsync = simple_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; static int
fs/adfs/file.c +2 -0
@@ -30,7 +30,9 @@ const struct file_operations adfs_file_operations = { .write = do_sync_write, .aio_write = generic_file_aio_write, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations adfs_file_inode_operations = {
fs/affs/dir.c +2 -0
@@ -22,7 +22,9 @@ const struct file_operations affs_dir_operations = { .llseek = generic_file_llseek, .readdir = affs_readdir, .fsync = affs_file_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };/*
fs/affs/file.c +2 -0
@@ -36,7 +36,9 @@ const struct file_operations affs_file_operations = { .release = affs_file_release, .fsync = affs_file_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations affs_file_inode_operations = {
fs/befs/linuxvfs.c +2 -0
@@ -67,7 +67,9 @@ static const struct file_operations befs_dir_operations = { .read = generic_read_dir, .readdir = befs_readdir, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static const struct inode_operations befs_dir_inode_operations = {
fs/bfs/dir.c +2 -0
@@ -80,7 +80,9 @@ const struct file_operations bfs_dir_operations = { .readdir = bfs_readdir, .fsync = simple_fsync, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };extern void dump_imap (const char *,struct super_block *);
fs/bfs/file.c +2 -0
@@ -29,7 +29,9 @@ const struct file_operations bfs_file_operations = { .aio_write = generic_file_aio_write, .mmap = generic_file_mmap, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; static int bfs_move_block(unsigned long from, unsigned long to,
fs/btrfs/file.c +2 -0
@@ -1164,5 +1164,7 @@ const struct file_operations btrfs_file_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = btrfs_ioctl,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };
fs/btrfs/inode.c +2 -0
@@ -5971,7 +5971,9 @@ static const struct file_operations btrfs_dir_file_operations = {#endif .release = btrfs_release_file, .fsync = btrfs_sync_file, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static struct extent_io_ops btrfs_extent_io_ops = {
fs/btrfs/super.c +2 -0
@@ -718,7 +718,9 @@ static const struct file_operations btrfs_ctl_fops = { .unlocked_ioctl = btrfs_control_ioctl, .compat_ioctl = btrfs_control_ioctl, .owner = THIS_MODULE, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static struct miscdevice btrfs_misc = {
fs/cramfs/inode.c +2 -0
@@ -532,7 +532,9 @@ static const struct file_operations cramfs_directory_operations = { .llseek = generic_file_llseek, .read = generic_read_dir, .readdir = cramfs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static const struct inode_operations cramfs_dir_inode_operations = {
fs/ecryptfs/file.c +4 -0
@@ -305,7 +305,9 @@ const struct file_operations ecryptfs_dir_fops = { .fsync = ecryptfs_fsync, .fasync = ecryptfs_fasync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct file_operations ecryptfs_main_fops = {
@@ -323,7 +325,9 @@ const struct file_operations ecryptfs_main_fops = { .fsync = ecryptfs_fsync, .fasync = ecryptfs_fasync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; static int
fs/ecryptfs/miscdev.c +2 -0
@@ -481,7 +481,9 @@ static const struct file_operations ecryptfs_miscdev_fops = { .read = ecryptfs_miscdev_read, .write = ecryptfs_miscdev_write, .release = ecryptfs_miscdev_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static struct miscdevice ecryptfs_miscdev = {
fs/efs/dir.c +2 -0
@@ -13,7 +13,9 @@ const struct file_operations efs_dir_operations = { .llseek = generic_file_llseek, .read = generic_read_dir, .readdir = efs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations efs_dir_inode_operations = {
fs/eventfd.c +2 -2
@@ -337,8 +337,6 @@ struct file *eventfd_restore(struct ckpt_ctx *ckpt_ctx, }return evfile; } -#else -#define eventfd_checkpoint NULL#endif static const struct file_operations eventfd_fops = {
@@ -346,7 +344,9 @@ static const struct file_operations eventfd_fops = { .poll = eventfd_poll, .read = eventfd_read, .write = eventfd_write, +#ifdef CONFIG_CHECKPOINT .checkpoint = eventfd_checkpoint, +#endif };/**
fs/eventpoll.c +2 -3
@@ -677,17 +677,16 @@ static unsigned int ep_eventpoll_poll(struct file *file, poll_table *wait)#ifdef CONFIG_CHECKPOINT static int ep_eventpoll_checkpoint (struct ckpt_ctx *ctx,struct file *file);static int ep_file_collect (struct ckpt_ctx *ctx,struct file *file); -#else -#define ep_eventpoll_checkpoint NULL -#define ep_file_collect NULL#endif /* File callbacks that implement the eventpoll file behaviour */ static const struct file_operations eventpoll_fops = { .release = ep_eventpoll_release, .poll = ep_eventpoll_poll, +#ifdef CONFIG_CHECKPOINT .checkpoint = ep_eventpoll_checkpoint, .collect = ep_file_collect, +#endif };/* Fast test to see if the file is an evenpoll file */
fs/exofs/dir.c +2 -0
@@ -667,5 +667,7 @@ const struct file_operations exofs_dir_operations = { .llseek = generic_file_llseek, .read = generic_read_dir, .readdir = exofs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };
fs/exofs/file.c +3 -1
@@ -73,7 +73,6 @@ static int exofs_flush(struct file *file, fl_owner_t id)const struct file_operations exofs_file_operations = { .llseek = generic_file_llseek, - .checkpoint = generic_file_checkpoint, .read = do_sync_read, .write = do_sync_write, .aio_read = generic_file_aio_read,
@@ -85,6 +84,9 @@ const struct file_operations exofs_file_operations = { .flush = exofs_flush, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, +#ifdef CONFIG_CHECKPOINT + .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations exofs_file_inode_operations = {
fs/ext2/dir.c +2 -0
@@ -722,5 +722,7 @@ const struct file_operations ext2_dir_operations = { .compat_ioctl = ext2_compat_ioctl, #endif .fsync = ext2_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };
fs/ext2/file.c +4 -0
@@ -75,7 +75,9 @@ const struct file_operations ext2_file_operations = { .fsync = ext2_fsync, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif /* CONFIG_CHECKPOINT */ };#ifdef CONFIG_EXT2_FS_XIP
@@ -91,7 +93,9 @@ const struct file_operations ext2_xip_file_operations = { .open = generic_file_open, .release = ext2_release_file, .fsync = ext2_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif /* CONFIG_CHECKPOINT */ };#endif
fs/ext3/dir.c +2 -0
@@ -48,7 +48,9 @@ const struct file_operations ext3_dir_operations = {#endif .fsync = ext3_sync_file, /* BKL held */ .release = ext3_release_dir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };
fs/ext3/file.c +2 -0
@@ -67,7 +67,9 @@ const struct file_operations ext3_file_operations = { .fsync = ext3_sync_file, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations ext3_file_inode_operations = {
fs/ext4/dir.c +2 -0
@@ -48,7 +48,9 @@ const struct file_operations ext4_dir_operations = {#endif .fsync = ext4_sync_file, .release = ext4_release_dir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };
fs/ext4/file.c +2 -0
@@ -149,7 +149,9 @@ const struct file_operations ext4_file_operations = { .fsync = ext4_sync_file, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations ext4_file_inode_operations = {
fs/fat/dir.c +2 -0
@@ -841,7 +841,9 @@ const struct file_operations fat_dir_operations = { .compat_ioctl = fat_compat_dir_ioctl, #endif .fsync = fat_file_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; static int fat_get_short_entry(struct inode *dir, loff_t *pos,
fs/fat/file.c +2 -0
@@ -162,7 +162,9 @@ const struct file_operations fat_file_operations = { .ioctl = fat_generic_ioctl, .fsync = fat_file_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static int fat_cont_expand (struct inode *inode,loff_t size)
fs/freevxfs/vxfs_lookup.c +2 -0
@@ -58,7 +58,9 @@ const struct inode_operations vxfs_dir_inode_ops = {const struct file_operations vxfs_dir_operations = { .readdir = vxfs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };
fs/hfs/dir.c +2 -0
@@ -329,7 +329,9 @@ const struct file_operations hfs_dir_operations = { .readdir = hfs_readdir, .llseek = generic_file_llseek, .release = hfs_dir_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations hfs_dir_inode_operations = {
fs/hfs/inode.c +2 -0
@@ -607,7 +607,9 @@ static const struct file_operations hfs_file_operations = { .fsync = file_fsync, .open = hfs_file_open, .release = hfs_file_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static const struct inode_operations hfs_file_inode_operations = {
fs/hfsplus/dir.c +2 -0
@@ -497,5 +497,7 @@ const struct file_operations hfsplus_dir_operations = { .ioctl = hfsplus_ioctl, .llseek = generic_file_llseek, .release = hfsplus_dir_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };
fs/hfsplus/inode.c +2 -0
@@ -286,7 +286,9 @@ static const struct file_operations hfsplus_file_operations = { .open = hfsplus_file_open, .release = hfsplus_file_release, .ioctl = hfsplus_ioctl, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };struct inode *hfsplus_new_inode (struct super_block *sb,int mode)
fs/hostfs/hostfs_kern.c +6 -2
@@ -417,7 +417,6 @@ int hostfs_fsync(struct file *file, struct dentry *dentry, int datasync)static const struct file_operations hostfs_file_fops = { .llseek = generic_file_llseek, - .checkpoint = generic_file_checkpoint, .read = do_sync_read, .splice_read = generic_file_splice_read, .aio_read = generic_file_aio_read,
@@ -427,13 +426,18 @@ static const struct file_operations hostfs_file_fops = { .open = hostfs_file_open, .release = NULL, .fsync = hostfs_fsync, +#ifdef CONFIG_CHECKPOINT + .checkpoint = generic_file_checkpoint, +#endif };static const struct file_operations hostfs_dir_fops = { .llseek = generic_file_llseek, - .checkpoint = generic_file_checkpoint, .readdir = hostfs_readdir, .read = generic_read_dir, +#ifdef CONFIG_CHECKPOINT + .checkpoint = generic_file_checkpoint, +#endif };int hostfs_writepage (struct page *page,struct writeback_control *wbc)
fs/hpfs/dir.c +2 -0
@@ -322,5 +322,7 @@ const struct file_operations hpfs_dir_ops = .readdir = hpfs_readdir, .release = hpfs_dir_release, .fsync = hpfs_file_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };
fs/hpfs/file.c +2 -0
@@ -139,7 +139,9 @@ const struct file_operations hpfs_file_ops = .release = hpfs_file_release, .fsync = hpfs_file_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; const struct inode_operations hpfs_file_iops =
fs/hppfs/hppfs.c +4 -0
@@ -546,7 +546,9 @@ static const struct file_operations hppfs_file_fops = { .read = hppfs_read, .write = hppfs_write, .open = hppfs_open, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };struct hppfs_dirent {
@@ -598,7 +600,9 @@ static const struct file_operations hppfs_dir_fops = { .readdir = hppfs_readdir, .open = hppfs_dir_open, .fsync = hppfs_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static int hppfs_statfs (struct dentry *dentry,struct kstatfs *sf)
fs/isofs/dir.c +2 -0
@@ -273,7 +273,9 @@ const struct file_operations isofs_dir_operations = { .read = generic_read_dir, .readdir = isofs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };/*
fs/jffs2/dir.c +2 -0
@@ -41,7 +41,9 @@ const struct file_operations jffs2_dir_operations = .unlocked_ioctl=jffs2_ioctl, .fsync = jffs2_fsync, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };
fs/jffs2/file.c +2 -0
@@ -50,7 +50,9 @@ const struct file_operations jffs2_file_operations = .mmap = generic_file_readonly_mmap, .fsync = jffs2_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };/* jffs2_file_inode_operations */
fs/jfs/file.c +2 -0
@@ -116,5 +116,7 @@ const struct file_operations jfs_file_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = jfs_compat_ioctl,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };
fs/jfs/namei.c +2 -0
@@ -1556,7 +1556,9 @@ const struct file_operations jfs_dir_operations = { .compat_ioctl = jfs_compat_ioctl, #endif .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static int jfs_ci_hash (struct dentry *dir,struct qstr *this)
fs/minix/dir.c +2 -0
@@ -23,7 +23,9 @@ const struct file_operations minix_dir_operations = { .read = generic_read_dir, .readdir = minix_readdir, .fsync = simple_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static inline void dir_put_page (struct page *page)
fs/minix/file.c +2 -0
@@ -21,7 +21,9 @@ const struct file_operations minix_file_operations = { .mmap = generic_file_mmap, .fsync = simple_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations minix_file_inode_operations = {
fs/nfs/dir.c +2 -0
@@ -63,7 +63,9 @@ const struct file_operations nfs_dir_operations = { .open = nfs_opendir, .release = nfs_release, .fsync = nfs_fsync_dir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations nfs_dir_inode_operations = {
fs/nfs/file.c +2 -0
@@ -78,7 +78,9 @@ const struct file_operations nfs_file_operations = { .splice_write = nfs_file_splice_write, .check_flags = nfs_check_flags, .setlease = nfs_setlease, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations nfs_file_inode_operations = {
fs/nilfs2/dir.c +2 -0
@@ -702,5 +702,7 @@ const struct file_operations nilfs_dir_operations = { .compat_ioctl = nilfs_ioctl,#endif /* CONFIG_COMPAT */ .fsync = nilfs_sync_file, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };
fs/nilfs2/file.c +3 -1
@@ -136,7 +136,6 @@ static int nilfs_file_mmap(struct file *file, struct vm_area_struct *vma)*/ const struct file_operations nilfs_file_operations = { .llseek = generic_file_llseek, - .checkpoint = generic_file_checkpoint, .read = do_sync_read, .write = do_sync_write, .aio_read = generic_file_aio_read,
@@ -150,6 +149,9 @@ const struct file_operations nilfs_file_operations = {/* .release = nilfs_release_file, */ .fsync = nilfs_sync_file, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT + .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations nilfs_file_inode_operations = {
fs/ntfs/dir.c +2 -0
@@ -1572,5 +1572,7 @@ const struct file_operations ntfs_dir_ops = {/*.ioctl = ,*/ /* Perform function on the mounted filesystem. */ .open = ntfs_dir_open, /* Open directory. */ +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };
fs/ntfs/file.c +2 -0
@@ -2234,7 +2234,9 @@ const struct file_operations ntfs_file_ops = {on the ntfs partition. We do not need to care about the data source. */ +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations ntfs_file_inode_ops = {
fs/omfs/dir.c +2 -0
@@ -502,5 +502,7 @@ const struct file_operations omfs_dir_operations = { .read = generic_read_dir, .readdir = omfs_readdir, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };
fs/omfs/file.c +2 -0
@@ -331,7 +331,9 @@ const struct file_operations omfs_file_operations = { .mmap = generic_file_mmap, .fsync = simple_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations omfs_file_inops = {
fs/openpromfs/inode.c +4 -0
@@ -160,7 +160,9 @@ static const struct file_operations openpromfs_prop_ops = { .read = seq_read, .llseek = seq_lseek, .release = seq_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = NULL, +#endif };static int openpromfs_readdir (struct file *,void *,filldir_t );
@@ -169,7 +171,9 @@ static const struct file_operations openprom_operations = { .read = generic_read_dir, .readdir = openpromfs_readdir, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static struct dentry *openpromfs_lookup (struct inode *,struct dentry *,struct nameidata *);
fs/pipe.c +6 -3
@@ -1056,9 +1056,6 @@ struct file *fifo_file_restore(struct ckpt_ctx *ctx, struct ckpt_hdr_file *ptr) return file; } -#else -#define pipe_file_checkpoint NULL -#define fifo_file_checkpoint NULL#endif /* CONFIG_CHECKPOINT */ /*
@@ -1077,7 +1074,9 @@ const struct file_operations read_pipefifo_fops = { .open = pipe_read_open, .release = pipe_read_release, .fasync = pipe_read_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = pipe_file_checkpoint, +#endif };const struct file_operations write_pipefifo_fops = {
@@ -1090,7 +1089,9 @@ const struct file_operations write_pipefifo_fops = { .open = pipe_write_open, .release = pipe_write_release, .fasync = pipe_write_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = pipe_file_checkpoint, +#endif };const struct file_operations rdwr_pipefifo_fops = {
@@ -1104,7 +1105,9 @@ const struct file_operations rdwr_pipefifo_fops = { .open = pipe_rdwr_open, .release = pipe_rdwr_release, .fasync = pipe_rdwr_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = pipe_file_checkpoint, +#endif };struct pipe_inode_info *alloc_pipe_info (struct inode *inode)
fs/qnx4/dir.c +2 -0
@@ -80,7 +80,9 @@ const struct file_operations qnx4_dir_operations = .read = generic_read_dir, .readdir = qnx4_readdir, .fsync = simple_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; const struct inode_operations qnx4_dir_inode_operations =
fs/ramfs/file-mmu.c +2 -0
@@ -47,7 +47,9 @@ const struct file_operations ramfs_file_operations = { .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations ramfs_file_inode_operations = {
fs/ramfs/file-nommu.c +2 -0
@@ -45,7 +45,9 @@ const struct file_operations ramfs_file_operations = { .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations ramfs_file_inode_operations = {
fs/read_write.c +2 -0
@@ -27,7 +27,9 @@ const struct file_operations generic_ro_fops = { .aio_read = generic_file_aio_read, .mmap = generic_file_readonly_mmap, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };EXPORT_SYMBOL (generic_ro_fops);
fs/reiserfs/dir.c +2 -0
@@ -24,7 +24,9 @@ const struct file_operations reiserfs_dir_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = reiserfs_compat_ioctl,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; static int reiserfs_dir_fsync(struct file *filp, struct dentry *dentry,
fs/reiserfs/file.c +2 -0
@@ -297,7 +297,9 @@ const struct file_operations reiserfs_file_operations = { .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations reiserfs_file_inode_operations = {
fs/romfs/mmap-nommu.c +2 -0
@@ -72,5 +72,7 @@ const struct file_operations romfs_ro_fops = { .splice_read = generic_file_splice_read, .mmap = romfs_mmap, .get_unmapped_area = romfs_get_unmapped_area, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };
fs/romfs/super.c +2 -0
@@ -282,7 +282,9 @@ error:static const struct file_operations romfs_dir_operations = { .read = generic_read_dir, .readdir = romfs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static const struct inode_operations romfs_dir_inode_operations = {
fs/squashfs/dir.c +2 -0
@@ -232,5 +232,7 @@ failed_read:const struct file_operations squashfs_dir_ops = { .read = generic_read_dir, .readdir = squashfs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };
fs/sysv/dir.c +2 -0
@@ -25,7 +25,9 @@ const struct file_operations sysv_dir_operations = { .read = generic_read_dir, .readdir = sysv_readdir, .fsync = simple_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static inline void dir_put_page (struct page *page)
fs/sysv/file.c +2 -0
@@ -28,7 +28,9 @@ const struct file_operations sysv_file_operations = { .mmap = generic_file_mmap, .fsync = simple_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations sysv_file_inode_operations = {
fs/ubifs/debug.c +3 -1
@@ -2623,8 +2623,10 @@ static ssize_t write_debugfs_file(struct file *file, const char __user *buf,static const struct file_operations dfs_fops = { .open = open_debugfs_file, .write = write_debugfs_file, - .checkpoint = generic_file_checkpoint, .owner =THIS_MODULE , +#ifdef CONFIG_CHECKPOINT + .checkpoint = generic_file_checkpoint, +#endif };/**
fs/ubifs/dir.c +2 -0
@@ -1228,5 +1228,7 @@ const struct file_operations ubifs_dir_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = ubifs_compat_ioctl,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };
fs/ubifs/file.c +2 -0
@@ -1582,5 +1582,7 @@ const struct file_operations ubifs_file_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = ubifs_compat_ioctl,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };
fs/udf/dir.c +2 -0
@@ -211,5 +211,7 @@ const struct file_operations udf_dir_operations = { .readdir = udf_readdir, .ioctl = udf_ioctl, .fsync = simple_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };
fs/udf/file.c +2 -0
@@ -215,7 +215,9 @@ const struct file_operations udf_file_operations = { .fsync = simple_fsync, .splice_read = generic_file_splice_read, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations udf_file_inode_operations = {
fs/ufs/dir.c +2 -0
@@ -668,5 +668,7 @@ const struct file_operations ufs_dir_operations = { .readdir = ufs_readdir, .fsync = simple_fsync, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };
fs/ufs/file.c +2 -0
@@ -43,5 +43,7 @@ const struct file_operations ufs_file_operations = { .open = generic_file_open, .fsync = simple_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };
fs/xfs/linux-2.6/xfs_file.c +4 -0
@@ -259,7 +259,9 @@ const struct file_operations xfs_file_operations = {#ifdef HAVE_FOP_OPEN_EXEC .open_exec = xfs_file_open_exec,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct file_operations xfs_dir_file_operations = {
@@ -272,7 +274,9 @@ const struct file_operations xfs_dir_file_operations = { .compat_ioctl = xfs_file_compat_ioctl, #endif .fsync = xfs_file_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static const struct vm_operations_struct xfs_file_vm_ops = {
include/linux/fs.h +2 -2
@@ -1513,8 +1513,10 @@ struct file_operations {ssize_t (*splice_write)(struct pipe_inode_info *,struct file *,loff_t *,size_t ,unsigned int );ssize_t (*splice_read)(struct file *,loff_t *,struct pipe_inode_info *,size_t ,unsigned int );int (*setlease)(struct file *,long ,struct file_lock **); +#ifdef CONFIG_CHECKPOINT int (*checkpoint)(struct ckpt_ctx *,struct file *);int (*collect)(struct ckpt_ctx *,struct file *); +#endif };struct inode_operations {
@@ -2330,8 +2332,6 @@ void inode_set_bytes(struct inode *inode, loff_t bytes);#ifdef CONFIG_CHECKPOINT extern int generic_file_checkpoint (struct ckpt_ctx *ctx,struct file *file); -#else -#define generic_file_checkpoint NULL#endif extern int vfs_readdir (struct file *,filldir_t ,void *);
mm/filemap.c +0 -2
@@ -1678,8 +1678,6 @@ int filemap_restore(struct ckpt_ctx *ctx, }return ret; } -#else /* !CONFIG_CHECKPOINT */ -#define filemap_checkpoint NULL#endif const struct vm_operations_struct generic_file_vm_ops = {
mm/mmap.c +0 -2
@@ -2423,8 +2423,6 @@ int special_mapping_restore(struct ckpt_ctx *ctx,return ret; } -#else /* !CONFIG_CHECKPOINT */ -#define special_mapping_checkpoint NULL#endif static const struct vm_operations_struct special_mapping_vmops = {
Signature · 1 line
1.6.1
Matt Helsley
Reviewed-byQuoted 10 lines · Serge E. Hallyn
It is a matter of preference, and what we had before was correct, but we've been asked to just put the method under #ifdef
CONFIG_CHECKPOINT. So do so, and get rid of the #else dummy defines.I did quite a bit of find . -type f -print0 | xargs -0 grep -Hn and hope I found all cases. Even a make allyesconfig didn't point to anything I might have missed.
Signed-off-by Serge E. Hallyn <serue-r/[email protected]>
Looks good to me. I don't know if we should add:
or merely list it in a changelog for the f_ops patch(es).
Quoted 1,318 lines
--- drivers/char/mem.c | 4 ++++ drivers/char/random.c | 4 ++++ drivers/char/tty_io.c | 7 ++++--- fs/adfs/dir.c | 2 ++ fs/adfs/file.c | 2 ++ fs/affs/dir.c | 2 ++ fs/affs/file.c | 2 ++ fs/befs/linuxvfs.c | 2 ++ fs/bfs/dir.c | 2 ++ fs/bfs/file.c | 2 ++ fs/btrfs/file.c | 2 ++ fs/btrfs/inode.c | 2 ++ fs/btrfs/super.c | 2 ++ fs/cramfs/inode.c | 2 ++ fs/ecryptfs/file.c | 4 ++++ fs/ecryptfs/miscdev.c | 2 ++ fs/efs/dir.c | 2 ++ fs/eventfd.c | 4 ++-- fs/eventpoll.c | 5 ++--- fs/exofs/dir.c | 2 ++ fs/exofs/file.c | 4 +++- fs/ext2/dir.c | 2 ++ fs/ext2/file.c | 4 ++++ fs/ext3/dir.c | 2 ++ fs/ext3/file.c | 2 ++ fs/ext4/dir.c | 2 ++ fs/ext4/file.c | 2 ++ fs/fat/dir.c | 2 ++ fs/fat/file.c | 2 ++ fs/freevxfs/vxfs_lookup.c | 2 ++ fs/hfs/dir.c | 2 ++ fs/hfs/inode.c | 2 ++ fs/hfsplus/dir.c | 2 ++ fs/hfsplus/inode.c | 2 ++ fs/hostfs/hostfs_kern.c | 8 ++++++-- fs/hpfs/dir.c | 2 ++ fs/hpfs/file.c | 2 ++ fs/hppfs/hppfs.c | 4 ++++ fs/isofs/dir.c | 2 ++ fs/jffs2/dir.c | 2 ++ fs/jffs2/file.c | 2 ++ fs/jfs/file.c | 2 ++ fs/jfs/namei.c | 2 ++ fs/minix/dir.c | 2 ++ fs/minix/file.c | 2 ++ fs/nfs/dir.c | 2 ++ fs/nfs/file.c | 2 ++ fs/nilfs2/dir.c | 2 ++ fs/nilfs2/file.c | 4 +++- fs/ntfs/dir.c | 2 ++ fs/ntfs/file.c | 2 ++ fs/omfs/dir.c | 2 ++ fs/omfs/file.c | 2 ++ fs/openpromfs/inode.c | 4 ++++ fs/pipe.c | 9 ++++++--- fs/qnx4/dir.c | 2 ++ fs/ramfs/file-mmu.c | 2 ++ fs/ramfs/file-nommu.c | 2 ++ fs/read_write.c | 2 ++ fs/reiserfs/dir.c | 2 ++ fs/reiserfs/file.c | 2 ++ fs/romfs/mmap-nommu.c | 2 ++ fs/romfs/super.c | 2 ++ fs/squashfs/dir.c | 2 ++ fs/sysv/dir.c | 2 ++ fs/sysv/file.c | 2 ++ fs/ubifs/debug.c | 4 +++- fs/ubifs/dir.c | 2 ++ fs/ubifs/file.c | 2 ++ fs/udf/dir.c | 2 ++ fs/udf/file.c | 2 ++ fs/ufs/dir.c | 2 ++ fs/ufs/file.c | 2 ++ fs/xfs/linux-2.6/xfs_file.c | 4 ++++ include/linux/fs.h | 4 ++-- mm/filemap.c | 2 -- mm/mmap.c | 2 -- 77 files changed, 177 insertions(+), 22 deletions(-)drivers/char/mem.c +4
-0@@ -763,7 +763,9 @@ static const struct file_operations null_fops = { .read = read_null, .write = write_null, .splice_write = splice_write_null, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };#ifdef CONFIG_DEVPORT @@ -780,7 +782,9 @@ static const struct file_operations zero_fops = { .read = read_zero, .write = write_zero, .mmap = mmap_zero, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };/* drivers/char/random.c +4
-0@@ -1169,7 +1169,9 @@ const struct file_operations random_fops = { .poll = random_poll, .unlocked_ioctl = random_ioctl, .fasync = random_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct file_operations urandom_fops = {@@ -1177,7 +1179,9 @@ const struct file_operations urandom_fops = { .write = random_write, .unlocked_ioctl = random_ioctl, .fasync = random_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };/*************************************************************** drivers/char/tty_io.c +4
-3@@ -155,9 +155,6 @@ static int tty_fasync(int fd, struct file *filp, int on);#ifdef CONFIG_CHECKPOINT static int tty_file_checkpoint (struct ckpt_ctx *ctx,struct file *file);static int tty_file_collect (struct ckpt_ctx *ctx,struct file *file); -#else -#define tty_file_checkpoint NULL -#define tty_file_collect NULL#endif /* CONFIG_CHECKPOINT */ static void release_tty (struct tty_struct *tty,int idx);static void __proc_set_tty (struct task_struct *tsk,struct tty_struct *tty);@@ -425,8 +422,10 @@ static const struct file_operations tty_fops = { .open = tty_open, .release = tty_release, .fasync = tty_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = tty_file_checkpoint, .collect = tty_file_collect, +#endif }; static const struct file_operations console_fops = {@@ -449,8 +448,10 @@ static const struct file_operations hung_up_tty_fops = { .unlocked_ioctl = hung_up_tty_ioctl, .compat_ioctl = hung_up_tty_compat_ioctl, .release = tty_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = tty_file_checkpoint, .collect = tty_file_collect, +#endif };static DEFINE_SPINLOCK (redirect_lock);fs/adfs/dir.c +2
-0@@ -198,7 +198,9 @@ const struct file_operations adfs_dir_operations = { .llseek = generic_file_llseek, .readdir = adfs_readdir, .fsync = simple_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; static intfs/adfs/file.c +2
-0@@ -30,7 +30,9 @@ const struct file_operations adfs_file_operations = { .write = do_sync_write, .aio_write = generic_file_aio_write, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations adfs_file_inode_operations = {fs/affs/dir.c +2
-0@@ -22,7 +22,9 @@ const struct file_operations affs_dir_operations = { .llseek = generic_file_llseek, .readdir = affs_readdir, .fsync = affs_file_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };/* fs/affs/file.c +2
-0@@ -36,7 +36,9 @@ const struct file_operations affs_file_operations = { .release = affs_file_release, .fsync = affs_file_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations affs_file_inode_operations = {fs/befs/linuxvfs.c +2
-0@@ -67,7 +67,9 @@ static const struct file_operations befs_dir_operations = { .read = generic_read_dir, .readdir = befs_readdir, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static const struct inode_operations befs_dir_inode_operations = {fs/bfs/dir.c +2
-0@@ -80,7 +80,9 @@ const struct file_operations bfs_dir_operations = { .readdir = bfs_readdir, .fsync = simple_fsync, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };extern void dump_imap (const char *,struct super_block *);fs/bfs/file.c +2
-0@@ -29,7 +29,9 @@ const struct file_operations bfs_file_operations = { .aio_write = generic_file_aio_write, .mmap = generic_file_mmap, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; static int bfs_move_block(unsigned long from, unsigned long to,fs/btrfs/file.c +2
-0@@ -1164,5 +1164,7 @@ const struct file_operations btrfs_file_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = btrfs_ioctl,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/btrfs/inode.c +2
-0@@ -5971,7 +5971,9 @@ static const struct file_operations btrfs_dir_file_operations = {#endif .release = btrfs_release_file, .fsync = btrfs_sync_file, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static struct extent_io_ops btrfs_extent_io_ops = {fs/btrfs/super.c +2
-0@@ -718,7 +718,9 @@ static const struct file_operations btrfs_ctl_fops = { .unlocked_ioctl = btrfs_control_ioctl, .compat_ioctl = btrfs_control_ioctl, .owner = THIS_MODULE, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static struct miscdevice btrfs_misc = {fs/cramfs/inode.c +2
-0@@ -532,7 +532,9 @@ static const struct file_operations cramfs_directory_operations = { .llseek = generic_file_llseek, .read = generic_read_dir, .readdir = cramfs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static const struct inode_operations cramfs_dir_inode_operations = {fs/ecryptfs/file.c +4
-0@@ -305,7 +305,9 @@ const struct file_operations ecryptfs_dir_fops = { .fsync = ecryptfs_fsync, .fasync = ecryptfs_fasync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct file_operations ecryptfs_main_fops = {@@ -323,7 +325,9 @@ const struct file_operations ecryptfs_main_fops = { .fsync = ecryptfs_fsync, .fasync = ecryptfs_fasync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; static intfs/ecryptfs/miscdev.c +2
-0@@ -481,7 +481,9 @@ static const struct file_operations ecryptfs_miscdev_fops = { .read = ecryptfs_miscdev_read, .write = ecryptfs_miscdev_write, .release = ecryptfs_miscdev_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static struct miscdevice ecryptfs_miscdev = {fs/efs/dir.c +2
-0@@ -13,7 +13,9 @@ const struct file_operations efs_dir_operations = { .llseek = generic_file_llseek, .read = generic_read_dir, .readdir = efs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations efs_dir_inode_operations = {fs/eventfd.c +2
-2@@ -337,8 +337,6 @@ struct file *eventfd_restore(struct ckpt_ctx *ckpt_ctx, }return evfile; } -#else -#define eventfd_checkpoint NULL#endif static const struct file_operations eventfd_fops = {@@ -346,7 +344,9 @@ static const struct file_operations eventfd_fops = { .poll = eventfd_poll, .read = eventfd_read, .write = eventfd_write, +#ifdef CONFIG_CHECKPOINT .checkpoint = eventfd_checkpoint, +#endif };/** fs/eventpoll.c +2
-3@@ -677,17 +677,16 @@ static unsigned int ep_eventpoll_poll(struct file *file, poll_table *wait)#ifdef CONFIG_CHECKPOINT static int ep_eventpoll_checkpoint (struct ckpt_ctx *ctx,struct file *file);static int ep_file_collect (struct ckpt_ctx *ctx,struct file *file); -#else -#define ep_eventpoll_checkpoint NULL -#define ep_file_collect NULL#endif /* File callbacks that implement the eventpoll file behaviour */ static const struct file_operations eventpoll_fops = { .release = ep_eventpoll_release, .poll = ep_eventpoll_poll, +#ifdef CONFIG_CHECKPOINT .checkpoint = ep_eventpoll_checkpoint, .collect = ep_file_collect, +#endif };/* Fast test to see if the file is an evenpoll file */ fs/exofs/dir.c +2
-0@@ -667,5 +667,7 @@ const struct file_operations exofs_dir_operations = { .llseek = generic_file_llseek, .read = generic_read_dir, .readdir = exofs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/exofs/file.c +3
-1@@ -73,7 +73,6 @@ static int exofs_flush(struct file *file, fl_owner_t id)const struct file_operations exofs_file_operations = { .llseek = generic_file_llseek, - .checkpoint = generic_file_checkpoint, .read = do_sync_read, .write = do_sync_write, .aio_read = generic_file_aio_read,@@ -85,6 +84,9 @@ const struct file_operations exofs_file_operations = { .flush = exofs_flush, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, +#ifdef CONFIG_CHECKPOINT + .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations exofs_file_inode_operations = {fs/ext2/dir.c +2
-0@@ -722,5 +722,7 @@ const struct file_operations ext2_dir_operations = { .compat_ioctl = ext2_compat_ioctl, #endif .fsync = ext2_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/ext2/file.c +4
-0@@ -75,7 +75,9 @@ const struct file_operations ext2_file_operations = { .fsync = ext2_fsync, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif /* CONFIG_CHECKPOINT */ };#ifdef CONFIG_EXT2_FS_XIP @@ -91,7 +93,9 @@ const struct file_operations ext2_xip_file_operations = { .open = generic_file_open, .release = ext2_release_file, .fsync = ext2_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif /* CONFIG_CHECKPOINT */ };#endif fs/ext3/dir.c +2
-0@@ -48,7 +48,9 @@ const struct file_operations ext3_dir_operations = {#endif .fsync = ext3_sync_file, /* BKL held */ .release = ext3_release_dir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/ext3/file.c +2
-0@@ -67,7 +67,9 @@ const struct file_operations ext3_file_operations = { .fsync = ext3_sync_file, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations ext3_file_inode_operations = {fs/ext4/dir.c +2
-0@@ -48,7 +48,9 @@ const struct file_operations ext4_dir_operations = {#endif .fsync = ext4_sync_file, .release = ext4_release_dir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/ext4/file.c +2
-0@@ -149,7 +149,9 @@ const struct file_operations ext4_file_operations = { .fsync = ext4_sync_file, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations ext4_file_inode_operations = {fs/fat/dir.c +2
-0@@ -841,7 +841,9 @@ const struct file_operations fat_dir_operations = { .compat_ioctl = fat_compat_dir_ioctl, #endif .fsync = fat_file_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; static int fat_get_short_entry(struct inode *dir, loff_t *pos,fs/fat/file.c +2
-0@@ -162,7 +162,9 @@ const struct file_operations fat_file_operations = { .ioctl = fat_generic_ioctl, .fsync = fat_file_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static int fat_cont_expand (struct inode *inode,loff_t size)fs/freevxfs/vxfs_lookup.c +2
-0@@ -58,7 +58,9 @@ const struct inode_operations vxfs_dir_inode_ops = {const struct file_operations vxfs_dir_operations = { .readdir = vxfs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/hfs/dir.c +2
-0@@ -329,7 +329,9 @@ const struct file_operations hfs_dir_operations = { .readdir = hfs_readdir, .llseek = generic_file_llseek, .release = hfs_dir_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations hfs_dir_inode_operations = {fs/hfs/inode.c +2
-0@@ -607,7 +607,9 @@ static const struct file_operations hfs_file_operations = { .fsync = file_fsync, .open = hfs_file_open, .release = hfs_file_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static const struct inode_operations hfs_file_inode_operations = {fs/hfsplus/dir.c +2
-0@@ -497,5 +497,7 @@ const struct file_operations hfsplus_dir_operations = { .ioctl = hfsplus_ioctl, .llseek = generic_file_llseek, .release = hfsplus_dir_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/hfsplus/inode.c +2
-0@@ -286,7 +286,9 @@ static const struct file_operations hfsplus_file_operations = { .open = hfsplus_file_open, .release = hfsplus_file_release, .ioctl = hfsplus_ioctl, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };struct inode *hfsplus_new_inode (struct super_block *sb,int mode)fs/hostfs/hostfs_kern.c +6
-2@@ -417,7 +417,6 @@ int hostfs_fsync(struct file *file, struct dentry *dentry, int datasync)static const struct file_operations hostfs_file_fops = { .llseek = generic_file_llseek, - .checkpoint = generic_file_checkpoint, .read = do_sync_read, .splice_read = generic_file_splice_read, .aio_read = generic_file_aio_read,@@ -427,13 +426,18 @@ static const struct file_operations hostfs_file_fops = { .open = hostfs_file_open, .release = NULL, .fsync = hostfs_fsync, +#ifdef CONFIG_CHECKPOINT + .checkpoint = generic_file_checkpoint, +#endif };static const struct file_operations hostfs_dir_fops = { .llseek = generic_file_llseek, - .checkpoint = generic_file_checkpoint, .readdir = hostfs_readdir, .read = generic_read_dir, +#ifdef CONFIG_CHECKPOINT + .checkpoint = generic_file_checkpoint, +#endif };int hostfs_writepage (struct page *page,struct writeback_control *wbc)fs/hpfs/dir.c +2
-0@@ -322,5 +322,7 @@ const struct file_operations hpfs_dir_ops = .readdir = hpfs_readdir, .release = hpfs_dir_release, .fsync = hpfs_file_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/hpfs/file.c +2
-0@@ -139,7 +139,9 @@ const struct file_operations hpfs_file_ops = .release = hpfs_file_release, .fsync = hpfs_file_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; const struct inode_operations hpfs_file_iops =fs/hppfs/hppfs.c +4
-0@@ -546,7 +546,9 @@ static const struct file_operations hppfs_file_fops = { .read = hppfs_read, .write = hppfs_write, .open = hppfs_open, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };struct hppfs_dirent {@@ -598,7 +600,9 @@ static const struct file_operations hppfs_dir_fops = { .readdir = hppfs_readdir, .open = hppfs_dir_open, .fsync = hppfs_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static int hppfs_statfs (struct dentry *dentry,struct kstatfs *sf)fs/isofs/dir.c +2
-0@@ -273,7 +273,9 @@ const struct file_operations isofs_dir_operations = { .read = generic_read_dir, .readdir = isofs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };/* fs/jffs2/dir.c +2
-0@@ -41,7 +41,9 @@ const struct file_operations jffs2_dir_operations = .unlocked_ioctl=jffs2_ioctl, .fsync = jffs2_fsync, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/jffs2/file.c +2
-0@@ -50,7 +50,9 @@ const struct file_operations jffs2_file_operations = .mmap = generic_file_readonly_mmap, .fsync = jffs2_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };/* jffs2_file_inode_operations */ fs/jfs/file.c +2
-0@@ -116,5 +116,7 @@ const struct file_operations jfs_file_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = jfs_compat_ioctl,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/jfs/namei.c +2
-0@@ -1556,7 +1556,9 @@ const struct file_operations jfs_dir_operations = { .compat_ioctl = jfs_compat_ioctl, #endif .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static int jfs_ci_hash (struct dentry *dir,struct qstr *this)fs/minix/dir.c +2
-0@@ -23,7 +23,9 @@ const struct file_operations minix_dir_operations = { .read = generic_read_dir, .readdir = minix_readdir, .fsync = simple_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static inline void dir_put_page (struct page *page)fs/minix/file.c +2
-0@@ -21,7 +21,9 @@ const struct file_operations minix_file_operations = { .mmap = generic_file_mmap, .fsync = simple_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations minix_file_inode_operations = {fs/nfs/dir.c +2
-0@@ -63,7 +63,9 @@ const struct file_operations nfs_dir_operations = { .open = nfs_opendir, .release = nfs_release, .fsync = nfs_fsync_dir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations nfs_dir_inode_operations = {fs/nfs/file.c +2
-0@@ -78,7 +78,9 @@ const struct file_operations nfs_file_operations = { .splice_write = nfs_file_splice_write, .check_flags = nfs_check_flags, .setlease = nfs_setlease, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations nfs_file_inode_operations = {fs/nilfs2/dir.c +2
-0@@ -702,5 +702,7 @@ const struct file_operations nilfs_dir_operations = { .compat_ioctl = nilfs_ioctl,#endif /* CONFIG_COMPAT */ .fsync = nilfs_sync_file, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/nilfs2/file.c +3
-1@@ -136,7 +136,6 @@ static int nilfs_file_mmap(struct file *file, struct vm_area_struct *vma)*/ const struct file_operations nilfs_file_operations = { .llseek = generic_file_llseek, - .checkpoint = generic_file_checkpoint, .read = do_sync_read, .write = do_sync_write, .aio_read = generic_file_aio_read,@@ -150,6 +149,9 @@ const struct file_operations nilfs_file_operations = {/* .release = nilfs_release_file, */ .fsync = nilfs_sync_file, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT + .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations nilfs_file_inode_operations = {fs/ntfs/dir.c +2
-0@@ -1572,5 +1572,7 @@ const struct file_operations ntfs_dir_ops = {/*.ioctl = ,*/ /* Perform function on the mounted filesystem. */ .open = ntfs_dir_open, /* Open directory. */ +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/ntfs/file.c +2
-0@@ -2234,7 +2234,9 @@ const struct file_operations ntfs_file_ops = {on the ntfs partition. We do not need to care about the data source. */ +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations ntfs_file_inode_ops = {fs/omfs/dir.c +2
-0@@ -502,5 +502,7 @@ const struct file_operations omfs_dir_operations = { .read = generic_read_dir, .readdir = omfs_readdir, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/omfs/file.c +2
-0@@ -331,7 +331,9 @@ const struct file_operations omfs_file_operations = { .mmap = generic_file_mmap, .fsync = simple_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations omfs_file_inops = {fs/openpromfs/inode.c +4
-0@@ -160,7 +160,9 @@ static const struct file_operations openpromfs_prop_ops = { .read = seq_read, .llseek = seq_lseek, .release = seq_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = NULL, +#endif };static int openpromfs_readdir (struct file *,void *,filldir_t );@@ -169,7 +171,9 @@ static const struct file_operations openprom_operations = { .read = generic_read_dir, .readdir = openpromfs_readdir, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static struct dentry *openpromfs_lookup (struct inode *,struct dentry *,struct nameidata *);fs/pipe.c +6
-3@@ -1056,9 +1056,6 @@ struct file *fifo_file_restore(struct ckpt_ctx *ctx, struct ckpt_hdr_file *ptr) return file; } -#else -#define pipe_file_checkpoint NULL -#define fifo_file_checkpoint NULL#endif /* CONFIG_CHECKPOINT */ /* @@ -1077,7 +1074,9 @@ const struct file_operations read_pipefifo_fops = { .open = pipe_read_open, .release = pipe_read_release, .fasync = pipe_read_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = pipe_file_checkpoint, +#endif };const struct file_operations write_pipefifo_fops = {@@ -1090,7 +1089,9 @@ const struct file_operations write_pipefifo_fops = { .open = pipe_write_open, .release = pipe_write_release, .fasync = pipe_write_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = pipe_file_checkpoint, +#endif };const struct file_operations rdwr_pipefifo_fops = {@@ -1104,7 +1105,9 @@ const struct file_operations rdwr_pipefifo_fops = { .open = pipe_rdwr_open, .release = pipe_rdwr_release, .fasync = pipe_rdwr_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = pipe_file_checkpoint, +#endif };struct pipe_inode_info *alloc_pipe_info (struct inode *inode)fs/qnx4/dir.c +2
-0@@ -80,7 +80,9 @@ const struct file_operations qnx4_dir_operations = .read = generic_read_dir, .readdir = qnx4_readdir, .fsync = simple_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; const struct inode_operations qnx4_dir_inode_operations =fs/ramfs/file-mmu.c +2
-0@@ -47,7 +47,9 @@ const struct file_operations ramfs_file_operations = { .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations ramfs_file_inode_operations = {fs/ramfs/file-nommu.c +2
-0@@ -45,7 +45,9 @@ const struct file_operations ramfs_file_operations = { .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations ramfs_file_inode_operations = {fs/read_write.c +2
-0@@ -27,7 +27,9 @@ const struct file_operations generic_ro_fops = { .aio_read = generic_file_aio_read, .mmap = generic_file_readonly_mmap, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };EXPORT_SYMBOL (generic_ro_fops);fs/reiserfs/dir.c +2
-0@@ -24,7 +24,9 @@ const struct file_operations reiserfs_dir_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = reiserfs_compat_ioctl,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; static int reiserfs_dir_fsync(struct file *filp, struct dentry *dentry,fs/reiserfs/file.c +2
-0@@ -297,7 +297,9 @@ const struct file_operations reiserfs_file_operations = { .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations reiserfs_file_inode_operations = {fs/romfs/mmap-nommu.c +2
-0@@ -72,5 +72,7 @@ const struct file_operations romfs_ro_fops = { .splice_read = generic_file_splice_read, .mmap = romfs_mmap, .get_unmapped_area = romfs_get_unmapped_area, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/romfs/super.c +2
-0@@ -282,7 +282,9 @@ error:static const struct file_operations romfs_dir_operations = { .read = generic_read_dir, .readdir = romfs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static const struct inode_operations romfs_dir_inode_operations = {fs/squashfs/dir.c +2
-0@@ -232,5 +232,7 @@ failed_read:const struct file_operations squashfs_dir_ops = { .read = generic_read_dir, .readdir = squashfs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/sysv/dir.c +2
-0@@ -25,7 +25,9 @@ const struct file_operations sysv_dir_operations = { .read = generic_read_dir, .readdir = sysv_readdir, .fsync = simple_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static inline void dir_put_page (struct page *page)fs/sysv/file.c +2
-0@@ -28,7 +28,9 @@ const struct file_operations sysv_file_operations = { .mmap = generic_file_mmap, .fsync = simple_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations sysv_file_inode_operations = {fs/ubifs/debug.c +3
-1@@ -2623,8 +2623,10 @@ static ssize_t write_debugfs_file(struct file *file, const char __user *buf,static const struct file_operations dfs_fops = { .open = open_debugfs_file, .write = write_debugfs_file, - .checkpoint = generic_file_checkpoint, .owner =THIS_MODULE , +#ifdef CONFIG_CHECKPOINT + .checkpoint = generic_file_checkpoint, +#endif };/** fs/ubifs/dir.c +2
-0@@ -1228,5 +1228,7 @@ const struct file_operations ubifs_dir_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = ubifs_compat_ioctl,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/ubifs/file.c +2
-0@@ -1582,5 +1582,7 @@ const struct file_operations ubifs_file_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = ubifs_compat_ioctl,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/udf/dir.c +2
-0@@ -211,5 +211,7 @@ const struct file_operations udf_dir_operations = { .readdir = udf_readdir, .ioctl = udf_ioctl, .fsync = simple_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/udf/file.c +2
-0@@ -215,7 +215,9 @@ const struct file_operations udf_file_operations = { .fsync = simple_fsync, .splice_read = generic_file_splice_read, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations udf_file_inode_operations = {fs/ufs/dir.c +2
-0@@ -668,5 +668,7 @@ const struct file_operations ufs_dir_operations = { .readdir = ufs_readdir, .fsync = simple_fsync, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/ufs/file.c +2
-0@@ -43,5 +43,7 @@ const struct file_operations ufs_file_operations = { .open = generic_file_open, .fsync = simple_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/xfs/linux-2.6/xfs_file.c +4
-0@@ -259,7 +259,9 @@ const struct file_operations xfs_file_operations = {#ifdef HAVE_FOP_OPEN_EXEC .open_exec = xfs_file_open_exec,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct file_operations xfs_dir_file_operations = {@@ -272,7 +274,9 @@ const struct file_operations xfs_dir_file_operations = { .compat_ioctl = xfs_file_compat_ioctl, #endif .fsync = xfs_file_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static const struct vm_operations_struct xfs_file_vm_ops = {include/linux/fs.h +2
-2@@ -1513,8 +1513,10 @@ struct file_operations {ssize_t (*splice_write)(struct pipe_inode_info *,struct file *,loff_t *,size_t ,unsigned int );ssize_t (*splice_read)(struct file *,loff_t *,struct pipe_inode_info *,size_t ,unsigned int );int (*setlease)(struct file *,long ,struct file_lock **); +#ifdef CONFIG_CHECKPOINT int (*checkpoint)(struct ckpt_ctx *,struct file *);int (*collect)(struct ckpt_ctx *,struct file *); +#endif };struct inode_operations {@@ -2330,8 +2332,6 @@ void inode_set_bytes(struct inode *inode, loff_t bytes);#ifdef CONFIG_CHECKPOINT extern int generic_file_checkpoint (struct ckpt_ctx *ctx,struct file *file); -#else -#define generic_file_checkpoint NULL#endif extern int vfs_readdir (struct file *,filldir_t ,void *);mm/filemap.c +0
-2@@ -1678,8 +1678,6 @@ int filemap_restore(struct ckpt_ctx *ctx, }return ret; } -#else /* !CONFIG_CHECKPOINT */ -#define filemap_checkpoint NULL#endif const struct vm_operations_struct generic_file_vm_ops = {mm/mmap.c +0
-2@@ -2423,8 +2423,6 @@ int special_mapping_restore(struct ckpt_ctx *ctx,return ret; } -#else /* !CONFIG_CHECKPOINT */ -#define special_mapping_checkpoint NULL#endif static const struct vm_operations_struct special_mapping_vmops = {Signature · 6 lines
1.6.1 _______________________________________________ Containers mailing list Containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org https://lists.linux-foundation.org/mailman/listinfo/containers
Quoted 10 lines · Matt Helsley
Quoted 9 lines · Serge E. Hallyn
It is a matter of preference, and what we had before was correct, but we've been asked to just put the method under #ifdef
CONFIG_CHECKPOINT. So do so, and get rid of the #else dummy defines.I did quite a bit of find . -type f -print0 | xargs -0 grep -Hn and hope I found all cases. Even a make allyesconfig didn't point to anything I might have missed.
Quoted 8 lines
Quoted 1 line
Signed-off-by Serge E. Hallyn <serue-r/[email protected]>Looks good to me. I don't know if we should add:
Cc Nick Piggin <[email protected]>or merely list it in a changelog for the
f_opspatch(es).
I was assuming the latter. I can re-send with cc:s, but I can't see them really wanting to see this rather than a fixed original patchset with full cc:s. Let me know if you disagree.
Quoted 1 line
Reviewed-by Matt Helsley <matthltc-r/[email protected]>
Thanks,
-serge
Quoted 1,318 lines
Quoted 1,318 lines
--- drivers/char/mem.c | 4 ++++ drivers/char/random.c | 4 ++++ drivers/char/tty_io.c | 7 ++++--- fs/adfs/dir.c | 2 ++ fs/adfs/file.c | 2 ++ fs/affs/dir.c | 2 ++ fs/affs/file.c | 2 ++ fs/befs/linuxvfs.c | 2 ++ fs/bfs/dir.c | 2 ++ fs/bfs/file.c | 2 ++ fs/btrfs/file.c | 2 ++ fs/btrfs/inode.c | 2 ++ fs/btrfs/super.c | 2 ++ fs/cramfs/inode.c | 2 ++ fs/ecryptfs/file.c | 4 ++++ fs/ecryptfs/miscdev.c | 2 ++ fs/efs/dir.c | 2 ++ fs/eventfd.c | 4 ++-- fs/eventpoll.c | 5 ++--- fs/exofs/dir.c | 2 ++ fs/exofs/file.c | 4 +++- fs/ext2/dir.c | 2 ++ fs/ext2/file.c | 4 ++++ fs/ext3/dir.c | 2 ++ fs/ext3/file.c | 2 ++ fs/ext4/dir.c | 2 ++ fs/ext4/file.c | 2 ++ fs/fat/dir.c | 2 ++ fs/fat/file.c | 2 ++ fs/freevxfs/vxfs_lookup.c | 2 ++ fs/hfs/dir.c | 2 ++ fs/hfs/inode.c | 2 ++ fs/hfsplus/dir.c | 2 ++ fs/hfsplus/inode.c | 2 ++ fs/hostfs/hostfs_kern.c | 8 ++++++-- fs/hpfs/dir.c | 2 ++ fs/hpfs/file.c | 2 ++ fs/hppfs/hppfs.c | 4 ++++ fs/isofs/dir.c | 2 ++ fs/jffs2/dir.c | 2 ++ fs/jffs2/file.c | 2 ++ fs/jfs/file.c | 2 ++ fs/jfs/namei.c | 2 ++ fs/minix/dir.c | 2 ++ fs/minix/file.c | 2 ++ fs/nfs/dir.c | 2 ++ fs/nfs/file.c | 2 ++ fs/nilfs2/dir.c | 2 ++ fs/nilfs2/file.c | 4 +++- fs/ntfs/dir.c | 2 ++ fs/ntfs/file.c | 2 ++ fs/omfs/dir.c | 2 ++ fs/omfs/file.c | 2 ++ fs/openpromfs/inode.c | 4 ++++ fs/pipe.c | 9 ++++++--- fs/qnx4/dir.c | 2 ++ fs/ramfs/file-mmu.c | 2 ++ fs/ramfs/file-nommu.c | 2 ++ fs/read_write.c | 2 ++ fs/reiserfs/dir.c | 2 ++ fs/reiserfs/file.c | 2 ++ fs/romfs/mmap-nommu.c | 2 ++ fs/romfs/super.c | 2 ++ fs/squashfs/dir.c | 2 ++ fs/sysv/dir.c | 2 ++ fs/sysv/file.c | 2 ++ fs/ubifs/debug.c | 4 +++- fs/ubifs/dir.c | 2 ++ fs/ubifs/file.c | 2 ++ fs/udf/dir.c | 2 ++ fs/udf/file.c | 2 ++ fs/ufs/dir.c | 2 ++ fs/ufs/file.c | 2 ++ fs/xfs/linux-2.6/xfs_file.c | 4 ++++ include/linux/fs.h | 4 ++-- mm/filemap.c | 2 -- mm/mmap.c | 2 -- 77 files changed, 177 insertions(+), 22 deletions(-)drivers/char/mem.c +4
-0@@ -763,7 +763,9 @@ static const struct file_operations null_fops = { .read = read_null, .write = write_null, .splice_write = splice_write_null, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };#ifdef CONFIG_DEVPORT @@ -780,7 +782,9 @@ static const struct file_operations zero_fops = { .read = read_zero, .write = write_zero, .mmap = mmap_zero, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };/* drivers/char/random.c +4
-0@@ -1169,7 +1169,9 @@ const struct file_operations random_fops = { .poll = random_poll, .unlocked_ioctl = random_ioctl, .fasync = random_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct file_operations urandom_fops = {@@ -1177,7 +1179,9 @@ const struct file_operations urandom_fops = { .write = random_write, .unlocked_ioctl = random_ioctl, .fasync = random_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };/*************************************************************** drivers/char/tty_io.c +4
-3@@ -155,9 +155,6 @@ static int tty_fasync(int fd, struct file *filp, int on);#ifdef CONFIG_CHECKPOINT static int tty_file_checkpoint (struct ckpt_ctx *ctx,struct file *file);static int tty_file_collect (struct ckpt_ctx *ctx,struct file *file); -#else -#define tty_file_checkpoint NULL -#define tty_file_collect NULL#endif /* CONFIG_CHECKPOINT */ static void release_tty (struct tty_struct *tty,int idx);static void __proc_set_tty (struct task_struct *tsk,struct tty_struct *tty);@@ -425,8 +422,10 @@ static const struct file_operations tty_fops = { .open = tty_open, .release = tty_release, .fasync = tty_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = tty_file_checkpoint, .collect = tty_file_collect, +#endif }; static const struct file_operations console_fops = {@@ -449,8 +448,10 @@ static const struct file_operations hung_up_tty_fops = { .unlocked_ioctl = hung_up_tty_ioctl, .compat_ioctl = hung_up_tty_compat_ioctl, .release = tty_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = tty_file_checkpoint, .collect = tty_file_collect, +#endif };static DEFINE_SPINLOCK (redirect_lock);fs/adfs/dir.c +2
-0@@ -198,7 +198,9 @@ const struct file_operations adfs_dir_operations = { .llseek = generic_file_llseek, .readdir = adfs_readdir, .fsync = simple_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; static intfs/adfs/file.c +2
-0@@ -30,7 +30,9 @@ const struct file_operations adfs_file_operations = { .write = do_sync_write, .aio_write = generic_file_aio_write, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations adfs_file_inode_operations = {fs/affs/dir.c +2
-0@@ -22,7 +22,9 @@ const struct file_operations affs_dir_operations = { .llseek = generic_file_llseek, .readdir = affs_readdir, .fsync = affs_file_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };/* fs/affs/file.c +2
-0@@ -36,7 +36,9 @@ const struct file_operations affs_file_operations = { .release = affs_file_release, .fsync = affs_file_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations affs_file_inode_operations = {fs/befs/linuxvfs.c +2
-0@@ -67,7 +67,9 @@ static const struct file_operations befs_dir_operations = { .read = generic_read_dir, .readdir = befs_readdir, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static const struct inode_operations befs_dir_inode_operations = {fs/bfs/dir.c +2
-0@@ -80,7 +80,9 @@ const struct file_operations bfs_dir_operations = { .readdir = bfs_readdir, .fsync = simple_fsync, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };extern void dump_imap (const char *,struct super_block *);fs/bfs/file.c +2
-0@@ -29,7 +29,9 @@ const struct file_operations bfs_file_operations = { .aio_write = generic_file_aio_write, .mmap = generic_file_mmap, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; static int bfs_move_block(unsigned long from, unsigned long to,fs/btrfs/file.c +2
-0@@ -1164,5 +1164,7 @@ const struct file_operations btrfs_file_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = btrfs_ioctl,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/btrfs/inode.c +2
-0@@ -5971,7 +5971,9 @@ static const struct file_operations btrfs_dir_file_operations = {#endif .release = btrfs_release_file, .fsync = btrfs_sync_file, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static struct extent_io_ops btrfs_extent_io_ops = {fs/btrfs/super.c +2
-0@@ -718,7 +718,9 @@ static const struct file_operations btrfs_ctl_fops = { .unlocked_ioctl = btrfs_control_ioctl, .compat_ioctl = btrfs_control_ioctl, .owner = THIS_MODULE, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static struct miscdevice btrfs_misc = {fs/cramfs/inode.c +2
-0@@ -532,7 +532,9 @@ static const struct file_operations cramfs_directory_operations = { .llseek = generic_file_llseek, .read = generic_read_dir, .readdir = cramfs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static const struct inode_operations cramfs_dir_inode_operations = {fs/ecryptfs/file.c +4
-0@@ -305,7 +305,9 @@ const struct file_operations ecryptfs_dir_fops = { .fsync = ecryptfs_fsync, .fasync = ecryptfs_fasync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct file_operations ecryptfs_main_fops = {@@ -323,7 +325,9 @@ const struct file_operations ecryptfs_main_fops = { .fsync = ecryptfs_fsync, .fasync = ecryptfs_fasync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; static intfs/ecryptfs/miscdev.c +2
-0@@ -481,7 +481,9 @@ static const struct file_operations ecryptfs_miscdev_fops = { .read = ecryptfs_miscdev_read, .write = ecryptfs_miscdev_write, .release = ecryptfs_miscdev_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static struct miscdevice ecryptfs_miscdev = {fs/efs/dir.c +2
-0@@ -13,7 +13,9 @@ const struct file_operations efs_dir_operations = { .llseek = generic_file_llseek, .read = generic_read_dir, .readdir = efs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations efs_dir_inode_operations = {fs/eventfd.c +2
-2@@ -337,8 +337,6 @@ struct file *eventfd_restore(struct ckpt_ctx *ckpt_ctx, }return evfile; } -#else -#define eventfd_checkpoint NULL#endif static const struct file_operations eventfd_fops = {@@ -346,7 +344,9 @@ static const struct file_operations eventfd_fops = { .poll = eventfd_poll, .read = eventfd_read, .write = eventfd_write, +#ifdef CONFIG_CHECKPOINT .checkpoint = eventfd_checkpoint, +#endif };/** fs/eventpoll.c +2
-3@@ -677,17 +677,16 @@ static unsigned int ep_eventpoll_poll(struct file *file, poll_table *wait)#ifdef CONFIG_CHECKPOINT static int ep_eventpoll_checkpoint (struct ckpt_ctx *ctx,struct file *file);static int ep_file_collect (struct ckpt_ctx *ctx,struct file *file); -#else -#define ep_eventpoll_checkpoint NULL -#define ep_file_collect NULL#endif /* File callbacks that implement the eventpoll file behaviour */ static const struct file_operations eventpoll_fops = { .release = ep_eventpoll_release, .poll = ep_eventpoll_poll, +#ifdef CONFIG_CHECKPOINT .checkpoint = ep_eventpoll_checkpoint, .collect = ep_file_collect, +#endif };/* Fast test to see if the file is an evenpoll file */ fs/exofs/dir.c +2
-0@@ -667,5 +667,7 @@ const struct file_operations exofs_dir_operations = { .llseek = generic_file_llseek, .read = generic_read_dir, .readdir = exofs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/exofs/file.c +3
-1@@ -73,7 +73,6 @@ static int exofs_flush(struct file *file, fl_owner_t id)const struct file_operations exofs_file_operations = { .llseek = generic_file_llseek, - .checkpoint = generic_file_checkpoint, .read = do_sync_read, .write = do_sync_write, .aio_read = generic_file_aio_read,@@ -85,6 +84,9 @@ const struct file_operations exofs_file_operations = { .flush = exofs_flush, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, +#ifdef CONFIG_CHECKPOINT + .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations exofs_file_inode_operations = {fs/ext2/dir.c +2
-0@@ -722,5 +722,7 @@ const struct file_operations ext2_dir_operations = { .compat_ioctl = ext2_compat_ioctl, #endif .fsync = ext2_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/ext2/file.c +4
-0@@ -75,7 +75,9 @@ const struct file_operations ext2_file_operations = { .fsync = ext2_fsync, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif /* CONFIG_CHECKPOINT */ };#ifdef CONFIG_EXT2_FS_XIP @@ -91,7 +93,9 @@ const struct file_operations ext2_xip_file_operations = { .open = generic_file_open, .release = ext2_release_file, .fsync = ext2_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif /* CONFIG_CHECKPOINT */ };#endif fs/ext3/dir.c +2
-0@@ -48,7 +48,9 @@ const struct file_operations ext3_dir_operations = {#endif .fsync = ext3_sync_file, /* BKL held */ .release = ext3_release_dir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/ext3/file.c +2
-0@@ -67,7 +67,9 @@ const struct file_operations ext3_file_operations = { .fsync = ext3_sync_file, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations ext3_file_inode_operations = {fs/ext4/dir.c +2
-0@@ -48,7 +48,9 @@ const struct file_operations ext4_dir_operations = {#endif .fsync = ext4_sync_file, .release = ext4_release_dir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/ext4/file.c +2
-0@@ -149,7 +149,9 @@ const struct file_operations ext4_file_operations = { .fsync = ext4_sync_file, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations ext4_file_inode_operations = {fs/fat/dir.c +2
-0@@ -841,7 +841,9 @@ const struct file_operations fat_dir_operations = { .compat_ioctl = fat_compat_dir_ioctl, #endif .fsync = fat_file_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; static int fat_get_short_entry(struct inode *dir, loff_t *pos,fs/fat/file.c +2
-0@@ -162,7 +162,9 @@ const struct file_operations fat_file_operations = { .ioctl = fat_generic_ioctl, .fsync = fat_file_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static int fat_cont_expand (struct inode *inode,loff_t size)fs/freevxfs/vxfs_lookup.c +2
-0@@ -58,7 +58,9 @@ const struct inode_operations vxfs_dir_inode_ops = {const struct file_operations vxfs_dir_operations = { .readdir = vxfs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/hfs/dir.c +2
-0@@ -329,7 +329,9 @@ const struct file_operations hfs_dir_operations = { .readdir = hfs_readdir, .llseek = generic_file_llseek, .release = hfs_dir_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations hfs_dir_inode_operations = {fs/hfs/inode.c +2
-0@@ -607,7 +607,9 @@ static const struct file_operations hfs_file_operations = { .fsync = file_fsync, .open = hfs_file_open, .release = hfs_file_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static const struct inode_operations hfs_file_inode_operations = {fs/hfsplus/dir.c +2
-0@@ -497,5 +497,7 @@ const struct file_operations hfsplus_dir_operations = { .ioctl = hfsplus_ioctl, .llseek = generic_file_llseek, .release = hfsplus_dir_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/hfsplus/inode.c +2
-0@@ -286,7 +286,9 @@ static const struct file_operations hfsplus_file_operations = { .open = hfsplus_file_open, .release = hfsplus_file_release, .ioctl = hfsplus_ioctl, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };struct inode *hfsplus_new_inode (struct super_block *sb,int mode)fs/hostfs/hostfs_kern.c +6
-2@@ -417,7 +417,6 @@ int hostfs_fsync(struct file *file, struct dentry *dentry, int datasync)static const struct file_operations hostfs_file_fops = { .llseek = generic_file_llseek, - .checkpoint = generic_file_checkpoint, .read = do_sync_read, .splice_read = generic_file_splice_read, .aio_read = generic_file_aio_read,@@ -427,13 +426,18 @@ static const struct file_operations hostfs_file_fops = { .open = hostfs_file_open, .release = NULL, .fsync = hostfs_fsync, +#ifdef CONFIG_CHECKPOINT + .checkpoint = generic_file_checkpoint, +#endif };static const struct file_operations hostfs_dir_fops = { .llseek = generic_file_llseek, - .checkpoint = generic_file_checkpoint, .readdir = hostfs_readdir, .read = generic_read_dir, +#ifdef CONFIG_CHECKPOINT + .checkpoint = generic_file_checkpoint, +#endif };int hostfs_writepage (struct page *page,struct writeback_control *wbc)fs/hpfs/dir.c +2
-0@@ -322,5 +322,7 @@ const struct file_operations hpfs_dir_ops = .readdir = hpfs_readdir, .release = hpfs_dir_release, .fsync = hpfs_file_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/hpfs/file.c +2
-0@@ -139,7 +139,9 @@ const struct file_operations hpfs_file_ops = .release = hpfs_file_release, .fsync = hpfs_file_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; const struct inode_operations hpfs_file_iops =fs/hppfs/hppfs.c +4
-0@@ -546,7 +546,9 @@ static const struct file_operations hppfs_file_fops = { .read = hppfs_read, .write = hppfs_write, .open = hppfs_open, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };struct hppfs_dirent {@@ -598,7 +600,9 @@ static const struct file_operations hppfs_dir_fops = { .readdir = hppfs_readdir, .open = hppfs_dir_open, .fsync = hppfs_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static int hppfs_statfs (struct dentry *dentry,struct kstatfs *sf)fs/isofs/dir.c +2
-0@@ -273,7 +273,9 @@ const struct file_operations isofs_dir_operations = { .read = generic_read_dir, .readdir = isofs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };/* fs/jffs2/dir.c +2
-0@@ -41,7 +41,9 @@ const struct file_operations jffs2_dir_operations = .unlocked_ioctl=jffs2_ioctl, .fsync = jffs2_fsync, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/jffs2/file.c +2
-0@@ -50,7 +50,9 @@ const struct file_operations jffs2_file_operations = .mmap = generic_file_readonly_mmap, .fsync = jffs2_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };/* jffs2_file_inode_operations */ fs/jfs/file.c +2
-0@@ -116,5 +116,7 @@ const struct file_operations jfs_file_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = jfs_compat_ioctl,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/jfs/namei.c +2
-0@@ -1556,7 +1556,9 @@ const struct file_operations jfs_dir_operations = { .compat_ioctl = jfs_compat_ioctl, #endif .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static int jfs_ci_hash (struct dentry *dir,struct qstr *this)fs/minix/dir.c +2
-0@@ -23,7 +23,9 @@ const struct file_operations minix_dir_operations = { .read = generic_read_dir, .readdir = minix_readdir, .fsync = simple_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static inline void dir_put_page (struct page *page)fs/minix/file.c +2
-0@@ -21,7 +21,9 @@ const struct file_operations minix_file_operations = { .mmap = generic_file_mmap, .fsync = simple_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations minix_file_inode_operations = {fs/nfs/dir.c +2
-0@@ -63,7 +63,9 @@ const struct file_operations nfs_dir_operations = { .open = nfs_opendir, .release = nfs_release, .fsync = nfs_fsync_dir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations nfs_dir_inode_operations = {fs/nfs/file.c +2
-0@@ -78,7 +78,9 @@ const struct file_operations nfs_file_operations = { .splice_write = nfs_file_splice_write, .check_flags = nfs_check_flags, .setlease = nfs_setlease, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations nfs_file_inode_operations = {fs/nilfs2/dir.c +2
-0@@ -702,5 +702,7 @@ const struct file_operations nilfs_dir_operations = { .compat_ioctl = nilfs_ioctl,#endif /* CONFIG_COMPAT */ .fsync = nilfs_sync_file, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/nilfs2/file.c +3
-1@@ -136,7 +136,6 @@ static int nilfs_file_mmap(struct file *file, struct vm_area_struct *vma)*/ const struct file_operations nilfs_file_operations = { .llseek = generic_file_llseek, - .checkpoint = generic_file_checkpoint, .read = do_sync_read, .write = do_sync_write, .aio_read = generic_file_aio_read,@@ -150,6 +149,9 @@ const struct file_operations nilfs_file_operations = {/* .release = nilfs_release_file, */ .fsync = nilfs_sync_file, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT + .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations nilfs_file_inode_operations = {fs/ntfs/dir.c +2
-0@@ -1572,5 +1572,7 @@ const struct file_operations ntfs_dir_ops = {/*.ioctl = ,*/ /* Perform function on the mounted filesystem. */ .open = ntfs_dir_open, /* Open directory. */ +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/ntfs/file.c +2
-0@@ -2234,7 +2234,9 @@ const struct file_operations ntfs_file_ops = {on the ntfs partition. We do not need to care about the data source. */ +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations ntfs_file_inode_ops = {fs/omfs/dir.c +2
-0@@ -502,5 +502,7 @@ const struct file_operations omfs_dir_operations = { .read = generic_read_dir, .readdir = omfs_readdir, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/omfs/file.c +2
-0@@ -331,7 +331,9 @@ const struct file_operations omfs_file_operations = { .mmap = generic_file_mmap, .fsync = simple_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations omfs_file_inops = {fs/openpromfs/inode.c +4
-0@@ -160,7 +160,9 @@ static const struct file_operations openpromfs_prop_ops = { .read = seq_read, .llseek = seq_lseek, .release = seq_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = NULL, +#endif };static int openpromfs_readdir (struct file *,void *,filldir_t );@@ -169,7 +171,9 @@ static const struct file_operations openprom_operations = { .read = generic_read_dir, .readdir = openpromfs_readdir, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static struct dentry *openpromfs_lookup (struct inode *,struct dentry *,struct nameidata *);fs/pipe.c +6
-3@@ -1056,9 +1056,6 @@ struct file *fifo_file_restore(struct ckpt_ctx *ctx, struct ckpt_hdr_file *ptr) return file; } -#else -#define pipe_file_checkpoint NULL -#define fifo_file_checkpoint NULL#endif /* CONFIG_CHECKPOINT */ /* @@ -1077,7 +1074,9 @@ const struct file_operations read_pipefifo_fops = { .open = pipe_read_open, .release = pipe_read_release, .fasync = pipe_read_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = pipe_file_checkpoint, +#endif };const struct file_operations write_pipefifo_fops = {@@ -1090,7 +1089,9 @@ const struct file_operations write_pipefifo_fops = { .open = pipe_write_open, .release = pipe_write_release, .fasync = pipe_write_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = pipe_file_checkpoint, +#endif };const struct file_operations rdwr_pipefifo_fops = {@@ -1104,7 +1105,9 @@ const struct file_operations rdwr_pipefifo_fops = { .open = pipe_rdwr_open, .release = pipe_rdwr_release, .fasync = pipe_rdwr_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = pipe_file_checkpoint, +#endif };struct pipe_inode_info *alloc_pipe_info (struct inode *inode)fs/qnx4/dir.c +2
-0@@ -80,7 +80,9 @@ const struct file_operations qnx4_dir_operations = .read = generic_read_dir, .readdir = qnx4_readdir, .fsync = simple_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; const struct inode_operations qnx4_dir_inode_operations =fs/ramfs/file-mmu.c +2
-0@@ -47,7 +47,9 @@ const struct file_operations ramfs_file_operations = { .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations ramfs_file_inode_operations = {fs/ramfs/file-nommu.c +2
-0@@ -45,7 +45,9 @@ const struct file_operations ramfs_file_operations = { .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations ramfs_file_inode_operations = {fs/read_write.c +2
-0@@ -27,7 +27,9 @@ const struct file_operations generic_ro_fops = { .aio_read = generic_file_aio_read, .mmap = generic_file_readonly_mmap, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };EXPORT_SYMBOL (generic_ro_fops);fs/reiserfs/dir.c +2
-0@@ -24,7 +24,9 @@ const struct file_operations reiserfs_dir_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = reiserfs_compat_ioctl,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; static int reiserfs_dir_fsync(struct file *filp, struct dentry *dentry,fs/reiserfs/file.c +2
-0@@ -297,7 +297,9 @@ const struct file_operations reiserfs_file_operations = { .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations reiserfs_file_inode_operations = {fs/romfs/mmap-nommu.c +2
-0@@ -72,5 +72,7 @@ const struct file_operations romfs_ro_fops = { .splice_read = generic_file_splice_read, .mmap = romfs_mmap, .get_unmapped_area = romfs_get_unmapped_area, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/romfs/super.c +2
-0@@ -282,7 +282,9 @@ error:static const struct file_operations romfs_dir_operations = { .read = generic_read_dir, .readdir = romfs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static const struct inode_operations romfs_dir_inode_operations = {fs/squashfs/dir.c +2
-0@@ -232,5 +232,7 @@ failed_read:const struct file_operations squashfs_dir_ops = { .read = generic_read_dir, .readdir = squashfs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/sysv/dir.c +2
-0@@ -25,7 +25,9 @@ const struct file_operations sysv_dir_operations = { .read = generic_read_dir, .readdir = sysv_readdir, .fsync = simple_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static inline void dir_put_page (struct page *page)fs/sysv/file.c +2
-0@@ -28,7 +28,9 @@ const struct file_operations sysv_file_operations = { .mmap = generic_file_mmap, .fsync = simple_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations sysv_file_inode_operations = {fs/ubifs/debug.c +3
-1@@ -2623,8 +2623,10 @@ static ssize_t write_debugfs_file(struct file *file, const char __user *buf,static const struct file_operations dfs_fops = { .open = open_debugfs_file, .write = write_debugfs_file, - .checkpoint = generic_file_checkpoint, .owner =THIS_MODULE , +#ifdef CONFIG_CHECKPOINT + .checkpoint = generic_file_checkpoint, +#endif };/** fs/ubifs/dir.c +2
-0@@ -1228,5 +1228,7 @@ const struct file_operations ubifs_dir_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = ubifs_compat_ioctl,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/ubifs/file.c +2
-0@@ -1582,5 +1582,7 @@ const struct file_operations ubifs_file_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = ubifs_compat_ioctl,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/udf/dir.c +2
-0@@ -211,5 +211,7 @@ const struct file_operations udf_dir_operations = { .readdir = udf_readdir, .ioctl = udf_ioctl, .fsync = simple_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/udf/file.c +2
-0@@ -215,7 +215,9 @@ const struct file_operations udf_file_operations = { .fsync = simple_fsync, .splice_read = generic_file_splice_read, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations udf_file_inode_operations = {fs/ufs/dir.c +2
-0@@ -668,5 +668,7 @@ const struct file_operations ufs_dir_operations = { .readdir = ufs_readdir, .fsync = simple_fsync, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/ufs/file.c +2
-0@@ -43,5 +43,7 @@ const struct file_operations ufs_file_operations = { .open = generic_file_open, .fsync = simple_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/xfs/linux-2.6/xfs_file.c +4
-0@@ -259,7 +259,9 @@ const struct file_operations xfs_file_operations = {#ifdef HAVE_FOP_OPEN_EXEC .open_exec = xfs_file_open_exec,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct file_operations xfs_dir_file_operations = {@@ -272,7 +274,9 @@ const struct file_operations xfs_dir_file_operations = { .compat_ioctl = xfs_file_compat_ioctl, #endif .fsync = xfs_file_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static const struct vm_operations_struct xfs_file_vm_ops = {include/linux/fs.h +2
-2@@ -1513,8 +1513,10 @@ struct file_operations {ssize_t (*splice_write)(struct pipe_inode_info *,struct file *,loff_t *,size_t ,unsigned int );ssize_t (*splice_read)(struct file *,loff_t *,struct pipe_inode_info *,size_t ,unsigned int );int (*setlease)(struct file *,long ,struct file_lock **); +#ifdef CONFIG_CHECKPOINT int (*checkpoint)(struct ckpt_ctx *,struct file *);int (*collect)(struct ckpt_ctx *,struct file *); +#endif };struct inode_operations {@@ -2330,8 +2332,6 @@ void inode_set_bytes(struct inode *inode, loff_t bytes);#ifdef CONFIG_CHECKPOINT extern int generic_file_checkpoint (struct ckpt_ctx *ctx,struct file *file); -#else -#define generic_file_checkpoint NULL#endif extern int vfs_readdir (struct file *,filldir_t ,void *);mm/filemap.c +0
-2@@ -1678,8 +1678,6 @@ int filemap_restore(struct ckpt_ctx *ctx, }return ret; } -#else /* !CONFIG_CHECKPOINT */ -#define filemap_checkpoint NULL#endif const struct vm_operations_struct generic_file_vm_ops = {mm/mmap.c +0
-2@@ -2423,8 +2423,6 @@ int special_mapping_restore(struct ckpt_ctx *ctx,return ret; } -#else /* !CONFIG_CHECKPOINT */ -#define special_mapping_checkpoint NULL#endif static const struct vm_operations_struct special_mapping_vmops = {Signature · 6 lines
1.6.1 _______________________________________________ Containers mailing list Containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org https://lists.linux-foundation.org/mailman/listinfo/containers
I already applied these with a mention in the changelog.
I'm thinking of adding explcit CC: linuxfs-devel on ALL the patches which related to the FS ?
Oren.
Quoted 1,347 lines · Serge E. Hallyn
Quoted 10 lines · Matt Helsley
Quoted 9 lines · Serge E. Hallyn
It is a matter of preference, and what we had before was correct, but we've been asked to just put the method under #ifdef
CONFIG_CHECKPOINT. So do so, and get rid of the #else dummy defines.I did quite a bit of find . -type f -print0 | xargs -0 grep -Hn and hope I found all cases. Even a make allyesconfig didn't point to anything I might have missed.
Quoted 7 lines
Quoted 1 line
Signed-off-by Serge E. Hallyn <serue-r/[email protected]>Looks good to me. I don't know if we should add:
Cc Nick Piggin <[email protected]>or merely list it in a changelog for the
f_opspatch(es).I was assuming the latter. I can re-send with cc:s, but I can't see them really wanting to see this rather than a fixed original patchset with full cc:s. Let me know if you disagree.
Quoted 1 line
Reviewed-by Matt Helsley <matthltc-r/[email protected]>Thanks,
-sergeQuoted 1,318 lines
Quoted 1,318 lines
--- drivers/char/mem.c | 4 ++++ drivers/char/random.c | 4 ++++ drivers/char/tty_io.c | 7 ++++--- fs/adfs/dir.c | 2 ++ fs/adfs/file.c | 2 ++ fs/affs/dir.c | 2 ++ fs/affs/file.c | 2 ++ fs/befs/linuxvfs.c | 2 ++ fs/bfs/dir.c | 2 ++ fs/bfs/file.c | 2 ++ fs/btrfs/file.c | 2 ++ fs/btrfs/inode.c | 2 ++ fs/btrfs/super.c | 2 ++ fs/cramfs/inode.c | 2 ++ fs/ecryptfs/file.c | 4 ++++ fs/ecryptfs/miscdev.c | 2 ++ fs/efs/dir.c | 2 ++ fs/eventfd.c | 4 ++-- fs/eventpoll.c | 5 ++--- fs/exofs/dir.c | 2 ++ fs/exofs/file.c | 4 +++- fs/ext2/dir.c | 2 ++ fs/ext2/file.c | 4 ++++ fs/ext3/dir.c | 2 ++ fs/ext3/file.c | 2 ++ fs/ext4/dir.c | 2 ++ fs/ext4/file.c | 2 ++ fs/fat/dir.c | 2 ++ fs/fat/file.c | 2 ++ fs/freevxfs/vxfs_lookup.c | 2 ++ fs/hfs/dir.c | 2 ++ fs/hfs/inode.c | 2 ++ fs/hfsplus/dir.c | 2 ++ fs/hfsplus/inode.c | 2 ++ fs/hostfs/hostfs_kern.c | 8 ++++++-- fs/hpfs/dir.c | 2 ++ fs/hpfs/file.c | 2 ++ fs/hppfs/hppfs.c | 4 ++++ fs/isofs/dir.c | 2 ++ fs/jffs2/dir.c | 2 ++ fs/jffs2/file.c | 2 ++ fs/jfs/file.c | 2 ++ fs/jfs/namei.c | 2 ++ fs/minix/dir.c | 2 ++ fs/minix/file.c | 2 ++ fs/nfs/dir.c | 2 ++ fs/nfs/file.c | 2 ++ fs/nilfs2/dir.c | 2 ++ fs/nilfs2/file.c | 4 +++- fs/ntfs/dir.c | 2 ++ fs/ntfs/file.c | 2 ++ fs/omfs/dir.c | 2 ++ fs/omfs/file.c | 2 ++ fs/openpromfs/inode.c | 4 ++++ fs/pipe.c | 9 ++++++--- fs/qnx4/dir.c | 2 ++ fs/ramfs/file-mmu.c | 2 ++ fs/ramfs/file-nommu.c | 2 ++ fs/read_write.c | 2 ++ fs/reiserfs/dir.c | 2 ++ fs/reiserfs/file.c | 2 ++ fs/romfs/mmap-nommu.c | 2 ++ fs/romfs/super.c | 2 ++ fs/squashfs/dir.c | 2 ++ fs/sysv/dir.c | 2 ++ fs/sysv/file.c | 2 ++ fs/ubifs/debug.c | 4 +++- fs/ubifs/dir.c | 2 ++ fs/ubifs/file.c | 2 ++ fs/udf/dir.c | 2 ++ fs/udf/file.c | 2 ++ fs/ufs/dir.c | 2 ++ fs/ufs/file.c | 2 ++ fs/xfs/linux-2.6/xfs_file.c | 4 ++++ include/linux/fs.h | 4 ++-- mm/filemap.c | 2 -- mm/mmap.c | 2 -- 77 files changed, 177 insertions(+), 22 deletions(-)drivers/char/mem.c +4
-0@@ -763,7 +763,9 @@ static const struct file_operations null_fops = { .read = read_null, .write = write_null, .splice_write = splice_write_null, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };#ifdef CONFIG_DEVPORT @@ -780,7 +782,9 @@ static const struct file_operations zero_fops = { .read = read_zero, .write = write_zero, .mmap = mmap_zero, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };/* drivers/char/random.c +4
-0@@ -1169,7 +1169,9 @@ const struct file_operations random_fops = { .poll = random_poll, .unlocked_ioctl = random_ioctl, .fasync = random_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct file_operations urandom_fops = {@@ -1177,7 +1179,9 @@ const struct file_operations urandom_fops = { .write = random_write, .unlocked_ioctl = random_ioctl, .fasync = random_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };/*************************************************************** drivers/char/tty_io.c +4
-3@@ -155,9 +155,6 @@ static int tty_fasync(int fd, struct file *filp, int on);#ifdef CONFIG_CHECKPOINT static int tty_file_checkpoint (struct ckpt_ctx *ctx,struct file *file);static int tty_file_collect (struct ckpt_ctx *ctx,struct file *file); -#else -#define tty_file_checkpoint NULL -#define tty_file_collect NULL#endif /* CONFIG_CHECKPOINT */ static void release_tty (struct tty_struct *tty,int idx);static void __proc_set_tty (struct task_struct *tsk,struct tty_struct *tty);@@ -425,8 +422,10 @@ static const struct file_operations tty_fops = { .open = tty_open, .release = tty_release, .fasync = tty_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = tty_file_checkpoint, .collect = tty_file_collect, +#endif }; static const struct file_operations console_fops = {@@ -449,8 +448,10 @@ static const struct file_operations hung_up_tty_fops = { .unlocked_ioctl = hung_up_tty_ioctl, .compat_ioctl = hung_up_tty_compat_ioctl, .release = tty_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = tty_file_checkpoint, .collect = tty_file_collect, +#endif };static DEFINE_SPINLOCK (redirect_lock);fs/adfs/dir.c +2
-0@@ -198,7 +198,9 @@ const struct file_operations adfs_dir_operations = { .llseek = generic_file_llseek, .readdir = adfs_readdir, .fsync = simple_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; static intfs/adfs/file.c +2
-0@@ -30,7 +30,9 @@ const struct file_operations adfs_file_operations = { .write = do_sync_write, .aio_write = generic_file_aio_write, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations adfs_file_inode_operations = {fs/affs/dir.c +2
-0@@ -22,7 +22,9 @@ const struct file_operations affs_dir_operations = { .llseek = generic_file_llseek, .readdir = affs_readdir, .fsync = affs_file_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };/* fs/affs/file.c +2
-0@@ -36,7 +36,9 @@ const struct file_operations affs_file_operations = { .release = affs_file_release, .fsync = affs_file_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations affs_file_inode_operations = {fs/befs/linuxvfs.c +2
-0@@ -67,7 +67,9 @@ static const struct file_operations befs_dir_operations = { .read = generic_read_dir, .readdir = befs_readdir, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static const struct inode_operations befs_dir_inode_operations = {fs/bfs/dir.c +2
-0@@ -80,7 +80,9 @@ const struct file_operations bfs_dir_operations = { .readdir = bfs_readdir, .fsync = simple_fsync, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };extern void dump_imap (const char *,struct super_block *);fs/bfs/file.c +2
-0@@ -29,7 +29,9 @@ const struct file_operations bfs_file_operations = { .aio_write = generic_file_aio_write, .mmap = generic_file_mmap, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; static int bfs_move_block(unsigned long from, unsigned long to,fs/btrfs/file.c +2
-0@@ -1164,5 +1164,7 @@ const struct file_operations btrfs_file_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = btrfs_ioctl,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/btrfs/inode.c +2
-0@@ -5971,7 +5971,9 @@ static const struct file_operations btrfs_dir_file_operations = {#endif .release = btrfs_release_file, .fsync = btrfs_sync_file, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static struct extent_io_ops btrfs_extent_io_ops = {fs/btrfs/super.c +2
-0@@ -718,7 +718,9 @@ static const struct file_operations btrfs_ctl_fops = { .unlocked_ioctl = btrfs_control_ioctl, .compat_ioctl = btrfs_control_ioctl, .owner = THIS_MODULE, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static struct miscdevice btrfs_misc = {fs/cramfs/inode.c +2
-0@@ -532,7 +532,9 @@ static const struct file_operations cramfs_directory_operations = { .llseek = generic_file_llseek, .read = generic_read_dir, .readdir = cramfs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static const struct inode_operations cramfs_dir_inode_operations = {fs/ecryptfs/file.c +4
-0@@ -305,7 +305,9 @@ const struct file_operations ecryptfs_dir_fops = { .fsync = ecryptfs_fsync, .fasync = ecryptfs_fasync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct file_operations ecryptfs_main_fops = {@@ -323,7 +325,9 @@ const struct file_operations ecryptfs_main_fops = { .fsync = ecryptfs_fsync, .fasync = ecryptfs_fasync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; static intfs/ecryptfs/miscdev.c +2
-0@@ -481,7 +481,9 @@ static const struct file_operations ecryptfs_miscdev_fops = { .read = ecryptfs_miscdev_read, .write = ecryptfs_miscdev_write, .release = ecryptfs_miscdev_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static struct miscdevice ecryptfs_miscdev = {fs/efs/dir.c +2
-0@@ -13,7 +13,9 @@ const struct file_operations efs_dir_operations = { .llseek = generic_file_llseek, .read = generic_read_dir, .readdir = efs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations efs_dir_inode_operations = {fs/eventfd.c +2
-2@@ -337,8 +337,6 @@ struct file *eventfd_restore(struct ckpt_ctx *ckpt_ctx, }return evfile; } -#else -#define eventfd_checkpoint NULL#endif static const struct file_operations eventfd_fops = {@@ -346,7 +344,9 @@ static const struct file_operations eventfd_fops = { .poll = eventfd_poll, .read = eventfd_read, .write = eventfd_write, +#ifdef CONFIG_CHECKPOINT .checkpoint = eventfd_checkpoint, +#endif };/** fs/eventpoll.c +2
-3@@ -677,17 +677,16 @@ static unsigned int ep_eventpoll_poll(struct file *file, poll_table *wait)#ifdef CONFIG_CHECKPOINT static int ep_eventpoll_checkpoint (struct ckpt_ctx *ctx,struct file *file);static int ep_file_collect (struct ckpt_ctx *ctx,struct file *file); -#else -#define ep_eventpoll_checkpoint NULL -#define ep_file_collect NULL#endif /* File callbacks that implement the eventpoll file behaviour */ static const struct file_operations eventpoll_fops = { .release = ep_eventpoll_release, .poll = ep_eventpoll_poll, +#ifdef CONFIG_CHECKPOINT .checkpoint = ep_eventpoll_checkpoint, .collect = ep_file_collect, +#endif };/* Fast test to see if the file is an evenpoll file */ fs/exofs/dir.c +2
-0@@ -667,5 +667,7 @@ const struct file_operations exofs_dir_operations = { .llseek = generic_file_llseek, .read = generic_read_dir, .readdir = exofs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/exofs/file.c +3
-1@@ -73,7 +73,6 @@ static int exofs_flush(struct file *file, fl_owner_t id)const struct file_operations exofs_file_operations = { .llseek = generic_file_llseek, - .checkpoint = generic_file_checkpoint, .read = do_sync_read, .write = do_sync_write, .aio_read = generic_file_aio_read,@@ -85,6 +84,9 @@ const struct file_operations exofs_file_operations = { .flush = exofs_flush, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, +#ifdef CONFIG_CHECKPOINT + .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations exofs_file_inode_operations = {fs/ext2/dir.c +2
-0@@ -722,5 +722,7 @@ const struct file_operations ext2_dir_operations = { .compat_ioctl = ext2_compat_ioctl, #endif .fsync = ext2_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/ext2/file.c +4
-0@@ -75,7 +75,9 @@ const struct file_operations ext2_file_operations = { .fsync = ext2_fsync, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif /* CONFIG_CHECKPOINT */ };#ifdef CONFIG_EXT2_FS_XIP @@ -91,7 +93,9 @@ const struct file_operations ext2_xip_file_operations = { .open = generic_file_open, .release = ext2_release_file, .fsync = ext2_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif /* CONFIG_CHECKPOINT */ };#endif fs/ext3/dir.c +2
-0@@ -48,7 +48,9 @@ const struct file_operations ext3_dir_operations = {#endif .fsync = ext3_sync_file, /* BKL held */ .release = ext3_release_dir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/ext3/file.c +2
-0@@ -67,7 +67,9 @@ const struct file_operations ext3_file_operations = { .fsync = ext3_sync_file, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations ext3_file_inode_operations = {fs/ext4/dir.c +2
-0@@ -48,7 +48,9 @@ const struct file_operations ext4_dir_operations = {#endif .fsync = ext4_sync_file, .release = ext4_release_dir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/ext4/file.c +2
-0@@ -149,7 +149,9 @@ const struct file_operations ext4_file_operations = { .fsync = ext4_sync_file, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations ext4_file_inode_operations = {fs/fat/dir.c +2
-0@@ -841,7 +841,9 @@ const struct file_operations fat_dir_operations = { .compat_ioctl = fat_compat_dir_ioctl, #endif .fsync = fat_file_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; static int fat_get_short_entry(struct inode *dir, loff_t *pos,fs/fat/file.c +2
-0@@ -162,7 +162,9 @@ const struct file_operations fat_file_operations = { .ioctl = fat_generic_ioctl, .fsync = fat_file_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static int fat_cont_expand (struct inode *inode,loff_t size)fs/freevxfs/vxfs_lookup.c +2
-0@@ -58,7 +58,9 @@ const struct inode_operations vxfs_dir_inode_ops = {const struct file_operations vxfs_dir_operations = { .readdir = vxfs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/hfs/dir.c +2
-0@@ -329,7 +329,9 @@ const struct file_operations hfs_dir_operations = { .readdir = hfs_readdir, .llseek = generic_file_llseek, .release = hfs_dir_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations hfs_dir_inode_operations = {fs/hfs/inode.c +2
-0@@ -607,7 +607,9 @@ static const struct file_operations hfs_file_operations = { .fsync = file_fsync, .open = hfs_file_open, .release = hfs_file_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static const struct inode_operations hfs_file_inode_operations = {fs/hfsplus/dir.c +2
-0@@ -497,5 +497,7 @@ const struct file_operations hfsplus_dir_operations = { .ioctl = hfsplus_ioctl, .llseek = generic_file_llseek, .release = hfsplus_dir_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/hfsplus/inode.c +2
-0@@ -286,7 +286,9 @@ static const struct file_operations hfsplus_file_operations = { .open = hfsplus_file_open, .release = hfsplus_file_release, .ioctl = hfsplus_ioctl, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };struct inode *hfsplus_new_inode (struct super_block *sb,int mode)fs/hostfs/hostfs_kern.c +6
-2@@ -417,7 +417,6 @@ int hostfs_fsync(struct file *file, struct dentry *dentry, int datasync)static const struct file_operations hostfs_file_fops = { .llseek = generic_file_llseek, - .checkpoint = generic_file_checkpoint, .read = do_sync_read, .splice_read = generic_file_splice_read, .aio_read = generic_file_aio_read,@@ -427,13 +426,18 @@ static const struct file_operations hostfs_file_fops = { .open = hostfs_file_open, .release = NULL, .fsync = hostfs_fsync, +#ifdef CONFIG_CHECKPOINT + .checkpoint = generic_file_checkpoint, +#endif };static const struct file_operations hostfs_dir_fops = { .llseek = generic_file_llseek, - .checkpoint = generic_file_checkpoint, .readdir = hostfs_readdir, .read = generic_read_dir, +#ifdef CONFIG_CHECKPOINT + .checkpoint = generic_file_checkpoint, +#endif };int hostfs_writepage (struct page *page,struct writeback_control *wbc)fs/hpfs/dir.c +2
-0@@ -322,5 +322,7 @@ const struct file_operations hpfs_dir_ops = .readdir = hpfs_readdir, .release = hpfs_dir_release, .fsync = hpfs_file_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/hpfs/file.c +2
-0@@ -139,7 +139,9 @@ const struct file_operations hpfs_file_ops = .release = hpfs_file_release, .fsync = hpfs_file_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; const struct inode_operations hpfs_file_iops =fs/hppfs/hppfs.c +4
-0@@ -546,7 +546,9 @@ static const struct file_operations hppfs_file_fops = { .read = hppfs_read, .write = hppfs_write, .open = hppfs_open, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };struct hppfs_dirent {@@ -598,7 +600,9 @@ static const struct file_operations hppfs_dir_fops = { .readdir = hppfs_readdir, .open = hppfs_dir_open, .fsync = hppfs_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static int hppfs_statfs (struct dentry *dentry,struct kstatfs *sf)fs/isofs/dir.c +2
-0@@ -273,7 +273,9 @@ const struct file_operations isofs_dir_operations = { .read = generic_read_dir, .readdir = isofs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };/* fs/jffs2/dir.c +2
-0@@ -41,7 +41,9 @@ const struct file_operations jffs2_dir_operations = .unlocked_ioctl=jffs2_ioctl, .fsync = jffs2_fsync, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/jffs2/file.c +2
-0@@ -50,7 +50,9 @@ const struct file_operations jffs2_file_operations = .mmap = generic_file_readonly_mmap, .fsync = jffs2_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };/* jffs2_file_inode_operations */ fs/jfs/file.c +2
-0@@ -116,5 +116,7 @@ const struct file_operations jfs_file_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = jfs_compat_ioctl,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/jfs/namei.c +2
-0@@ -1556,7 +1556,9 @@ const struct file_operations jfs_dir_operations = { .compat_ioctl = jfs_compat_ioctl, #endif .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static int jfs_ci_hash (struct dentry *dir,struct qstr *this)fs/minix/dir.c +2
-0@@ -23,7 +23,9 @@ const struct file_operations minix_dir_operations = { .read = generic_read_dir, .readdir = minix_readdir, .fsync = simple_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static inline void dir_put_page (struct page *page)fs/minix/file.c +2
-0@@ -21,7 +21,9 @@ const struct file_operations minix_file_operations = { .mmap = generic_file_mmap, .fsync = simple_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations minix_file_inode_operations = {fs/nfs/dir.c +2
-0@@ -63,7 +63,9 @@ const struct file_operations nfs_dir_operations = { .open = nfs_opendir, .release = nfs_release, .fsync = nfs_fsync_dir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations nfs_dir_inode_operations = {fs/nfs/file.c +2
-0@@ -78,7 +78,9 @@ const struct file_operations nfs_file_operations = { .splice_write = nfs_file_splice_write, .check_flags = nfs_check_flags, .setlease = nfs_setlease, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations nfs_file_inode_operations = {fs/nilfs2/dir.c +2
-0@@ -702,5 +702,7 @@ const struct file_operations nilfs_dir_operations = { .compat_ioctl = nilfs_ioctl,#endif /* CONFIG_COMPAT */ .fsync = nilfs_sync_file, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/nilfs2/file.c +3
-1@@ -136,7 +136,6 @@ static int nilfs_file_mmap(struct file *file, struct vm_area_struct *vma)*/ const struct file_operations nilfs_file_operations = { .llseek = generic_file_llseek, - .checkpoint = generic_file_checkpoint, .read = do_sync_read, .write = do_sync_write, .aio_read = generic_file_aio_read,@@ -150,6 +149,9 @@ const struct file_operations nilfs_file_operations = {/* .release = nilfs_release_file, */ .fsync = nilfs_sync_file, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT + .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations nilfs_file_inode_operations = {fs/ntfs/dir.c +2
-0@@ -1572,5 +1572,7 @@ const struct file_operations ntfs_dir_ops = {/*.ioctl = ,*/ /* Perform function on the mounted filesystem. */ .open = ntfs_dir_open, /* Open directory. */ +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/ntfs/file.c +2
-0@@ -2234,7 +2234,9 @@ const struct file_operations ntfs_file_ops = {on the ntfs partition. We do not need to care about the data source. */ +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations ntfs_file_inode_ops = {fs/omfs/dir.c +2
-0@@ -502,5 +502,7 @@ const struct file_operations omfs_dir_operations = { .read = generic_read_dir, .readdir = omfs_readdir, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/omfs/file.c +2
-0@@ -331,7 +331,9 @@ const struct file_operations omfs_file_operations = { .mmap = generic_file_mmap, .fsync = simple_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations omfs_file_inops = {fs/openpromfs/inode.c +4
-0@@ -160,7 +160,9 @@ static const struct file_operations openpromfs_prop_ops = { .read = seq_read, .llseek = seq_lseek, .release = seq_release, +#ifdef CONFIG_CHECKPOINT .checkpoint = NULL, +#endif };static int openpromfs_readdir (struct file *,void *,filldir_t );@@ -169,7 +171,9 @@ static const struct file_operations openprom_operations = { .read = generic_read_dir, .readdir = openpromfs_readdir, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static struct dentry *openpromfs_lookup (struct inode *,struct dentry *,struct nameidata *);fs/pipe.c +6
-3@@ -1056,9 +1056,6 @@ struct file *fifo_file_restore(struct ckpt_ctx *ctx, struct ckpt_hdr_file *ptr) return file; } -#else -#define pipe_file_checkpoint NULL -#define fifo_file_checkpoint NULL#endif /* CONFIG_CHECKPOINT */ /* @@ -1077,7 +1074,9 @@ const struct file_operations read_pipefifo_fops = { .open = pipe_read_open, .release = pipe_read_release, .fasync = pipe_read_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = pipe_file_checkpoint, +#endif };const struct file_operations write_pipefifo_fops = {@@ -1090,7 +1089,9 @@ const struct file_operations write_pipefifo_fops = { .open = pipe_write_open, .release = pipe_write_release, .fasync = pipe_write_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = pipe_file_checkpoint, +#endif };const struct file_operations rdwr_pipefifo_fops = {@@ -1104,7 +1105,9 @@ const struct file_operations rdwr_pipefifo_fops = { .open = pipe_rdwr_open, .release = pipe_rdwr_release, .fasync = pipe_rdwr_fasync, +#ifdef CONFIG_CHECKPOINT .checkpoint = pipe_file_checkpoint, +#endif };struct pipe_inode_info *alloc_pipe_info (struct inode *inode)fs/qnx4/dir.c +2
-0@@ -80,7 +80,9 @@ const struct file_operations qnx4_dir_operations = .read = generic_read_dir, .readdir = qnx4_readdir, .fsync = simple_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; const struct inode_operations qnx4_dir_inode_operations =fs/ramfs/file-mmu.c +2
-0@@ -47,7 +47,9 @@ const struct file_operations ramfs_file_operations = { .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations ramfs_file_inode_operations = {fs/ramfs/file-nommu.c +2
-0@@ -45,7 +45,9 @@ const struct file_operations ramfs_file_operations = { .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations ramfs_file_inode_operations = {fs/read_write.c +2
-0@@ -27,7 +27,9 @@ const struct file_operations generic_ro_fops = { .aio_read = generic_file_aio_read, .mmap = generic_file_readonly_mmap, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };EXPORT_SYMBOL (generic_ro_fops);fs/reiserfs/dir.c +2
-0@@ -24,7 +24,9 @@ const struct file_operations reiserfs_dir_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = reiserfs_compat_ioctl,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif }; static int reiserfs_dir_fsync(struct file *filp, struct dentry *dentry,fs/reiserfs/file.c +2
-0@@ -297,7 +297,9 @@ const struct file_operations reiserfs_file_operations = { .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations reiserfs_file_inode_operations = {fs/romfs/mmap-nommu.c +2
-0@@ -72,5 +72,7 @@ const struct file_operations romfs_ro_fops = { .splice_read = generic_file_splice_read, .mmap = romfs_mmap, .get_unmapped_area = romfs_get_unmapped_area, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/romfs/super.c +2
-0@@ -282,7 +282,9 @@ error:static const struct file_operations romfs_dir_operations = { .read = generic_read_dir, .readdir = romfs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static const struct inode_operations romfs_dir_inode_operations = {fs/squashfs/dir.c +2
-0@@ -232,5 +232,7 @@ failed_read:const struct file_operations squashfs_dir_ops = { .read = generic_read_dir, .readdir = squashfs_readdir, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/sysv/dir.c +2
-0@@ -25,7 +25,9 @@ const struct file_operations sysv_dir_operations = { .read = generic_read_dir, .readdir = sysv_readdir, .fsync = simple_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static inline void dir_put_page (struct page *page)fs/sysv/file.c +2
-0@@ -28,7 +28,9 @@ const struct file_operations sysv_file_operations = { .mmap = generic_file_mmap, .fsync = simple_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations sysv_file_inode_operations = {fs/ubifs/debug.c +3
-1@@ -2623,8 +2623,10 @@ static ssize_t write_debugfs_file(struct file *file, const char __user *buf,static const struct file_operations dfs_fops = { .open = open_debugfs_file, .write = write_debugfs_file, - .checkpoint = generic_file_checkpoint, .owner =THIS_MODULE , +#ifdef CONFIG_CHECKPOINT + .checkpoint = generic_file_checkpoint, +#endif };/** fs/ubifs/dir.c +2
-0@@ -1228,5 +1228,7 @@ const struct file_operations ubifs_dir_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = ubifs_compat_ioctl,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/ubifs/file.c +2
-0@@ -1582,5 +1582,7 @@ const struct file_operations ubifs_file_operations = {#ifdef CONFIG_COMPAT .compat_ioctl = ubifs_compat_ioctl,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/udf/dir.c +2
-0@@ -211,5 +211,7 @@ const struct file_operations udf_dir_operations = { .readdir = udf_readdir, .ioctl = udf_ioctl, .fsync = simple_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/udf/file.c +2
-0@@ -215,7 +215,9 @@ const struct file_operations udf_file_operations = { .fsync = simple_fsync, .splice_read = generic_file_splice_read, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct inode_operations udf_file_inode_operations = {fs/ufs/dir.c +2
-0@@ -668,5 +668,7 @@ const struct file_operations ufs_dir_operations = { .readdir = ufs_readdir, .fsync = simple_fsync, .llseek = generic_file_llseek, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/ufs/file.c +2
-0@@ -43,5 +43,7 @@ const struct file_operations ufs_file_operations = { .open = generic_file_open, .fsync = simple_fsync, .splice_read = generic_file_splice_read, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };fs/xfs/linux-2.6/xfs_file.c +4
-0@@ -259,7 +259,9 @@ const struct file_operations xfs_file_operations = {#ifdef HAVE_FOP_OPEN_EXEC .open_exec = xfs_file_open_exec,#endif +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };const struct file_operations xfs_dir_file_operations = {@@ -272,7 +274,9 @@ const struct file_operations xfs_dir_file_operations = { .compat_ioctl = xfs_file_compat_ioctl, #endif .fsync = xfs_file_fsync, +#ifdef CONFIG_CHECKPOINT .checkpoint = generic_file_checkpoint, +#endif };static const struct vm_operations_struct xfs_file_vm_ops = {include/linux/fs.h +2
-2@@ -1513,8 +1513,10 @@ struct file_operations {ssize_t (*splice_write)(struct pipe_inode_info *,struct file *,loff_t *,size_t ,unsigned int );ssize_t (*splice_read)(struct file *,loff_t *,struct pipe_inode_info *,size_t ,unsigned int );int (*setlease)(struct file *,long ,struct file_lock **); +#ifdef CONFIG_CHECKPOINT int (*checkpoint)(struct ckpt_ctx *,struct file *);int (*collect)(struct ckpt_ctx *,struct file *); +#endif };struct inode_operations {@@ -2330,8 +2332,6 @@ void inode_set_bytes(struct inode *inode, loff_t bytes);#ifdef CONFIG_CHECKPOINT extern int generic_file_checkpoint (struct ckpt_ctx *ctx,struct file *file); -#else -#define generic_file_checkpoint NULL#endif extern int vfs_readdir (struct file *,filldir_t ,void *);mm/filemap.c +0
-2@@ -1678,8 +1678,6 @@ int filemap_restore(struct ckpt_ctx *ctx, }return ret; } -#else /* !CONFIG_CHECKPOINT */ -#define filemap_checkpoint NULL#endif const struct vm_operations_struct generic_file_vm_ops = {mm/mmap.c +0
-2@@ -2423,8 +2423,6 @@ int special_mapping_restore(struct ckpt_ctx *ctx,return ret; } -#else /* !CONFIG_CHECKPOINT */ -#define special_mapping_checkpoint NULL#endif static const struct vm_operations_struct special_mapping_vmops = {Signature · 6 lines
1.6.1 _______________________________________________ Containers mailing list Containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org https://lists.linux-foundation.org/mailman/listinfo/containers
Quoted 5 lines · Oren Laadan
I already applied these with a mention in the changelog.
I'm thinking of adding explcit CC: linuxfs-devel on ALL the patches which related to the FS ?
Definately.
-serge