diff options
| author | Jan Kara <jack@suse.cz> | 2009-08-18 20:24:31 +0400 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2009-09-14 19:08:16 +0400 |
| commit | d23c937b0f740888765676f6f82f509dbbb2bbad (patch) | |
| tree | df4e085d935805f54061436ee820460c79143087 | |
| parent | ebbbf757c6b8577ac2fb6181c08c2059153bb0e2 (diff) | |
| download | linux-d23c937b0f740888765676f6f82f509dbbb2bbad.tar.xz | |
ocfs2: Update syncing after splicing to match generic version
Update ocfs2 specific splicing code to use generic syncing helper. The sync now
does not happen under rw_lock because generic_write_sync() acquires i_mutex
which ranks above rw_lock. That should not matter because standard fsync path
does not hold it either.
Acked-by: Joel Becker <Joel.Becker@oracle.com>
Acked-by: Mark Fasheh <mfasheh@suse.com>
CC: ocfs2-devel@oss.oracle.com
Signed-off-by: Jan Kara <jack@suse.cz>
| -rw-r--r-- | fs/ocfs2/file.c | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 600227389387..221c5e98957b 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -1993,31 +1993,16 @@ static ssize_t ocfs2_file_splice_write(struct pipe_inode_info *pipe, if (ret > 0) { unsigned long nr_pages; + int err; - *ppos += ret; nr_pages = (ret + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; - /* - * If file or inode is SYNC and we actually wrote some data, - * sync it. - */ - if (unlikely((out->f_flags & O_SYNC) || IS_SYNC(inode))) { - int err; - - mutex_lock(&inode->i_mutex); - err = ocfs2_rw_lock(inode, 1); - if (err < 0) { - mlog_errno(err); - } else { - err = generic_osync_inode(inode, mapping, - OSYNC_METADATA|OSYNC_DATA); - ocfs2_rw_unlock(inode, 1); - } - mutex_unlock(&inode->i_mutex); + err = generic_write_sync(out, *ppos, ret); + if (err) + ret = err; + else + *ppos += ret; - if (err) - ret = err; - } balance_dirty_pages_ratelimited_nr(mapping, nr_pages); } |