Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[linux-drm-fsl-dcu.git] / fs / proc / inode.c

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index afe232b9df6e5b6c83779712c8cd068169992a55..bd95b9fdebb005cd9912c3b80027cfc1659fc530 100644 (file)
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -422,6 +422,10 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
                inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
                PROC_I(inode)->pde = de;
 
+               if (is_empty_pde(de)) {
+                       make_empty_dir_inode(inode);
+                       return inode;
+               }
                if (de->mode) {
                        inode->i_mode = de->mode;
                        inode->i_uid = de->uid;