[Cluster-devel] [patch] GFS2: Fix reference to ERR_PTR in gfs2_glock_iter_next

[Bob Peterson <rpeterso@redhat.com>]

Hi Dan,

----- Original Message -----
| If rhashtable_walk_next() returned PTR_ERR(-EAGAIN) then that would
| cause an Oops.
| 
| Fixes: 88ffbf3e037e ("GFS2: Use resizable hash table for glocks")
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
| ---
| Is the comment in the right place?  If not then please just fix it and
| give me Reported-by credit.
| 
| diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
| index 14cbf60167a7..2928f1209b67 100644
| --- a/fs/gfs2/glock.c
| +++ b/fs/gfs2/glock.c
| @@ -1802,16 +1802,18 @@ void gfs2_glock_exit(void)
|  
|  static void gfs2_glock_iter_next(struct gfs2_glock_iter *gi)
|  {
| -	do {
| -		gi->gl = rhashtable_walk_next(&gi->hti);
| +	while ((gi->gl = rhashtable_walk_next(&gi->hti))) {
|  		if (IS_ERR(gi->gl)) {
|  			if (PTR_ERR(gi->gl) == -EAGAIN)
|  				continue;
|  			gi->gl = NULL;
| +			return;
|  		}
| -	/* Skip entries for other sb and dead entries */
| -	} while ((gi->gl) && ((gi->sdp != gi->gl->gl_name.ln_sbd) ||
| -			      __lockref_is_dead(&gi->gl->gl_lockref)));
| +		/* Skip entries for other sb and dead entries */
| +		if (gi->sdp == gi->gl->gl_name.ln_sbd &&
| +		    !__lockref_is_dead(&gi->gl->gl_lockref))
| +			return;
| +	}
|  }
|  
|  static void *gfs2_glock_seq_start(struct seq_file *seq, loff_t *pos)
| 
Thanks. This is now applied to the for-next branch of the linux-gfs2 tree:

https://git.kernel.org/cgit/linux/kernel/git/gfs2/linux-gfs2.git/commit/?h=for-next&id=14d37564fa3dc4e5d4c6828afcd26ac14e6796c5

Regards,

Bob Peterson
Red Hat File Systems