On Fri, 2007-05-18 at 14:04 +0400, Pavel Emelianov wrote: > This includes /proc/fs/nfsfs/servers and /proc/fs/nfsfs/volumes > entries. > > Both need to show the header and use the list_head. > > Signed-off-by: Pavel Emelianov <[EMAIL PROTECTED]>
Acked-by: Trond Myklebust <[EMAIL PROTECTED]> > > --- > > diff --git a/fs/nfs/client.c b/fs/nfs/client.c > index 50c6821..10355ec 100644 > --- a/fs/nfs/client.c > +++ b/fs/nfs/client.c > @@ -1232,23 +1232,9 @@ static int nfs_server_list_open(struct i > */ > static void *nfs_server_list_start(struct seq_file *m, loff_t *_pos) > { > - struct list_head *_p; > - loff_t pos = *_pos; > - > /* lock the list against modification */ > spin_lock(&nfs_client_lock); > - > - /* allow for the header line */ > - if (!pos) > - return SEQ_START_TOKEN; > - pos--; > - > - /* find the n'th element in the list */ > - list_for_each(_p, &nfs_client_list) > - if (!pos--) > - break; > - > - return _p != &nfs_client_list ? _p : NULL; > + return seq_list_start_head(&nfs_client_list, *_pos); > } > > /* > @@ -1256,14 +1242,7 @@ static void *nfs_server_list_start(struc > */ > static void *nfs_server_list_next(struct seq_file *p, void *v, loff_t *pos) > { > - struct list_head *_p; > - > - (*pos)++; > - > - _p = v; > - _p = (v == SEQ_START_TOKEN) ? nfs_client_list.next : _p->next; > - > - return _p != &nfs_client_list ? _p : NULL; > + return seq_list_next(v, &nfs_client_list, pos); > } > > /* > @@ -1282,7 +1261,7 @@ static int nfs_server_list_show(struct s > struct nfs_client *clp; > > /* display header on line 1 */ > - if (v == SEQ_START_TOKEN) { > + if (v == &nfs_client_list) { > seq_puts(m, "NV SERVER PORT USE HOSTNAME\n"); > return 0; > } > @@ -1323,23 +1302,9 @@ static int nfs_volume_list_open(struct i > */ > static void *nfs_volume_list_start(struct seq_file *m, loff_t *_pos) > { > - struct list_head *_p; > - loff_t pos = *_pos; > - > /* lock the list against modification */ > spin_lock(&nfs_client_lock); > - > - /* allow for the header line */ > - if (!pos) > - return SEQ_START_TOKEN; > - pos--; > - > - /* find the n'th element in the list */ > - list_for_each(_p, &nfs_volume_list) > - if (!pos--) > - break; > - > - return _p != &nfs_volume_list ? _p : NULL; > + return seq_list_start_head(&nfs_volume_list, *_pos); > } > > /* > @@ -1347,14 +1312,7 @@ static void *nfs_volume_list_start(struc > */ > static void *nfs_volume_list_next(struct seq_file *p, void *v, loff_t *pos) > { > - struct list_head *_p; > - > - (*pos)++; > - > - _p = v; > - _p = (v == SEQ_START_TOKEN) ? nfs_volume_list.next : _p->next; > - > - return _p != &nfs_volume_list ? _p : NULL; > + return seq_list_next(v, &nfs_volume_list, pos); > } > > /* > @@ -1375,7 +1333,7 @@ static int nfs_volume_list_show(struct s > char dev[8], fsid[17]; > > /* display header on line 1 */ > - if (v == SEQ_START_TOKEN) { > + if (v == &nfs_volume_list) { > seq_puts(m, "NV SERVER PORT DEV FSID\n"); > return 0; > } > - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/