From 1988ca57f73179779d5e0ccfe09e3d79bdc6f4af Mon Sep 17 00:00:00 2001
From: Nicolas Kaiser <nikai@nikai.net>
Date: Fri, 6 Jan 2006 00:11:22 -0800
Subject: [PATCH] --- yaml --- r: 16340 b: refs/heads/master c:
 6e20a64a3913819133fefeca466211c7eb8adda1 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/security/selinux/selinuxfs.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a74d35c3f68c..fd90f1d758bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b09eb1c06a14641209e6b86e9a5b28ea8287f193
+refs/heads/master: 6e20a64a3913819133fefeca466211c7eb8adda1
diff --git a/trunk/security/selinux/selinuxfs.c b/trunk/security/selinux/selinuxfs.c
index 0e1352a555c8..e59da6398d44 100644
--- a/trunk/security/selinux/selinuxfs.c
+++ b/trunk/security/selinux/selinuxfs.c
@@ -376,7 +376,7 @@ static ssize_t selinux_transaction_write(struct file *file, const char __user *b
 	char *data;
 	ssize_t rv;
 
-	if (ino >= sizeof(write_op)/sizeof(write_op[0]) || !write_op[ino])
+	if (ino >= ARRAY_SIZE(write_op) || !write_op[ino])
 		return -EINVAL;
 
 	data = simple_transaction_get(file, buf, size);
@@ -1161,7 +1161,7 @@ static int sel_make_avc_files(struct dentry *dir)
 #endif
 	};
 
-	for (i = 0; i < sizeof (files) / sizeof (files[0]); i++) {
+	for (i = 0; i < ARRAY_SIZE(files); i++) {
 		struct inode *inode;
 		struct dentry *dentry;