commit 0b4dcea579a1b6f4d249d61f5bc8adeaa7c895d8
author Chris Mason <chris.mason@oracle.com> Thu Jun 11 11:13:35 2009 -0400
committer Chris Mason <chris.mason@oracle.com> Thu Jun 11 11:13:35 2009 -0400
tree 2d8c0a56d853516136fcf9ff43672aca9f011057
parent 067c28adc53807514ac0c6ebb6af3243cbd071fa

Btrfs: fix oops when btrfs_inherit_iflags called with a NULL dir

This happens during subvol creation.

Signed-off-by: Chris Mason <chris.mason@oracle.com>

fs/btrfs/ioctl.c

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 926332a..eff18f5 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -112,7 +112,12 @@
  */
 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;