projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[deliverable/linux.git]
/
security
/
dummy.c
diff --git
a/security/dummy.c
b/security/dummy.c
index 6ff887586479546054956d17a2a5e5faba3dce85..9623a61dfc763df8511c6d515aac2705454ce64c 100644
(file)
--- a/
security/dummy.c
+++ b/
security/dummy.c
@@
-258,16
+258,16
@@
static void dummy_inode_free_security (struct inode *inode)
return;
}
return;
}
-static int dummy_inode_
create (struct inode *inode, struct dentry *dentry
,
-
int mask
)
+static int dummy_inode_
init_security (struct inode *inode, struct inode *dir
,
+
char **name, void **value, size_t *len
)
{
{
- return
0
;
+ return
-EOPNOTSUPP
;
}
}
-static
void dummy_inode_post
_create (struct inode *inode, struct dentry *dentry,
-
int mask)
+static
int dummy_inode
_create (struct inode *inode, struct dentry *dentry,
+ int mask)
{
{
- return;
+ return
0
;
}
static int dummy_inode_link (struct dentry *old_dentry, struct inode *inode,
}
static int dummy_inode_link (struct dentry *old_dentry, struct inode *inode,
@@
-276,13
+276,6
@@
static int dummy_inode_link (struct dentry *old_dentry, struct inode *inode,
return 0;
}
return 0;
}
-static void dummy_inode_post_link (struct dentry *old_dentry,
- struct inode *inode,
- struct dentry *new_dentry)
-{
- return;
-}
-
static int dummy_inode_unlink (struct inode *inode, struct dentry *dentry)
{
return 0;
static int dummy_inode_unlink (struct inode *inode, struct dentry *dentry)
{
return 0;
@@
-294,24
+287,12
@@
static int dummy_inode_symlink (struct inode *inode, struct dentry *dentry,
return 0;
}
return 0;
}
-static void dummy_inode_post_symlink (struct inode *inode,
- struct dentry *dentry, const char *name)
-{
- return;
-}
-
static int dummy_inode_mkdir (struct inode *inode, struct dentry *dentry,
int mask)
{
return 0;
}
static int dummy_inode_mkdir (struct inode *inode, struct dentry *dentry,
int mask)
{
return 0;
}
-static void dummy_inode_post_mkdir (struct inode *inode, struct dentry *dentry,
- int mask)
-{
- return;
-}
-
static int dummy_inode_rmdir (struct inode *inode, struct dentry *dentry)
{
return 0;
static int dummy_inode_rmdir (struct inode *inode, struct dentry *dentry)
{
return 0;
@@
-323,12
+304,6
@@
static int dummy_inode_mknod (struct inode *inode, struct dentry *dentry,
return 0;
}
return 0;
}
-static void dummy_inode_post_mknod (struct inode *inode, struct dentry *dentry,
- int mode, dev_t dev)
-{
- return;
-}
-
static int dummy_inode_rename (struct inode *old_inode,
struct dentry *old_dentry,
struct inode *new_inode,
static int dummy_inode_rename (struct inode *old_inode,
struct dentry *old_dentry,
struct inode *new_inode,
@@
-337,14
+312,6
@@
static int dummy_inode_rename (struct inode *old_inode,
return 0;
}
return 0;
}
-static void dummy_inode_post_rename (struct inode *old_inode,
- struct dentry *old_dentry,
- struct inode *new_inode,
- struct dentry *new_dentry)
-{
- return;
-}
-
static int dummy_inode_readlink (struct dentry *dentry)
{
return 0;
static int dummy_inode_readlink (struct dentry *dentry)
{
return 0;
@@
-886,20
+853,15
@@
void security_fixup_ops (struct security_operations *ops)
set_to_dummy_if_null(ops, sb_post_pivotroot);
set_to_dummy_if_null(ops, inode_alloc_security);
set_to_dummy_if_null(ops, inode_free_security);
set_to_dummy_if_null(ops, sb_post_pivotroot);
set_to_dummy_if_null(ops, inode_alloc_security);
set_to_dummy_if_null(ops, inode_free_security);
+ set_to_dummy_if_null(ops, inode_init_security);
set_to_dummy_if_null(ops, inode_create);
set_to_dummy_if_null(ops, inode_create);
- set_to_dummy_if_null(ops, inode_post_create);
set_to_dummy_if_null(ops, inode_link);
set_to_dummy_if_null(ops, inode_link);
- set_to_dummy_if_null(ops, inode_post_link);
set_to_dummy_if_null(ops, inode_unlink);
set_to_dummy_if_null(ops, inode_symlink);
set_to_dummy_if_null(ops, inode_unlink);
set_to_dummy_if_null(ops, inode_symlink);
- set_to_dummy_if_null(ops, inode_post_symlink);
set_to_dummy_if_null(ops, inode_mkdir);
set_to_dummy_if_null(ops, inode_mkdir);
- set_to_dummy_if_null(ops, inode_post_mkdir);
set_to_dummy_if_null(ops, inode_rmdir);
set_to_dummy_if_null(ops, inode_mknod);
set_to_dummy_if_null(ops, inode_rmdir);
set_to_dummy_if_null(ops, inode_mknod);
- set_to_dummy_if_null(ops, inode_post_mknod);
set_to_dummy_if_null(ops, inode_rename);
set_to_dummy_if_null(ops, inode_rename);
- set_to_dummy_if_null(ops, inode_post_rename);
set_to_dummy_if_null(ops, inode_readlink);
set_to_dummy_if_null(ops, inode_follow_link);
set_to_dummy_if_null(ops, inode_permission);
set_to_dummy_if_null(ops, inode_readlink);
set_to_dummy_if_null(ops, inode_follow_link);
set_to_dummy_if_null(ops, inode_permission);
This page took
0.043889 seconds
and
5
git commands to generate.