[PATCH 24/56] fs/gfs2: support compiling out splice

From: Pieter Smith
Date: Thu Nov 13 2014 - 16:41:13 EST


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

Signed-off-by: Pieter Smith <pieter@xxxxxxxxxx>
---
fs/gfs2/file.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 26b3f95..f7cb861 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -1067,8 +1067,8 @@ const struct file_operations gfs2_file_fops = {
.fsync = gfs2_fsync,
.lock = gfs2_lock,
.flock = gfs2_flock,
- .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)
.setlease = gfs2_setlease,
.fallocate = gfs2_fallocate,
};
@@ -1097,8 +1097,8 @@ const struct file_operations gfs2_file_fops_nolock = {
.open = gfs2_open,
.release = gfs2_release,
.fsync = gfs2_fsync,
- .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)
.setlease = generic_setlease,
.fallocate = gfs2_fallocate,
};
--
1.9.1

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