projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[deliverable/linux.git]
/
fs
/
proc
/
proc_sysctl.c
diff --git
a/fs/proc/proc_sysctl.c
b/fs/proc/proc_sysctl.c
index b59db94d2ff452b8eb3124fbc5785457d7e6d947..1b93650dda2fc5f51cb9c0d42c94efcc2f561a92 100644
(file)
--- a/
fs/proc/proc_sysctl.c
+++ b/
fs/proc/proc_sysctl.c
@@
-474,7
+474,7
@@
static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
{
struct ctl_table_header *head = grab_header(dir);
struct ctl_table_header *h = NULL;
{
struct ctl_table_header *head = grab_header(dir);
struct ctl_table_header *h = NULL;
- struct qstr *name = &dentry->d_name;
+
const
struct qstr *name = &dentry->d_name;
struct ctl_table *p;
struct inode *inode;
struct dentry *err = ERR_PTR(-ENOENT);
struct ctl_table *p;
struct inode *inode;
struct dentry *err = ERR_PTR(-ENOENT);
@@
-834,7
+834,7
@@
static int sysctl_is_seen(struct ctl_table_header *p)
return res;
}
return res;
}
-static int proc_sys_compare(const struct dentry *
parent, const struct dentry *
dentry,
+static int proc_sys_compare(const struct dentry *dentry,
unsigned int len, const char *str, const struct qstr *name)
{
struct ctl_table_header *head;
unsigned int len, const char *str, const struct qstr *name)
{
struct ctl_table_header *head;
This page took
0.023522 seconds
and
5
git commands to generate.