From ab7069a371a7a6806acf8f1b047a3faa2136255d Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Wed, 15 Aug 2012 13:01:24 +0200
Subject: [PATCH] --- yaml --- r: 321793 b: refs/heads/master c:
 af109bca94a8a223c4632a4ff769b3419fe7ed8c h: refs/heads/master i:   321791:
 48e00967010bc98acca56c4fca3f8756327afb9e v: v3

---
 [refs]              | 2 +-
 trunk/fs/fuse/dir.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c1e3f1bc16b4..d18a09a5589e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38227f78a5020b3100cbb0406c89807563b10dae
+refs/heads/master: af109bca94a8a223c4632a4ff769b3419fe7ed8c
diff --git a/trunk/fs/fuse/dir.c b/trunk/fs/fuse/dir.c
index 8964cf3999b2..324bc0850534 100644
--- a/trunk/fs/fuse/dir.c
+++ b/trunk/fs/fuse/dir.c
@@ -383,6 +383,9 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry,
 	struct fuse_entry_out outentry;
 	struct fuse_file *ff;
 
+	/* Userspace expects S_IFREG in create mode */
+	BUG_ON((mode & S_IFMT) != S_IFREG);
+
 	forget = fuse_alloc_forget();
 	err = -ENOMEM;
 	if (!forget)