From bf4fcbfcfe416202266039291469e450ecd7615d Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Wed, 14 May 2008 17:10:12 -0700 Subject: [PATCH] --- yaml --- r: 96999 b: refs/heads/master c: 6793a051fb9311f0f1ab7eafc5a9e69b8a1bd8d4 h: refs/heads/master i: 96997: 6998c4229e6787ccf306451b7c1316198f2005a9 96995: 8d810183b5d2955b2edbb16c37b65d60f3468c7a 96991: bed64dda838268b9e595061b6c640cfb2055e866 v: v3 --- [refs] | 2 +- trunk/kernel/audit_tree.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1ed5c7bec66d..496637e99421 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fcaf1eb8685a00a99259e138e403841e984385b0 +refs/heads/master: 6793a051fb9311f0f1ab7eafc5a9e69b8a1bd8d4 diff --git a/trunk/kernel/audit_tree.c b/trunk/kernel/audit_tree.c index 9ef5e0aacc3c..f7921a2ecf16 100644 --- a/trunk/kernel/audit_tree.c +++ b/trunk/kernel/audit_tree.c @@ -172,10 +172,9 @@ static void insert_hash(struct audit_chunk *chunk) struct audit_chunk *audit_tree_lookup(const struct inode *inode) { struct list_head *list = chunk_hash(inode); - struct list_head *pos; + struct audit_chunk *p; - list_for_each_rcu(pos, list) { - struct audit_chunk *p = container_of(pos, struct audit_chunk, hash); + list_for_each_entry_rcu(p, list, hash) { if (p->watch.inode == inode) { get_inotify_watch(&p->watch); return p;