diff --git a/[refs] b/[refs]
index 026f745f7e4b..0b24ca6d9558 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 834e74759a473f8101a273e843d1edec2778801d
+refs/heads/master: 6f902af400b2499c80865c62a06fbbd15cf804fd
diff --git a/trunk/fs/btrfs/file.c b/trunk/fs/btrfs/file.c
index ce0cd29efa9e..7f29464c0ebf 100644
--- a/trunk/fs/btrfs/file.c
+++ b/trunk/fs/btrfs/file.c
@@ -1139,7 +1139,7 @@ int btrfs_sync_file(struct file *file, struct dentry *dentry, int datasync)
 	/*
 	 * ok we haven't committed the transaction yet, lets do a commit
 	 */
-	if (file && file->private_data)
+	if (file->private_data)
 		btrfs_ioctl_trans_end(file);
 
 	trans = btrfs_start_transaction(root, 0);