Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: ax25: use seq_hlist_foo() helpers

Simplify seq_file code.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Li Zefan and committed by
David S. Miller
b512f3d8 90dd7f5a

+7 -36
+3 -15
net/ax25/af_ax25.c
··· 1863 1863 static void *ax25_info_start(struct seq_file *seq, loff_t *pos) 1864 1864 __acquires(ax25_list_lock) 1865 1865 { 1866 - struct ax25_cb *ax25; 1867 - struct hlist_node *node; 1868 - int i = 0; 1869 - 1870 1866 spin_lock_bh(&ax25_list_lock); 1871 - ax25_for_each(ax25, node, &ax25_list) { 1872 - if (i == *pos) 1873 - return ax25; 1874 - ++i; 1875 - } 1876 - return NULL; 1867 + return seq_hlist_start(&ax25_list, *pos); 1877 1868 } 1878 1869 1879 1870 static void *ax25_info_next(struct seq_file *seq, void *v, loff_t *pos) 1880 1871 { 1881 - ++*pos; 1882 - 1883 - return hlist_entry( ((struct ax25_cb *)v)->ax25_node.next, 1884 - struct ax25_cb, ax25_node); 1872 + return seq_hlist_next(v, &ax25_list, pos); 1885 1873 } 1886 1874 1887 1875 static void ax25_info_stop(struct seq_file *seq, void *v) ··· 1880 1892 1881 1893 static int ax25_info_show(struct seq_file *seq, void *v) 1882 1894 { 1883 - ax25_cb *ax25 = v; 1895 + ax25_cb *ax25 = hlist_entry(v, struct ax25_cb, ax25_node); 1884 1896 char buf[11]; 1885 1897 int k; 1886 1898
+4 -21
net/ax25/ax25_uid.c
··· 146 146 static void *ax25_uid_seq_start(struct seq_file *seq, loff_t *pos) 147 147 __acquires(ax25_uid_lock) 148 148 { 149 - struct ax25_uid_assoc *pt; 150 - struct hlist_node *node; 151 - int i = 1; 152 - 153 149 read_lock(&ax25_uid_lock); 154 - 155 - if (*pos == 0) 156 - return SEQ_START_TOKEN; 157 - 158 - ax25_uid_for_each(pt, node, &ax25_uid_list) { 159 - if (i == *pos) 160 - return pt; 161 - ++i; 162 - } 163 - return NULL; 150 + return seq_hlist_start_head(&ax25_uid_list, *pos); 164 151 } 165 152 166 153 static void *ax25_uid_seq_next(struct seq_file *seq, void *v, loff_t *pos) 167 154 { 168 - ++*pos; 169 - if (v == SEQ_START_TOKEN) 170 - return ax25_uid_list.first; 171 - else 172 - return hlist_entry(((ax25_uid_assoc *)v)->uid_node.next, 173 - ax25_uid_assoc, uid_node); 155 + return seq_hlist_next(v, &ax25_uid_list, pos); 174 156 } 175 157 176 158 static void ax25_uid_seq_stop(struct seq_file *seq, void *v) ··· 168 186 if (v == SEQ_START_TOKEN) 169 187 seq_printf(seq, "Policy: %d\n", ax25_uid_policy); 170 188 else { 171 - struct ax25_uid_assoc *pt = v; 189 + struct ax25_uid_assoc *pt; 172 190 191 + pt = hlist_entry(v, struct ax25_uid_assoc, uid_node); 173 192 seq_printf(seq, "%6d %s\n", pt->uid, ax2asc(buf, &pt->call)); 174 193 } 175 194 return 0;