diff options
Diffstat (limited to 'fs/splice.c')
-rw-r--r-- | fs/splice.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/fs/splice.c b/fs/splice.c index 73766d24f97b..819023733f8e 100644 --- a/fs/splice.c +++ b/fs/splice.c | |||
@@ -976,25 +976,15 @@ generic_file_splice_write(struct pipe_inode_info *pipe, struct file *out, | |||
976 | 976 | ||
977 | if (ret > 0) { | 977 | if (ret > 0) { |
978 | unsigned long nr_pages; | 978 | unsigned long nr_pages; |
979 | int err; | ||
979 | 980 | ||
980 | *ppos += ret; | ||
981 | nr_pages = (ret + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; | 981 | nr_pages = (ret + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; |
982 | 982 | ||
983 | /* | 983 | err = generic_write_sync(out, *ppos, ret); |
984 | * If file or inode is SYNC and we actually wrote some data, | 984 | if (err) |
985 | * sync it. | 985 | ret = err; |
986 | */ | 986 | else |
987 | if (unlikely((out->f_flags & O_SYNC) || IS_SYNC(inode))) { | 987 | *ppos += ret; |
988 | int err; | ||
989 | |||
990 | mutex_lock(&inode->i_mutex); | ||
991 | err = generic_osync_inode(inode, mapping, | ||
992 | OSYNC_METADATA|OSYNC_DATA); | ||
993 | mutex_unlock(&inode->i_mutex); | ||
994 | |||
995 | if (err) | ||
996 | ret = err; | ||
997 | } | ||
998 | balance_dirty_pages_ratelimited_nr(mapping, nr_pages); | 988 | balance_dirty_pages_ratelimited_nr(mapping, nr_pages); |
999 | } | 989 | } |
1000 | 990 | ||