* [Cluster-devel] [GFS2 PATCH] GFS2: Move gfs2_file_splice_write outside of #ifdef [not found] <199572992.18269094.1424785750018.JavaMail.zimbra@redhat.com> @ 2015-02-24 13:50 ` Bob Peterson 2015-02-24 14:19 ` Steven Whitehouse 0 siblings, 1 reply; 2+ messages in thread From: Bob Peterson @ 2015-02-24 13:50 UTC (permalink / raw) To: cluster-devel.redhat.com 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 <rpeterso@redhat.com> --- 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, ^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Cluster-devel] [GFS2 PATCH] GFS2: Move gfs2_file_splice_write outside of #ifdef 2015-02-24 13:50 ` [Cluster-devel] [GFS2 PATCH] GFS2: Move gfs2_file_splice_write outside of #ifdef Bob Peterson @ 2015-02-24 14:19 ` Steven Whitehouse 0 siblings, 0 replies; 2+ messages in thread From: Steven Whitehouse @ 2015-02-24 14:19 UTC (permalink / raw) To: cluster-devel.redhat.com Hi, Acked-by: Steven Whitehouse <swhiteho@redhat.com> Steve. On 24/02/15 13:50, Bob Peterson wrote: > 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 <rpeterso@redhat.com> > --- > 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, > ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-02-24 14:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <199572992.18269094.1424785750018.JavaMail.zimbra@redhat.com>
2015-02-24 13:50 ` [Cluster-devel] [GFS2 PATCH] GFS2: Move gfs2_file_splice_write outside of #ifdef Bob Peterson
2015-02-24 14:19 ` Steven Whitehouse
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).