[RFC PATCH v1 24/30] IMA: switch IMA over to new i_version API

[Jeff Layton]

This change is straightforward, but I have some serious doubts about
this code.

Signed-off-by: Jeff Layton <jlay...@redhat.com>
---
 security/integrity/ima/ima_api.c  | 2 +-
 security/integrity/ima/ima_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
index 9df26a2b75ba..1f676313c30b 100644
--- a/security/integrity/ima/ima_api.c
+++ b/security/integrity/ima/ima_api.c
@@ -204,7 +204,7 @@ int ima_collect_measurement(struct integrity_iint_cache 
*iint,
        } hash;
 
        if (!(iint->flags & IMA_COLLECTED)) {
-               u64 i_version = file_inode(file)->i_version;
+               u64 i_version = inode_get_iversion(file_inode(file));
 
                if (file->f_flags & O_DIRECT) {
                        audit_cause = "failed(directio)";
diff --git a/security/integrity/ima/ima_main.c 
b/security/integrity/ima/ima_main.c
index 423d111b3b94..8d95cf42d20c 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -122,7 +122,7 @@ static void ima_check_last_writer(struct 
integrity_iint_cache *iint,
 
        inode_lock(inode);
        if (atomic_read(&inode->i_writecount) == 1) {
-               if ((iint->version != inode->i_version) ||
+               if (inode_cmp_iversion(inode, iint->version) ||
                    (iint->flags & IMA_NEW_FILE)) {
                        iint->flags &= ~(IMA_DONE_MASK | IMA_NEW_FILE);
                        iint->measured_pcrs = 0;
-- 
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html