Merge branch 'from-miklos' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / include / linux / device_cgroup.h

diff --git a/include/linux/device_cgroup.h b/include/linux/device_cgroup.h
index 9a72214..d02f32b 100644 (file)
--- a/include/linux/device_cgroup.h
+++ b/include/linux/device_cgroup.h
@@ -44,6 +44,9 @@ static inline int devcgroup_inode_mknod(int mode, dev_t dev)
        if (!S_ISBLK(mode) && !S_ISCHR(mode))
                return 0;
 
+       if (S_ISCHR(mode) && dev == WHITEOUT_DEV)
+               return 0;
+
        if (S_ISBLK(mode))
                type = DEVCG_DEV_BLOCK;
        else