diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-15 12:59:42 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-15 12:59:42 +0900 |
| commit | 60e0a4c7adc700f2d2929cdb2d0055e519a3eb3d (patch) | |
| tree | b19755368b6d0f6be3024d972de13f4b48cb025d /fs/ocfs2/file.c | |
| parent | 180aa6e6aa11922dcd4c13df1967d62bb2ede76c (diff) | |
| parent | 237674e050ae8ea40a432412df6c15d60b7ae8a6 (diff) | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'fs/ocfs2/file.c')
| -rw-r--r-- | fs/ocfs2/file.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 62442e413a0..aa501d3f93f 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -1851,6 +1851,7 @@ relock: if (ret) goto out_dio; + count = ocount; ret = generic_write_checks(file, ppos, &count, S_ISBLK(inode->i_mode)); if (ret) @@ -1918,8 +1919,10 @@ out_sems: mutex_unlock(&inode->i_mutex); + if (written) + ret = written; mlog_exit(ret); - return written ? written : ret; + return ret; } static int ocfs2_splice_to_file(struct pipe_inode_info *pipe, |