Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f76cdcee5ba4a3fb41de93d5f1c17fb6ab4d0820
Commit:     f76cdcee5ba4a3fb41de93d5f1c17fb6ab4d0820
Parent:     9a36e8c2b337c424ed77f5dea0a67dc8039d351b
Author:     Michal Miroslaw <[EMAIL PROTECTED]>
AuthorDate: Fri Mar 23 11:12:03 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Apr 25 22:27:40 2007 -0700

    [NETFILTER]: nfnetlink_log: iterator functions need iter_state * only
    
    get_*() don't need access to seq_file - iter_state is enough for them.
    
    Signed-off-by: Michal Miroslaw <[EMAIL PROTECTED]>
    Signed-off-by: Patrick McHardy <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 net/netfilter/nfnetlink_log.c |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 441f0fb..e934770 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -919,10 +919,8 @@ struct iter_state {
        unsigned int bucket;
 };
 
-static struct hlist_node *get_first(struct seq_file *seq)
+static struct hlist_node *get_first(struct iter_state *st)
 {
-       struct iter_state *st = seq->private;
-
        if (!st)
                return NULL;
 
@@ -933,10 +931,8 @@ static struct hlist_node *get_first(struct seq_file *seq)
        return NULL;
 }
 
-static struct hlist_node *get_next(struct seq_file *seq, struct hlist_node *h)
+static struct hlist_node *get_next(struct iter_state *st, struct hlist_node *h)
 {
-       struct iter_state *st = seq->private;
-
        h = h->next;
        while (!h) {
                if (++st->bucket >= INSTANCE_BUCKETS)
@@ -947,13 +943,13 @@ static struct hlist_node *get_next(struct seq_file *seq, 
struct hlist_node *h)
        return h;
 }
 
-static struct hlist_node *get_idx(struct seq_file *seq, loff_t pos)
+static struct hlist_node *get_idx(struct iter_state *st, loff_t pos)
 {
        struct hlist_node *head;
-       head = get_first(seq);
+       head = get_first(st);
 
        if (head)
-               while (pos && (head = get_next(seq, head)))
+               while (pos && (head = get_next(st, head)))
                        pos--;
        return pos ? NULL : head;
 }
@@ -961,13 +957,13 @@ static struct hlist_node *get_idx(struct seq_file *seq, 
loff_t pos)
 static void *seq_start(struct seq_file *seq, loff_t *pos)
 {
        read_lock_bh(&instances_lock);
-       return get_idx(seq, *pos);
+       return get_idx(seq->private, *pos);
 }
 
 static void *seq_next(struct seq_file *s, void *v, loff_t *pos)
 {
        (*pos)++;
-       return get_next(s, v);
+       return get_next(s->private, v);
 }
 
 static void seq_stop(struct seq_file *s, void *v)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to