---

yaml --- r: 147783 b: refs/heads/master c: 0b4dcea h: refs/heads/master i: 147781: 29ea4e6 147779: 835c532 147775: c1ce99c v: v3
git-mirror · Jun 11, 2009 · be0098c · be0098c
1 parent 94e64f7
commit be0098c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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;