mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Trond Myklebust <trond.myklebust@fys.uio.no>
To: Pavel Emelianov <xemul@sw.ru>
Cc: Andrew Morton <akpm@osdl.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	devel@openvz.org
Subject: Re: [PATCH 12/15] Make NFS client use seq_list_xxx helpers
Date: Fri, 18 May 2007 13:42:02 -0400	[thread overview]
Message-ID: <1179510122.6488.101.camel@heimdal.trondhjem.org> (raw)
In-Reply-To: <464D7A47.7000204@sw.ru>

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 <xemul@openvz.org>

Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com>


> 
> ---
> 
> 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;
>  	}
> 


  reply	other threads:[~2007-05-18 17:42 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-05-18  9:14 [PATCH 0/15] Make common helpers for seq_files that work with list_head-s (v2) Pavel Emelianov
2007-05-18  9:21 ` [PATCH 1/15] The helper functions itselves Pavel Emelianov
2007-05-18  9:25 ` [PATCH 2/15] Make AFS use seq_list_xxx helpers Pavel Emelianov
2007-05-18  9:28 ` [PATCH 3/15] Make ATM driver " Pavel Emelianov
2007-05-18  9:32 ` [PATCH 4/15] Make block layer /proc files " Pavel Emelianov
2007-05-18  9:34 ` [PATCH 5/15] Make crypto API " Pavel Emelianov
2007-05-18 10:13   ` Herbert Xu
2007-05-18  9:37 ` [PATCH 6/15] Make input layer " Pavel Emelianov
2007-05-18  9:41 ` [PATCH 7/15] Make ISDN CAPI " Pavel Emelianov
2007-05-18  9:43 ` [PATCH 8/15] Make /proc/misc " Pavel Emelianov
2007-05-18  9:46 ` [PATCH 9/15] Make /proc/modules " Pavel Emelianov
2007-05-18  9:53 ` [PATCH 10/15] Make some network-related proc files " Pavel Emelianov
2007-05-18 10:24   ` David Miller
2007-05-18  9:59 ` [PATCH 1/15] The helper functions itselves David Howells
2007-05-18 10:00 ` [PATCH 11/15] Make some netfilter-related proc files use seq_list_xxx helpers Pavel Emelianov
2007-05-18 10:04 ` [PATCH 12/15] Make NFS client " Pavel Emelianov
2007-05-18 17:42   ` Trond Myklebust [this message]
2007-05-18 10:07 ` [PATCH 13/15] Make /proc/tty/drivers " Pavel Emelianov
2007-05-18 10:11 ` [PATCH 14/15] Make /proc/slabinfo " Pavel Emelianov
2007-05-18 10:14 ` [PATCH 15/15] Make /proc/self/mounts(tats) " Pavel Emelianov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1179510122.6488.101.camel@heimdal.trondhjem.org \
    --to=trond.myklebust@fys.uio.no \
    --cc=akpm@osdl.org \
    --cc=devel@openvz.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=xemul@sw.ru \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®