diff options
author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2010-01-26 17:02:40 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-02-07 03:06:22 -0500 |
commit | 9bbb6cad0173e6220f3ac609e26beb48dab3b7cd (patch) | |
tree | 680e0de3071c938ca9858fa9ed5bd5ca8ff2f20f /fs | |
parent | 54bb6552bd9405dc7685653157a4ec260c77a71c (diff) |
ima: rename ima_path_check to ima_file_check
ima_path_check actually deals with files! call it ima_file_check instead.
Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/namei.c | 4 | ||||
-rw-r--r-- | fs/nfsd/vfs.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/namei.c b/fs/namei.c index cd77b6375efd..d62fdc875f22 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
@@ -1736,7 +1736,7 @@ do_last: | |||
1736 | if (nd.root.mnt) | 1736 | if (nd.root.mnt) |
1737 | path_put(&nd.root); | 1737 | path_put(&nd.root); |
1738 | if (!IS_ERR(filp)) { | 1738 | if (!IS_ERR(filp)) { |
1739 | error = ima_path_check(filp, acc_mode); | 1739 | error = ima_file_check(filp, acc_mode); |
1740 | if (error) { | 1740 | if (error) { |
1741 | fput(filp); | 1741 | fput(filp); |
1742 | filp = ERR_PTR(error); | 1742 | filp = ERR_PTR(error); |
@@ -1796,7 +1796,7 @@ ok: | |||
1796 | } | 1796 | } |
1797 | filp = nameidata_to_filp(&nd); | 1797 | filp = nameidata_to_filp(&nd); |
1798 | if (!IS_ERR(filp)) { | 1798 | if (!IS_ERR(filp)) { |
1799 | error = ima_path_check(filp, acc_mode); | 1799 | error = ima_file_check(filp, acc_mode); |
1800 | if (error) { | 1800 | if (error) { |
1801 | fput(filp); | 1801 | fput(filp); |
1802 | filp = ERR_PTR(error); | 1802 | filp = ERR_PTR(error); |
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 32477e3a645c..97d79eff6b7f 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
@@ -752,7 +752,7 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, | |||
752 | flags, current_cred()); | 752 | flags, current_cred()); |
753 | if (IS_ERR(*filp)) | 753 | if (IS_ERR(*filp)) |
754 | host_err = PTR_ERR(*filp); | 754 | host_err = PTR_ERR(*filp); |
755 | host_err = ima_path_check(*filp, access); | 755 | host_err = ima_file_check(*filp, access); |
756 | out_nfserr: | 756 | out_nfserr: |
757 | err = nfserrno(host_err); | 757 | err = nfserrno(host_err); |
758 | out: | 758 | out: |