Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1ea6f4e authored by Bob Peterson's avatar Bob Peterson
Browse files

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: default avatarBob Peterson <rpeterso@redhat.com>
Acked-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent f42a69fa

fs/gfs2/file.c

+16 −16
Original line number Diff line number Diff line
@@ -931,6 +931,22 @@ static long gfs2_fallocate(struct file *file, int mode, loff_t offset, loff_t le 
	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,