1.1 --- a/extras/mini-os/fs-front.c	Fri Jul 18 17:11:27 2008 +0100
     1.2 +++ b/extras/mini-os/fs-front.c	Mon Jul 21 09:38:19 2008 +0100
     1.3 @@ -183,12 +183,13 @@ int fs_open(struct fs_import *import, ch
     1.4  
     1.5      /* Prepare request for the backend */
     1.6      back_req_id = reserve_fsif_request(import);
     1.7 -    DEBUG("Backend request id=%d, gref=%d\n", back_req_id, fsr->gref);
     1.8 +    DEBUG("Backend request id=%d\n", back_req_id);
     1.9  
    1.10      /* Prepare our private request structure */
    1.11      priv_req_id = get_id_from_freelist(import->freelist);
    1.12      DEBUG("Request id for fs_open call is: %d\n", priv_req_id);
    1.13      fsr = &import->requests[priv_req_id];
    1.14 +    DEBUG("gref id=%d\n", fsr->gref);
    1.15      fsr->thread = current;
    1.16      sprintf(fsr->page, "%s", file);
    1.17  
    1.18 @@ -221,7 +222,7 @@ int fs_close(struct fs_import *import, i
    1.19  
    1.20      /* Prepare request for the backend */
    1.21      back_req_id = reserve_fsif_request(import);
    1.22 -    DEBUG("Backend request id=%d, gref=%d\n", back_req_id, fsr->gref);
    1.23 +    DEBUG("Backend request id=%d\n", back_req_id);
    1.24  
    1.25      /* Prepare our private request structure */
    1.26      priv_req_id = get_id_from_freelist(import->freelist);
    1.27 @@ -261,12 +262,13 @@ ssize_t fs_read(struct fs_import *import
    1.28  
    1.29      /* Prepare request for the backend */
    1.30      back_req_id = reserve_fsif_request(import);
    1.31 -    DEBUG("Backend request id=%d, gref=%d\n", back_req_id, fsr->gref);
    1.32 +    DEBUG("Backend request id=%d\n", back_req_id);
    1.33  
    1.34      /* Prepare our private request structure */
    1.35      priv_req_id = get_id_from_freelist(import->freelist);
    1.36      DEBUG("Request id for fs_read call is: %d\n", priv_req_id);
    1.37      fsr = &import->requests[priv_req_id];
    1.38 +    DEBUG("gref=%d\n", fsr->gref);
    1.39      fsr->thread = current;
    1.40      memset(fsr->page, 0, PAGE_SIZE);
    1.41  
    1.42 @@ -307,12 +309,13 @@ ssize_t fs_write(struct fs_import *impor
    1.43  
    1.44      /* Prepare request for the backend */
    1.45      back_req_id = reserve_fsif_request(import);
    1.46 -    DEBUG("Backend request id=%d, gref=%d\n", back_req_id, fsr->gref);
    1.47 +    DEBUG("Backend request id=%d\n", back_req_id);
    1.48  
    1.49      /* Prepare our private request structure */
    1.50      priv_req_id = get_id_from_freelist(import->freelist);
    1.51      DEBUG("Request id for fs_read call is: %d\n", priv_req_id);
    1.52      fsr = &import->requests[priv_req_id];
    1.53 +    DEBUG("gref=%d\n", fsr->gref);
    1.54      fsr->thread = current;
    1.55      memcpy(fsr->page, buf, len);
    1.56      BUG_ON(len > PAGE_SIZE);
    1.57 @@ -352,12 +355,13 @@ int fs_stat(struct fs_import *import,
    1.58  
    1.59      /* Prepare request for the backend */
    1.60      back_req_id = reserve_fsif_request(import);
    1.61 -    DEBUG("Backend request id=%d, gref=%d\n", back_req_id, fsr->gref);
    1.62 +    DEBUG("Backend request id=%d\n", back_req_id);
    1.63  
    1.64      /* Prepare our private request structure */
    1.65      priv_req_id = get_id_from_freelist(import->freelist);
    1.66      DEBUG("Request id for fs_stat call is: %d\n", priv_req_id);
    1.67      fsr = &import->requests[priv_req_id];
    1.68 +    DEBUG("gref=%d\n", fsr->gref);
    1.69      fsr->thread = current;
    1.70      memset(fsr->page, 0, PAGE_SIZE);
    1.71  
    1.72 @@ -394,7 +398,7 @@ int fs_truncate(struct fs_import *import
    1.73  
    1.74      /* Prepare request for the backend */
    1.75      back_req_id = reserve_fsif_request(import);
    1.76 -    DEBUG("Backend request id=%d, gref=%d\n", back_req_id, fsr->gref);
    1.77 +    DEBUG("Backend request id=%d\n", back_req_id);
    1.78  
    1.79      /* Prepare our private request structure */
    1.80      priv_req_id = get_id_from_freelist(import->freelist);
    1.81 @@ -432,12 +436,13 @@ int fs_remove(struct fs_import *import, 
    1.82  
    1.83      /* Prepare request for the backend */
    1.84      back_req_id = reserve_fsif_request(import);
    1.85 -    DEBUG("Backend request id=%d, gref=%d\n", back_req_id, fsr->gref);
    1.86 +    DEBUG("Backend request id=%d\n", back_req_id);
    1.87  
    1.88      /* Prepare our private request structure */
    1.89      priv_req_id = get_id_from_freelist(import->freelist);
    1.90      DEBUG("Request id for fs_open call is: %d\n", priv_req_id);
    1.91      fsr = &import->requests[priv_req_id];
    1.92 +    DEBUG("gref=%d\n", fsr->gref);
    1.93      fsr->thread = current;
    1.94      sprintf(fsr->page, "%s", file);
    1.95  
    1.96 @@ -475,12 +480,13 @@ int fs_rename(struct fs_import *import,
    1.97  
    1.98      /* Prepare request for the backend */
    1.99      back_req_id = reserve_fsif_request(import);
   1.100 -    DEBUG("Backend request id=%d, gref=%d\n", back_req_id, fsr->gref);
   1.101 +    DEBUG("Backend request id=%d\n", back_req_id);
   1.102  
   1.103      /* Prepare our private request structure */
   1.104      priv_req_id = get_id_from_freelist(import->freelist);
   1.105      DEBUG("Request id for fs_open call is: %d\n", priv_req_id);
   1.106      fsr = &import->requests[priv_req_id];
   1.107 +    DEBUG("gref=%d\n", fsr->gref);
   1.108      fsr->thread = current;
   1.109      sprintf(fsr->page, "%s%s%c%s%s", 
   1.110              old_header, old_file_name, '\0', new_header, new_file_name);
   1.111 @@ -521,12 +527,13 @@ int fs_create(struct fs_import *import, 
   1.112  
   1.113      /* Prepare request for the backend */
   1.114      back_req_id = reserve_fsif_request(import);
   1.115 -    DEBUG("Backend request id=%d, gref=%d\n", back_req_id, fsr->gref);
   1.116 +    DEBUG("Backend request id=%d\n", back_req_id);
   1.117  
   1.118      /* Prepare our private request structure */
   1.119      priv_req_id = get_id_from_freelist(import->freelist);
   1.120      DEBUG("Request id for fs_create call is: %d\n", priv_req_id);
   1.121      fsr = &import->requests[priv_req_id];
   1.122 +    DEBUG("gref=%d\n", fsr->gref);
   1.123      fsr->thread = current;
   1.124      sprintf(fsr->page, "%s", name);
   1.125  
   1.126 @@ -566,12 +573,13 @@ char** fs_list(struct fs_import *import,
   1.127  
   1.128      /* Prepare request for the backend */
   1.129      back_req_id = reserve_fsif_request(import);
   1.130 -    DEBUG("Backend request id=%d, gref=%d\n", back_req_id, fsr->gref);
   1.131 +    DEBUG("Backend request id=%d\n", back_req_id);
   1.132  
   1.133      /* Prepare our private request structure */
   1.134      priv_req_id = get_id_from_freelist(import->freelist);
   1.135      DEBUG("Request id for fs_list call is: %d\n", priv_req_id);
   1.136      fsr = &import->requests[priv_req_id];
   1.137 +    DEBUG("gref=%d\n", fsr->gref);
   1.138      fsr->thread = current;
   1.139      sprintf(fsr->page, "%s", name);
   1.140  
   1.141 @@ -615,7 +623,7 @@ int fs_chmod(struct fs_import *import, i
   1.142  
   1.143      /* Prepare request for the backend */
   1.144      back_req_id = reserve_fsif_request(import);
   1.145 -    DEBUG("Backend request id=%d, gref=%d\n", back_req_id, fsr->gref);
   1.146 +    DEBUG("Backend request id=%d\n", back_req_id);
   1.147  
   1.148      /* Prepare our private request structure */
   1.149      priv_req_id = get_id_from_freelist(import->freelist);
   1.150 @@ -653,12 +661,13 @@ int64_t fs_space(struct fs_import *impor
   1.151  
   1.152      /* Prepare request for the backend */
   1.153      back_req_id = reserve_fsif_request(import);
   1.154 -    DEBUG("Backend request id=%d, gref=%d\n", back_req_id, fsr->gref);
   1.155 +    DEBUG("Backend request id=%d\n", back_req_id);
   1.156  
   1.157      /* Prepare our private request structure */
   1.158      priv_req_id = get_id_from_freelist(import->freelist);
   1.159      DEBUG("Request id for fs_space is: %d\n", priv_req_id);
   1.160      fsr = &import->requests[priv_req_id];
   1.161 +    DEBUG("gref=%d\n", fsr->gref);
   1.162      fsr->thread = current;
   1.163      sprintf(fsr->page, "%s", location);
   1.164  
   1.165 @@ -691,7 +700,7 @@ int fs_sync(struct fs_import *import, in
   1.166  
   1.167      /* Prepare request for the backend */
   1.168      back_req_id = reserve_fsif_request(import);
   1.169 -    DEBUG("Backend request id=%d, gref=%d\n", back_req_id, fsr->gref);
   1.170 +    DEBUG("Backend request id=%d\n", back_req_id);
   1.171  
   1.172      /* Prepare our private request structure */
   1.173      priv_req_id = get_id_from_freelist(import->freelist);