From be0098cbb6bec308c7e6ad64ce2a7baa92515678 Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Thu, 11 Jun 2009 11:13:35 -0400
Subject: [PATCH] --- yaml --- r: 147783 b: refs/heads/master c:
 0b4dcea579a1b6f4d249d61f5bc8adeaa7c895d8 h: refs/heads/master i:   147781:
 29ea4e62dfa4dd4d1572800d0d83ff070f34eddc   147779:
 835c532f397bdf357a17d3b19914a94ed4a623cb   147775:
 c1ce99c2dfec664e93e87eb5e3b1e773f07e8e28 v: v3

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

diff --git a/[refs] b/[refs]
index 85bcf690ee14..17a7e8e3a30d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 067c28adc53807514ac0c6ebb6af3243cbd071fa
+refs/heads/master: 0b4dcea579a1b6f4d249d61f5bc8adeaa7c895d8
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
index 926332a73cde..eff18f5b5362 100644
--- a/trunk/fs/btrfs/ioctl.c
+++ b/trunk/fs/btrfs/ioctl.c
@@ -112,7 +112,12 @@ void btrfs_update_iflags(struct inode *inode)
  */
 void btrfs_inherit_iflags(struct inode *inode, struct inode *dir)
 {
-	unsigned int flags = BTRFS_I(dir)->flags;
+	unsigned int flags;
+
+	if (!dir)
+		return;
+
+	flags = BTRFS_I(dir)->flags;
 
 	if (S_ISREG(inode->i_mode))
 		flags &= ~BTRFS_INODE_DIRSYNC;