From bc21a76b4465f32467e06d9e1aad117515c3e380 Mon Sep 17 00:00:00 2001
From: Luis Henriques <luis.henriques@canonical.com>
Date: Wed, 11 Jul 2012 14:02:10 -0700
Subject: [PATCH] --- yaml --- r: 311820 b: refs/heads/master c:
 a4e08d001f2e50bb8b3c4eebadcf08e5535f02ee h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/ocfs2/file.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index eb1a32fb1686..414cf18cc0a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b4fa63a9e5696fa43f25143f104ef0bea642222
+refs/heads/master: a4e08d001f2e50bb8b3c4eebadcf08e5535f02ee
diff --git a/trunk/fs/ocfs2/file.c b/trunk/fs/ocfs2/file.c
index 98513c8ed589..7602783d7f41 100644
--- a/trunk/fs/ocfs2/file.c
+++ b/trunk/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);