diff --git a/[refs] b/[refs]
index d59796e8b3a5..eaf40901be0d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a57195214358b75807a74bad96a8601a36262af7
+refs/heads/master: f679a84034be6f7da123be786bbd8838bf3e9207
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 19fcde289dd9..01c5f8b5a34e 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -5055,6 +5055,9 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 	u64 root_objectid;
 	int ret;
 
+	if (new_dir->i_ino == BTRFS_EMPTY_SUBVOL_DIR_OBJECTID)
+		return -EPERM;
+
 	/* we only allow rename subvolume link between subvolumes */
 	if (old_inode->i_ino != BTRFS_FIRST_FREE_OBJECTID && root != dest)
 		return -EXDEV;