2014-11-13 21:42:49

by Pieter Smith

Subject: [PATCH 17/56] fs/exofs: support compiling out splice

Compile out splice support from exofs when the splice-family of syscalls is not
supported by the system (i.e. CONFIG_SYSCALL_SPLICE is undefined).

Signed-off-by: Pieter Smith <[email protected]>
---
fs/exofs/file.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/exofs/file.c b/fs/exofs/file.c
index 71bf8e4..23dfb05 100644
--- a/fs/exofs/file.c
+++ b/fs/exofs/file.c
@@ -76,8 +76,8 @@ const struct file_operations exofs_file_operations = {
.release = exofs_release_file,
.fsync = exofs_file_fsync,
.flush = exofs_flush,
- .splice_read = generic_file_splice_read,
- .splice_write = iter_file_splice_write,
+ SPLICE_READ_INIT(generic_file_splice_read)
+ SPLICE_WRITE_INIT(iter_file_splice_write)
};

const struct inode_operations exofs_file_inode_operations = {
--
1.9.1

2014-11-16 09:02:28

by Boaz Harrosh

Subject: Re: [osd-dev] [PATCH 17/56] fs/exofs: support compiling out splice

On 11/13/2014 11:22 PM, Pieter Smith wrote:
> Compile out splice support from exofs when the splice-family of syscalls is not
> supported by the system (i.e. CONFIG_SYSCALL_SPLICE is undefined).
>
> Signed-off-by: Pieter Smith <[email protected]>

ACK-by: Boaz Harrosh <[email protected]>

Or do you need that I push it through my tree ?
> ---
> fs/exofs/file.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/exofs/file.c b/fs/exofs/file.c
> index 71bf8e4..23dfb05 100644
> --- a/fs/exofs/file.c
> +++ b/fs/exofs/file.c
> @@ -76,8 +76,8 @@ const struct file_operations exofs_file_operations = {
> .release = exofs_release_file,
> .fsync = exofs_file_fsync,
> .flush = exofs_flush,
> - .splice_read = generic_file_splice_read,
> - .splice_write = iter_file_splice_write,
> + SPLICE_READ_INIT(generic_file_splice_read)
> + SPLICE_WRITE_INIT(iter_file_splice_write)
> };
>
> const struct inode_operations exofs_file_inode_operations = {
>