logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0004-Use-struct-list_head-instead-of-GList.patch (1559B)

    

  1. From 3ed67a49b1daf016a2cffaad89fdfb2b4a89892c Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Sun, 5 Jun 2016 17:30:20 -0700
  4. Subject: [PATCH] Use struct list_head instead of GList
  6. ---
  7.  sshfs.c | 16 +++++++---------
  8.  1 file changed, 7 insertions(+), 9 deletions(-)
  10. diff --git a/sshfs.c b/sshfs.c
  11. index 391afdd..9c074a3 100644
  12. --- a/sshfs.c
  13. +++ b/sshfs.c
  14. @@ -2090,14 +2090,14 @@ static int sshfs_req_pending(struct request *req)
  15.  static int sftp_readdir_async(struct buffer *handle, void *buf, off_t offset,
  16.  			     fuse_fill_dir_t filler)
  17.  {
  18. +	int done = 0;
  19.  	int err = 0;
  20.  	int outstanding = 0;
  21.  	int max = READDIR_START;
  22. -	GList *list = NULL;
  23. -
  24. -	int done = 0;
  25. +	struct list_head list;
  26.  
  27.  	assert(offset == 0);
  28. +	list_init(&list);
  29.  	while (!done || outstanding) {
  30.  		struct request *req;
  31.  		struct buffer name;
  32. @@ -2112,16 +2112,14 @@ static int sftp_readdir_async(struct buffer *handle, void *buf, off_t offset,
  33.  				break;
  34.  			}
  35.  
  36. -			list = g_list_append(list, req);
  37. +			list_add(&req->list, &list);
  38.  			outstanding++;
  39.  		}
  40.  
  41.  		if (outstanding) {
  42. -			GList *first;
  43.  			/* wait for response to next request */
  44. -			first = g_list_first(list);
  45. -			req = first->data;
  46. -			list = g_list_delete_link(list, first);
  47. +			req = list_entry(list.prev, struct request, list);
  48. +			list_del(&req->list);
  49.  			outstanding--;
  50.  
  51.  			if (done) {
  52. @@ -2160,7 +2158,7 @@ static int sftp_readdir_async(struct buffer *handle, void *buf, off_t offset,
  53.  			}
  54.  		}
  55.  	}
  56. -	assert(list == NULL);
  57. +	assert(list_empty(&list));
  58.  
  59.  	return err;
  60.  }
  61. -- 
  62. 2.24.0