From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Peterson Date: Tue, 24 Feb 2015 08:50:12 -0500 (EST) Subject: [Cluster-devel] [GFS2 PATCH] GFS2: Move gfs2_file_splice_write outside of #ifdef In-Reply-To: <199572992.18269094.1424785750018.JavaMail.zimbra@redhat.com> Message-ID: <801342297.18270105.1424785812478.JavaMail.zimbra@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Hi, This patch moves function gfs2_file_splice_write so it's not conditionally compiled. Regards, Bob Peterson Red Hat File Systems Signed-off-by: Bob Peterson --- fs/gfs2/file.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index 556d774..7353c0a 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c @@ -931,6 +931,22 @@ out_uninit: return ret; } +static ssize_t gfs2_file_splice_write(struct pipe_inode_info *pipe, + struct file *out, loff_t *ppos, + size_t len, unsigned int flags) +{ + int error; + struct gfs2_inode *ip = GFS2_I(out->f_mapping->host); + + error = gfs2_rs_alloc(ip); + if (error) + return (ssize_t)error; + + gfs2_size_hint(out, *ppos, len); + + return iter_file_splice_write(pipe, out, ppos, len, flags); +} + #ifdef CONFIG_GFS2_FS_LOCKING_DLM /** @@ -1063,22 +1079,6 @@ static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl) } } -static ssize_t gfs2_file_splice_write(struct pipe_inode_info *pipe, - struct file *out, loff_t *ppos, - size_t len, unsigned int flags) -{ - int error; - struct gfs2_inode *ip = GFS2_I(out->f_mapping->host); - - error = gfs2_rs_alloc(ip); - if (error) - return (ssize_t)error; - - gfs2_size_hint(out, *ppos, len); - - return iter_file_splice_write(pipe, out, ppos, len, flags); -} - const struct file_operations gfs2_file_fops = { .llseek = gfs2_llseek, .read = new_sync_read,