projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into upstream
[powerpc.git]
/
fs
/
sysfs
/
dir.c
diff --git
a/fs/sysfs/dir.c
b/fs/sysfs/dir.c
index
9dcdf55
..
8813990
100644
(file)
--- a/
fs/sysfs/dir.c
+++ b/
fs/sysfs/dir.c
@@
-37,11
+37,10
@@
static struct sysfs_dirent * __sysfs_new_dirent(void * element)
{
struct sysfs_dirent * sd;
{
struct sysfs_dirent * sd;
- sd = kmem_cache_alloc(sysfs_dir_cachep, GFP_KERNEL);
+ sd = kmem_cache_
z
alloc(sysfs_dir_cachep, GFP_KERNEL);
if (!sd)
return NULL;
if (!sd)
return NULL;
- memset(sd, 0, sizeof(*sd));
atomic_set(&sd->s_count, 1);
atomic_set(&sd->s_event, 1);
INIT_LIST_HEAD(&sd->s_children);
atomic_set(&sd->s_count, 1);
atomic_set(&sd->s_event, 1);
INIT_LIST_HEAD(&sd->s_children);
@@
-297,7
+296,7
@@
static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,
return ERR_PTR(err);
}
return ERR_PTR(err);
}
-struct inode_operations sysfs_dir_inode_operations = {
+
const
struct inode_operations sysfs_dir_inode_operations = {
.lookup = sysfs_lookup,
.setattr = sysfs_setattr,
};
.lookup = sysfs_lookup,
.setattr = sysfs_setattr,
};