diff options
author | Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> | 2009-11-26 01:24:49 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-12-07 22:58:00 -0500 |
commit | 5d0901a3a0c39c97ca504f73d24030f63cfc9fa2 (patch) | |
tree | 8495b895c7c0691ebc26b806342b9ddef6967f29 /security | |
parent | 9f59f90bf57cff8be07faddc608c400b6e7c5d05 (diff) |
LSM: Rename security_path_ functions argument names.
include/linux/security.h and security/capability.c are using "struct path *dir"
but security/security.c was using "struct path *path" by error.
This patch renames "struct path *path" to "struct path *dir".
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
-rw-r--r-- | security/security.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/security/security.c b/security/security.c index 24e060be9fa5..f2d8aa949323 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -389,42 +389,42 @@ int security_inode_init_security(struct inode *inode, struct inode *dir, | |||
389 | EXPORT_SYMBOL(security_inode_init_security); | 389 | EXPORT_SYMBOL(security_inode_init_security); |
390 | 390 | ||
391 | #ifdef CONFIG_SECURITY_PATH | 391 | #ifdef CONFIG_SECURITY_PATH |
392 | int security_path_mknod(struct path *path, struct dentry *dentry, int mode, | 392 | int security_path_mknod(struct path *dir, struct dentry *dentry, int mode, |
393 | unsigned int dev) | 393 | unsigned int dev) |
394 | { | 394 | { |
395 | if (unlikely(IS_PRIVATE(path->dentry->d_inode))) | 395 | if (unlikely(IS_PRIVATE(dir->dentry->d_inode))) |
396 | return 0; | 396 | return 0; |
397 | return security_ops->path_mknod(path, dentry, mode, dev); | 397 | return security_ops->path_mknod(dir, dentry, mode, dev); |
398 | } | 398 | } |
399 | EXPORT_SYMBOL(security_path_mknod); | 399 | EXPORT_SYMBOL(security_path_mknod); |
400 | 400 | ||
401 | int security_path_mkdir(struct path *path, struct dentry *dentry, int mode) | 401 | int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode) |
402 | { | 402 | { |
403 | if (unlikely(IS_PRIVATE(path->dentry->d_inode))) | 403 | if (unlikely(IS_PRIVATE(dir->dentry->d_inode))) |
404 | return 0; | 404 | return 0; |
405 | return security_ops->path_mkdir(path, dentry, mode); | 405 | return security_ops->path_mkdir(dir, dentry, mode); |
406 | } | 406 | } |
407 | 407 | ||
408 | int security_path_rmdir(struct path *path, struct dentry *dentry) | 408 | int security_path_rmdir(struct path *dir, struct dentry *dentry) |
409 | { | 409 | { |
410 | if (unlikely(IS_PRIVATE(path->dentry->d_inode))) | 410 | if (unlikely(IS_PRIVATE(dir->dentry->d_inode))) |
411 | return 0; | 411 | return 0; |
412 | return security_ops->path_rmdir(path, dentry); | 412 | return security_ops->path_rmdir(dir, dentry); |
413 | } | 413 | } |
414 | 414 | ||
415 | int security_path_unlink(struct path *path, struct dentry *dentry) | 415 | int security_path_unlink(struct path *dir, struct dentry *dentry) |
416 | { | 416 | { |
417 | if (unlikely(IS_PRIVATE(path->dentry->d_inode))) | 417 | if (unlikely(IS_PRIVATE(dir->dentry->d_inode))) |
418 | return 0; | 418 | return 0; |
419 | return security_ops->path_unlink(path, dentry); | 419 | return security_ops->path_unlink(dir, dentry); |
420 | } | 420 | } |
421 | 421 | ||
422 | int security_path_symlink(struct path *path, struct dentry *dentry, | 422 | int security_path_symlink(struct path *dir, struct dentry *dentry, |
423 | const char *old_name) | 423 | const char *old_name) |
424 | { | 424 | { |
425 | if (unlikely(IS_PRIVATE(path->dentry->d_inode))) | 425 | if (unlikely(IS_PRIVATE(dir->dentry->d_inode))) |
426 | return 0; | 426 | return 0; |
427 | return security_ops->path_symlink(path, dentry, old_name); | 427 | return security_ops->path_symlink(dir, dentry, old_name); |
428 | } | 428 | } |
429 | 429 | ||
430 | int security_path_link(struct dentry *old_dentry, struct path *new_dir, | 430 | int security_path_link(struct dentry *old_dentry, struct path *new_dir, |