diff --git a/fs/aufs/Kconfig b/fs/aufs/Kconfig index 7d1d113..71dd12a 100644 --- a/fs/aufs/Kconfig +++ b/fs/aufs/Kconfig @@ -123,10 +123,6 @@ config AUFS_SEC_PERM_PATCH depends on AUFS = m depends on SECURITY default y -config AUFS_SPLICE_PATCH - bool - depends on AUFS - default y config AUFS_PUT_FILP_PATCH bool depends on AUFS = m @@ -141,7 +137,7 @@ config AUFS_LHASH_PATCH config AUFS_DENY_WRITE_ACCESS_PATCH bool depends on AUFS = m - default y + default n config AUFS_SYSFS_GET_DENTRY_PATCH bool "Show the amount of kernel memory allocated in /sys/fs/aufs" depends on AUFS_SYSAUFS diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c index 3d797e0..0b31ed0 100644 --- a/fs/aufs/f_op.c +++ b/fs/aufs/f_op.c @@ -226,8 +226,6 @@ static ssize_t aufs_write(struct file *file, const char __user *__buf, return err; } -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) \ - || defined(CONFIG_AUFS_SPLICE_PATCH) static int au_test_loopback(void) { const char c = current->comm[4]; @@ -237,9 +235,7 @@ static int au_test_loopback(void) && strncmp(current->comm, "loop", 4) == 0); return loopback; } -#endif -#ifdef CONFIG_AUFS_SPLICE_PATCH static ssize_t aufs_splice_read(struct file *file, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags) @@ -335,7 +331,6 @@ aufs_splice_write(struct pipe_inode_info *pipe, struct file *file, loff_t *ppos, AuTraceErr(err); return err; } -#endif /* CONFIG_AUFS_SPLICE_PATCH */ /* ---------------------------------------------------------------------- */ @@ -874,8 +869,6 @@ struct file_operations aufs_file_fop = { #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 22) .sendfile = aufs_sendfile, #endif -#ifdef CONFIG_AUFS_SPLICE_PATCH .splice_write = aufs_splice_write, .splice_read = aufs_splice_read, -#endif }; diff --git a/fs/aufs/module.c b/fs/aufs/module.c index ffc8aa2..42bd96e 100644 --- a/fs/aufs/module.c +++ b/fs/aufs/module.c @@ -437,11 +437,6 @@ module_exit(aufs_exit); #endif #endif -#if defined(CONFIG_AUFS_SPLICE_PATCH) \ - && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) -#error CONFIG_AUFS_SPLICE_PATCH is supported linux-2.6.23 and later. -#endif - #ifdef CONFIG_DEBUG_PROVE_LOCKING #if MAX_LOCKDEP_SUBCLASSES < AuLsc_I_End #warning lockdep will not work since aufs uses deeper locks. diff --git a/fs/aufs/sysaufs.c b/fs/aufs/sysaufs.c index e5560de..911daa5 100644 --- a/fs/aufs/sysaufs.c +++ b/fs/aufs/sysaufs.c @@ -396,9 +396,6 @@ static int make_config(struct seq_file *seq, struct sysaufs_args *args, #ifdef CONFIG_AUFS_SEC_PERM_PATCH puts_bool(SEC_PERM_PATCH); #endif -#ifdef CONFIG_AUFS_SPLICE_PATCH - puts_bool(SPLICE_PATCH); -#endif #ifdef CONFIG_AUFS_PUT_FILP_PATCH puts_bool(PUT_FILP_PATCH); #endif diff --git a/fs/aufs/vfsub.h b/fs/aufs/vfsub.h index 9bdc9f3..44a3836 100644 --- a/fs/aufs/vfsub.h +++ b/fs/aufs/vfsub.h @@ -25,10 +25,7 @@ #include #include -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23) \ - && defined(CONFIG_AUFS_SPLICE_PATCH) #include -#endif #ifdef CONFIG_AUFS_HINOTIFY #include #endif @@ -592,7 +589,6 @@ int do_vfsub_readdir(struct file *file, filldir_t filldir, void *arg) /* ---------------------------------------------------------------------- */ -#ifdef CONFIG_AUFS_SPLICE_PATCH static inline long do_vfsub_splice_to(struct file *in, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, @@ -627,7 +623,7 @@ long do_vfsub_splice_from(struct pipe_inode_info *pipe, struct file *out, au_update_fuse_h_inode(out->f_vfsmnt, out->f_dentry); /*ignore*/ return err; } -#else +#if 0 static inline long do_vfsub_splice_to(struct file *in, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, diff --git a/fs/splice.c b/fs/splice.c index 581d3f0..61e07dc 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -893,10 +893,9 @@ EXPORT_SYMBOL(generic_splice_sendpage); /* * Attempt to initiate a splice from pipe to file. */ -#ifdef CONFIG_AUFS_SPLICE_PATCH long do_splice_from(struct pipe_inode_info *pipe, struct file *out, loff_t *ppos, size_t len, unsigned int flags) -#else +#if 0 static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, loff_t *ppos, size_t len, unsigned int flags) #endif @@ -919,18 +918,15 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, return out->f_op->splice_write(pipe, out, ppos, len, flags); } -#ifdef CONFIG_AUFS_SPLICE_PATCH EXPORT_SYMBOL(do_splice_from); -#endif /* * Attempt to initiate a splice from a file to a pipe. */ -#ifdef CONFIG_AUFS_SPLICE_PATCH long do_splice_to(struct file *in, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags) -#else +#if 0 static long do_splice_to(struct file *in, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags) @@ -954,9 +950,7 @@ static long do_splice_to(struct file *in, loff_t *ppos, return in->f_op->splice_read(in, ppos, pipe, len, flags); } -#ifdef CONFIG_AUFS_SPLICE_PATCH EXPORT_SYMBOL(do_splice_to); -#endif /** * splice_direct_to_actor - splices data directly between two non-pipes diff --git a/include/linux/splice.h b/include/linux/splice.h index 7846e83..d5cd3b9 100644 --- a/include/linux/splice.h +++ b/include/linux/splice.h @@ -70,11 +70,9 @@ extern ssize_t splice_to_pipe(struct pipe_inode_info *, extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *, splice_direct_actor *); -#ifdef CONFIG_AUFS_SPLICE_PATCH extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, loff_t *ppos, size_t len, unsigned int flags); extern long do_splice_to(struct file *in, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags); #endif -#endif