From 96c704ece5fd9cabf406b76d5efd9a22fe292086 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Sat, 29 May 2010 09:49:07 +0000
Subject: [PATCH] --- yaml --- r: 200366 b: refs/heads/master c:
 6f902af400b2499c80865c62a06fbbd15cf804fd h: refs/heads/master v: v3

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

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);