GFS2: Move gfs2_file_splice_write outside of #ifdef
This patch moves function gfs2_file_splice_write so it's not conditionally compiled. Signed-off-by: Bob Peterson <rpeterso@redhat.com> Acked-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
Родитель
f42a69fadc
Коммит
f1ea6f4ec0
|
@ -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,
|
||||
|
|
Загрузка…
Ссылка в новой задаче