diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2009-04-14 19:48:39 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-04-15 12:10:12 +0200 |
| commit | 328eaaba4e41a04c1dc4679d65bea3fee4349d86 (patch) | |
| tree | 171bf86b590a841729bab11feec874869bcab49e /fs/splice.c | |
| parent | eb443e5a25d43996deb62b9bcee1a4ce5dea2ead (diff) | |
| download | kernel-crypto-328eaaba4e41a04c1dc4679d65bea3fee4349d86.tar.gz kernel-crypto-328eaaba4e41a04c1dc4679d65bea3fee4349d86.tar.xz kernel-crypto-328eaaba4e41a04c1dc4679d65bea3fee4349d86.zip | |
ocfs2: fix i_mutex locking in ocfs2_splice_to_file()
Rearrange locking of i_mutex on destination and call to
ocfs2_rw_lock() so locks are only held while buffers are copied with
the pipe_to_file() actor, and not while waiting for more data on the
pipe.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs/splice.c')
| -rw-r--r-- | fs/splice.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/splice.c b/fs/splice.c index a1f595b9db4..584b2b7a1db 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -555,8 +555,8 @@ static int pipe_to_sendpage(struct pipe_inode_info *pipe, * SPLICE_F_MOVE isn't set, or we cannot move the page, we simply create * a new page in the output file page cache and fill/dirty that. */ -static int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf, - struct splice_desc *sd) +int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf, + struct splice_desc *sd) { struct file *file = sd->u.file; struct address_space *mapping = file->f_mapping; @@ -600,6 +600,7 @@ static int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf, out: return ret; } +EXPORT_SYMBOL(pipe_to_file); static void wakeup_pipe_writers(struct pipe_inode_info *pipe) { |