projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel-stable' into for-next
[firefly-linux-kernel-4.4.55.git]
/
block
/
genhd.c
diff --git
a/block/genhd.c
b/block/genhd.c
index 3c001fba80c76f3f6a22296d07a9f94cc60044a1..20625eed55116555216cb594c49e4a0c36049675 100644
(file)
--- a/
block/genhd.c
+++ b/
block/genhd.c
@@
-1111,7
+1111,8
@@
struct class block_class = {
.name = "block",
};
-static char *block_devnode(struct device *dev, umode_t *mode)
+static char *block_devnode(struct device *dev, umode_t *mode,
+ kuid_t *uid, kgid_t *gid)
{
struct gendisk *disk = dev_to_disk(dev);