diff options
Diffstat (limited to 'fs/ocfs2/file.c')
| -rw-r--r-- | fs/ocfs2/file.c | 6 | 
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 061591a3ab0..7602783d7f4 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -1950,7 +1950,7 @@ static int __ocfs2_change_file_space(struct file *file, struct inode *inode,  	if (ret < 0)  		mlog_errno(ret); -	if (file->f_flags & O_SYNC) +	if (file && (file->f_flags & O_SYNC))  		handle->h_sync = 1;  	ocfs2_commit_trans(osb, handle); @@ -2422,8 +2422,10 @@ out_dio:  		unaligned_dio = 0;  	} -	if (unaligned_dio) +	if (unaligned_dio) { +		ocfs2_iocb_clear_unaligned_aio(iocb);  		atomic_dec(&OCFS2_I(inode)->ip_unaligned_aio); +	}  out:  	if (rw_level != -1)  |