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 tag 'pwm/for-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...
[firefly-linux-kernel-4.4.55.git]
/
security
/
capability.c
diff --git
a/security/capability.c
b/security/capability.c
index 58a1600c149bfaf9f11b1f60eb124f2a1c52024d..7d3f38fe02ba6ca7d75446c6d20e41c049b17b00 100644
(file)
--- a/
security/capability.c
+++ b/
security/capability.c
@@
-209,8
+209,8
@@
static int cap_inode_readlink(struct dentry *dentry)
return 0;
}
return 0;
}
-static int cap_inode_follow_link(struct dentry *dentry,
-
struct nameidata *nameidata
)
+static int cap_inode_follow_link(struct dentry *dentry,
struct inode *inode,
+
bool rcu
)
{
return 0;
}
{
return 0;
}
@@
-225,7
+225,7
@@
static int cap_inode_setattr(struct dentry *dentry, struct iattr *iattr)
return 0;
}
return 0;
}
-static int cap_inode_getattr(
struct vfsmount *mnt, struct dentry *dentry
)
+static int cap_inode_getattr(
const struct path *path
)
{
return 0;
}
{
return 0;
}