[PATCH 12/56] fs/btrfs: support compiling out splice

2014-11-13 Thread Pieter Smith
Compile out splice support from btrfs when the splice-family of syscalls is not
supported by the system (i.e. CONFIG_SYSCALL_SPLICE is undefined).

Signed-off-by: Pieter Smith 
---
 fs/btrfs/file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index d3afac2..68c2f0a 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2704,7 +2704,7 @@ const struct file_operations btrfs_file_operations = {
.read   = new_sync_read,
.write  = new_sync_write,
.read_iter  = generic_file_read_iter,
-   .splice_read= generic_file_splice_read,
+   SPLICE_READ_INIT(generic_file_splice_read)
.write_iter = btrfs_file_write_iter,
.mmap   = btrfs_file_mmap,
.open   = generic_file_open,
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 12/56] fs/btrfs: support compiling out splice

2014-11-13 Thread Pieter Smith
Compile out splice support from btrfs when the splice-family of syscalls is not
supported by the system (i.e. CONFIG_SYSCALL_SPLICE is undefined).

Signed-off-by: Pieter Smith pie...@boesman.nl
---
 fs/btrfs/file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index d3afac2..68c2f0a 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2704,7 +2704,7 @@ const struct file_operations btrfs_file_operations = {
.read   = new_sync_read,
.write  = new_sync_write,
.read_iter  = generic_file_read_iter,
-   .splice_read= generic_file_splice_read,
+   SPLICE_READ_INIT(generic_file_splice_read)
.write_iter = btrfs_file_write_iter,
.mmap   = btrfs_file_mmap,
.open   = generic_file_open,
-- 
1.9.1

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/