1616#include "btree.h"
1717
1818static inline
19- bool is_bnode_offset_valid (struct hfs_bnode * node , int off )
19+ bool is_bnode_offset_valid (struct hfs_bnode * node , u32 off )
2020{
2121 bool is_valid = off < node -> tree -> node_size ;
2222
2323 if (!is_valid ) {
2424 pr_err ("requested invalid offset: "
2525 "NODE: id %u, type %#x, height %u, "
26- "node_size %u, offset %d \n" ,
26+ "node_size %u, offset %u \n" ,
2727 node -> this , node -> type , node -> height ,
2828 node -> tree -> node_size , off );
2929 }
@@ -32,7 +32,7 @@ bool is_bnode_offset_valid(struct hfs_bnode *node, int off)
3232}
3333
3434static inline
35- int check_and_correct_requested_length (struct hfs_bnode * node , int off , int len )
35+ u32 check_and_correct_requested_length (struct hfs_bnode * node , u32 off , u32 len )
3636{
3737 unsigned int node_size ;
3838
@@ -42,12 +42,12 @@ int check_and_correct_requested_length(struct hfs_bnode *node, int off, int len)
4242 node_size = node -> tree -> node_size ;
4343
4444 if ((off + len ) > node_size ) {
45- int new_len = ( int ) node_size - off ;
45+ u32 new_len = node_size - off ;
4646
4747 pr_err ("requested length has been corrected: "
4848 "NODE: id %u, type %#x, height %u, "
49- "node_size %u, offset %d , "
50- "requested_len %d , corrected_len %d \n" ,
49+ "node_size %u, offset %u , "
50+ "requested_len %u , corrected_len %u \n" ,
5151 node -> this , node -> type , node -> height ,
5252 node -> tree -> node_size , off , len , new_len );
5353
@@ -57,20 +57,20 @@ int check_and_correct_requested_length(struct hfs_bnode *node, int off, int len)
5757 return len ;
5858}
5959
60- void hfs_bnode_read (struct hfs_bnode * node , void * buf , int off , int len )
60+ void hfs_bnode_read (struct hfs_bnode * node , void * buf , u32 off , u32 len )
6161{
6262 struct page * page ;
63- int pagenum ;
64- int bytes_read ;
65- int bytes_to_read ;
63+ u32 pagenum ;
64+ u32 bytes_read ;
65+ u32 bytes_to_read ;
6666
6767 if (!is_bnode_offset_valid (node , off ))
6868 return ;
6969
7070 if (len == 0 ) {
7171 pr_err ("requested zero length: "
7272 "NODE: id %u, type %#x, height %u, "
73- "node_size %u, offset %d , len %d \n" ,
73+ "node_size %u, offset %u , len %u \n" ,
7474 node -> this , node -> type , node -> height ,
7575 node -> tree -> node_size , off , len );
7676 return ;
@@ -86,7 +86,7 @@ void hfs_bnode_read(struct hfs_bnode *node, void *buf, int off, int len)
8686 if (pagenum >= node -> tree -> pages_per_bnode )
8787 break ;
8888 page = node -> page [pagenum ];
89- bytes_to_read = min_t (int , len - bytes_read , PAGE_SIZE - off );
89+ bytes_to_read = min_t (u32 , len - bytes_read , PAGE_SIZE - off );
9090
9191 memcpy_from_page (buf + bytes_read , page , off , bytes_to_read );
9292
@@ -95,26 +95,26 @@ void hfs_bnode_read(struct hfs_bnode *node, void *buf, int off, int len)
9595 }
9696}
9797
98- u16 hfs_bnode_read_u16 (struct hfs_bnode * node , int off )
98+ u16 hfs_bnode_read_u16 (struct hfs_bnode * node , u32 off )
9999{
100100 __be16 data ;
101101 // optimize later...
102102 hfs_bnode_read (node , & data , off , 2 );
103103 return be16_to_cpu (data );
104104}
105105
106- u8 hfs_bnode_read_u8 (struct hfs_bnode * node , int off )
106+ u8 hfs_bnode_read_u8 (struct hfs_bnode * node , u32 off )
107107{
108108 u8 data ;
109109 // optimize later...
110110 hfs_bnode_read (node , & data , off , 1 );
111111 return data ;
112112}
113113
114- void hfs_bnode_read_key (struct hfs_bnode * node , void * key , int off )
114+ void hfs_bnode_read_key (struct hfs_bnode * node , void * key , u32 off )
115115{
116116 struct hfs_btree * tree ;
117- int key_len ;
117+ u32 key_len ;
118118
119119 tree = node -> tree ;
120120 if (node -> type == HFS_NODE_LEAF ||
@@ -125,14 +125,14 @@ void hfs_bnode_read_key(struct hfs_bnode *node, void *key, int off)
125125
126126 if (key_len > sizeof (hfs_btree_key ) || key_len < 1 ) {
127127 memset (key , 0 , sizeof (hfs_btree_key ));
128- pr_err ("hfs: Invalid key length: %d \n" , key_len );
128+ pr_err ("hfs: Invalid key length: %u \n" , key_len );
129129 return ;
130130 }
131131
132132 hfs_bnode_read (node , key , off , key_len );
133133}
134134
135- void hfs_bnode_write (struct hfs_bnode * node , void * buf , int off , int len )
135+ void hfs_bnode_write (struct hfs_bnode * node , void * buf , u32 off , u32 len )
136136{
137137 struct page * page ;
138138
@@ -142,7 +142,7 @@ void hfs_bnode_write(struct hfs_bnode *node, void *buf, int off, int len)
142142 if (len == 0 ) {
143143 pr_err ("requested zero length: "
144144 "NODE: id %u, type %#x, height %u, "
145- "node_size %u, offset %d , len %d \n" ,
145+ "node_size %u, offset %u , len %u \n" ,
146146 node -> this , node -> type , node -> height ,
147147 node -> tree -> node_size , off , len );
148148 return ;
@@ -157,20 +157,20 @@ void hfs_bnode_write(struct hfs_bnode *node, void *buf, int off, int len)
157157 set_page_dirty (page );
158158}
159159
160- void hfs_bnode_write_u16 (struct hfs_bnode * node , int off , u16 data )
160+ void hfs_bnode_write_u16 (struct hfs_bnode * node , u32 off , u16 data )
161161{
162162 __be16 v = cpu_to_be16 (data );
163163 // optimize later...
164164 hfs_bnode_write (node , & v , off , 2 );
165165}
166166
167- void hfs_bnode_write_u8 (struct hfs_bnode * node , int off , u8 data )
167+ void hfs_bnode_write_u8 (struct hfs_bnode * node , u32 off , u8 data )
168168{
169169 // optimize later...
170170 hfs_bnode_write (node , & data , off , 1 );
171171}
172172
173- void hfs_bnode_clear (struct hfs_bnode * node , int off , int len )
173+ void hfs_bnode_clear (struct hfs_bnode * node , u32 off , u32 len )
174174{
175175 struct page * page ;
176176
@@ -180,7 +180,7 @@ void hfs_bnode_clear(struct hfs_bnode *node, int off, int len)
180180 if (len == 0 ) {
181181 pr_err ("requested zero length: "
182182 "NODE: id %u, type %#x, height %u, "
183- "node_size %u, offset %d , len %d \n" ,
183+ "node_size %u, offset %u , len %u \n" ,
184184 node -> this , node -> type , node -> height ,
185185 node -> tree -> node_size , off , len );
186186 return ;
@@ -195,8 +195,8 @@ void hfs_bnode_clear(struct hfs_bnode *node, int off, int len)
195195 set_page_dirty (page );
196196}
197197
198- void hfs_bnode_copy (struct hfs_bnode * dst_node , int dst ,
199- struct hfs_bnode * src_node , int src , int len )
198+ void hfs_bnode_copy (struct hfs_bnode * dst_node , u32 dst ,
199+ struct hfs_bnode * src_node , u32 src , u32 len )
200200{
201201 struct page * src_page , * dst_page ;
202202
@@ -216,7 +216,7 @@ void hfs_bnode_copy(struct hfs_bnode *dst_node, int dst,
216216 set_page_dirty (dst_page );
217217}
218218
219- void hfs_bnode_move (struct hfs_bnode * node , int dst , int src , int len )
219+ void hfs_bnode_move (struct hfs_bnode * node , u32 dst , u32 src , u32 len )
220220{
221221 struct page * page ;
222222 void * ptr ;
0 commit comments