drm/i915: Only update mode related state if a modeset happened.

[firefly-linux-kernel-4.4.55.git] / fs / proc / generic.c

diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index df6327a2b86507b371608a752f65bf12241bf38c..e5dee5c3188eb10e94742fbb57bb3b3564fa61bb 100644 (file)
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -373,6 +373,10 @@ static struct proc_dir_entry *__proc_create(struct proc_dir_entry **parent,
                WARN(1, "create '/proc/%s' by hand\n", qstr.name);
                return NULL;
        }
+       if (is_empty_pde(*parent)) {
+               WARN(1, "attempt to add to permanently empty directory");
+               return NULL;
+       }
 
        ent = kzalloc(sizeof(struct proc_dir_entry) + qstr.len + 1, GFP_KERNEL);
        if (!ent)
@@ -455,6 +459,25 @@ struct proc_dir_entry *proc_mkdir(const char *name,
 }
 EXPORT_SYMBOL(proc_mkdir);
 
+struct proc_dir_entry *proc_create_mount_point(const char *name)
+{
+       umode_t mode = S_IFDIR | S_IRUGO | S_IXUGO;
+       struct proc_dir_entry *ent, *parent = NULL;
+
+       ent = __proc_create(&parent, name, mode, 2);
+       if (ent) {
+               ent->data = NULL;
+               ent->proc_fops = NULL;
+               ent->proc_iops = NULL;
+               if (proc_register(parent, ent) < 0) {
+                       kfree(ent);
+                       parent->nlink--;
+                       ent = NULL;
+               }
+       }
+       return ent;
+}
+
 struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
                                        struct proc_dir_entry *parent,
                                        const struct file_operations *proc_fops,