diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-21 02:32:24 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-04-09 14:13:00 -0400 |
| commit | 72b0d9aacb89f3759931ec440e1b535671145bb4 (patch) | |
| tree | 65b5d6166912b1c406fad596e06138d60cf3b8ff /fs/ocfs2 | |
| parent | ba5bb147330a8737b6b5a812cc774c79c070704b (diff) | |
| download | linux-3.10-72b0d9aacb89f3759931ec440e1b535671145bb4.tar.gz linux-3.10-72b0d9aacb89f3759931ec440e1b535671145bb4.tar.bz2 linux-3.10-72b0d9aacb89f3759931ec440e1b535671145bb4.zip | |
pipe: don't use ->i_mutex
now it can be done - put mutex into pipe_inode_info, use it instead
of ->i_mutex
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/file.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 1c93e771e95..8a7509f9e6f 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -2465,8 +2465,7 @@ static ssize_t ocfs2_file_splice_write(struct pipe_inode_info *pipe, out->f_path.dentry->d_name.len, out->f_path.dentry->d_name.name, len); - if (pipe->inode) - mutex_lock_nested(&pipe->inode->i_mutex, I_MUTEX_PARENT); + pipe_lock(pipe); splice_from_pipe_begin(&sd); do { @@ -2486,8 +2485,7 @@ static ssize_t ocfs2_file_splice_write(struct pipe_inode_info *pipe, } while (ret > 0); splice_from_pipe_end(pipe, &sd); - if (pipe->inode) - mutex_unlock(&pipe->inode->i_mutex); + pipe_unlock(pipe); if (sd.num_spliced) ret = sd.num_spliced; |