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 | ima: initialize ima before inodes can be allocated (diff) | |
| download | linux-dev-9bbb6cad0173e6220f3ac609e26beb48dab3b7cd.tar.xz linux-dev-9bbb6cad0173e6220f3ac609e26beb48dab3b7cd.zip | |
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: if (nd.root.mnt) path_put(&nd.root); if (!IS_ERR(filp)) { - error = ima_path_check(filp, acc_mode); + error = ima_file_check(filp, acc_mode); if (error) { fput(filp); filp = ERR_PTR(error); @@ -1796,7 +1796,7 @@ ok: } filp = nameidata_to_filp(&nd); if (!IS_ERR(filp)) { - error = ima_path_check(filp, acc_mode); + error = ima_file_check(filp, acc_mode); if (error) { fput(filp); 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, flags, current_cred()); if (IS_ERR(*filp)) host_err = PTR_ERR(*filp); - host_err = ima_path_check(*filp, access); + host_err = ima_file_check(*filp, access); out_nfserr: err = nfserrno(host_err); out: |