diff options
author | Stephen Smalley <sds@tycho.nsa.gov> | 2005-09-09 16:01:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 16:57:28 -0400 |
commit | a74574aafea3a63add3251047601611111f44562 (patch) | |
tree | a8f4a809589513c666c6f5518cbe84f50ee5523e /fs | |
parent | 570bc1c2e5ccdb408081e77507a385dc7ebed7fa (diff) |
[PATCH] Remove security_inode_post_create/mkdir/symlink/mknod hooks
This patch removes the inode_post_create/mkdir/mknod/symlink LSM hooks as
they are obsoleted by the new inode_init_security hook that enables atomic
inode security labeling.
If anyone sees any reason to retain these hooks, please speak now. Also,
is anyone using the post_rename/link hooks; if not, those could also be
removed.
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/namei.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/fs/namei.c b/fs/namei.c index 145e852c4bd0..993a65a7d570 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
@@ -1316,10 +1316,8 @@ int vfs_create(struct inode *dir, struct dentry *dentry, int mode, | |||
1316 | return error; | 1316 | return error; |
1317 | DQUOT_INIT(dir); | 1317 | DQUOT_INIT(dir); |
1318 | error = dir->i_op->create(dir, dentry, mode, nd); | 1318 | error = dir->i_op->create(dir, dentry, mode, nd); |
1319 | if (!error) { | 1319 | if (!error) |
1320 | fsnotify_create(dir, dentry->d_name.name); | 1320 | fsnotify_create(dir, dentry->d_name.name); |
1321 | security_inode_post_create(dir, dentry, mode); | ||
1322 | } | ||
1323 | return error; | 1321 | return error; |
1324 | } | 1322 | } |
1325 | 1323 | ||
@@ -1635,10 +1633,8 @@ int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev) | |||
1635 | 1633 | ||
1636 | DQUOT_INIT(dir); | 1634 | DQUOT_INIT(dir); |
1637 | error = dir->i_op->mknod(dir, dentry, mode, dev); | 1635 | error = dir->i_op->mknod(dir, dentry, mode, dev); |
1638 | if (!error) { | 1636 | if (!error) |
1639 | fsnotify_create(dir, dentry->d_name.name); | 1637 | fsnotify_create(dir, dentry->d_name.name); |
1640 | security_inode_post_mknod(dir, dentry, mode, dev); | ||
1641 | } | ||
1642 | return error; | 1638 | return error; |
1643 | } | 1639 | } |
1644 | 1640 | ||
@@ -1708,10 +1704,8 @@ int vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) | |||
1708 | 1704 | ||
1709 | DQUOT_INIT(dir); | 1705 | DQUOT_INIT(dir); |
1710 | error = dir->i_op->mkdir(dir, dentry, mode); | 1706 | error = dir->i_op->mkdir(dir, dentry, mode); |
1711 | if (!error) { | 1707 | if (!error) |
1712 | fsnotify_mkdir(dir, dentry->d_name.name); | 1708 | fsnotify_mkdir(dir, dentry->d_name.name); |
1713 | security_inode_post_mkdir(dir,dentry, mode); | ||
1714 | } | ||
1715 | return error; | 1709 | return error; |
1716 | } | 1710 | } |
1717 | 1711 | ||
@@ -1947,10 +1941,8 @@ int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname, i | |||
1947 | 1941 | ||
1948 | DQUOT_INIT(dir); | 1942 | DQUOT_INIT(dir); |
1949 | error = dir->i_op->symlink(dir, dentry, oldname); | 1943 | error = dir->i_op->symlink(dir, dentry, oldname); |
1950 | if (!error) { | 1944 | if (!error) |
1951 | fsnotify_create(dir, dentry->d_name.name); | 1945 | fsnotify_create(dir, dentry->d_name.name); |
1952 | security_inode_post_symlink(dir, dentry, oldname); | ||
1953 | } | ||
1954 | return error; | 1946 | return error; |
1955 | } | 1947 | } |
1956 | 1948 | ||