doc/

2001-01-08  Marcus Brinkmann  <marcus@gnu.org>

	* hurd.texi (Store Management): Replace off_t with store_offset_t.
	(Store I/O): Likewise.
	(Store Classes): Likewise.

ext2fs/
2001-01-08  Marcus Brinkmann  <marcus@gnu.org>

	* ext2fs.c (main): Use %Ld instead %ld to print store->size.
	* hyper.c (get_hypermetadata): Likewise.

libstore/
2001-01-08  Marcus Brinkmann  <marcus@gnu.org>

	* zero.c (zero_remap): Change type of variables length, old_length
	to store_offset_t.
	(zero_decode): Change type of variable size to store_offset_t.
	(zero_open): Likewise. Use strtoull instead strtoul to parse
	size argument from name. Use store_offset_t for max_offs and
	its calculation.
	(store_zero_create): Use store_offset_t type for size argument.

	* derive.c (_store_derive): Use store_offset_t as type for
	variable last_part_base.

	* stripe.c (addr_adj): Change types of addr argument and return
	value to store_offset_t.
	(store_ileave_create): Change type of interleave argument and
	variables min_end and end to store_offset_t, but type of variable
	block_size to size_t.
	(store_concat_create): Change type of variable block_size to
	size_t.

	* make.c (_store_create): Change end argument type to store_offset_t.

	* store.h: New type store_offset_t, define to off64_t.
	(struct store_run): Change type of start and length to
	store_offset_t.
	(struct store): Change type of end, wrap_src, wrap_dst, blocks,
	size to store_offset_t.
	Change type of addr arg in store_read_meth_t and
	store_write_meth_t to store_offset_t, as well as in declarations
	for store_read and store_write.
	Change type of argument end in _store_create declaration to
	store_offset_t.
	Change type of argument size in store_zero_create to
	store_offset_t. Change type of argument interleace in
	store_ileace_create to store_offset_t.

	* rdwr.c (store_find_first_run): Change type of return value, addr
	and *base arguments, and variables wrap_src and run_blocks to
	store_offset_t.
	(store_next_run): Change type of *base argument to store_offset_t.
	(store_write): Change type of addr argument and variable base to
	store_offset_t.
	(store_read): Likewise, also for addr argument of local function seg_read.
	Change type of len argument to size_t.

	* copy.c (copy_read): Change type of addr argument to store_offset_t.
	(copy_write): Likewise.
	* device.c (dev_read): Likewise.
	(dev_write): Likewise.
	* file.c (file_read): Likewise.
	(file_write): Likewise.
	(file_byte_read): Likewise.
	(file_byte_write): Likewise.
	* mvol.c (mvol_read): Likewise.
	(mvol_write): Likewise.
	* remap.c (remap_read): Likewise.
	(remap_write): Likewise.
	* stripe.c (stripe_read): Likewise.
	(stripe_write): Likewise.
	* task.c (task_read): Likewise.
	(task_write): Likewise.
	* zero.c (zero_read): Likewise.
	(zero_write): Likewise.

	* remap.c (store_remap_runs): Change type of addr and len
	arguments of local function add_run and of local variables addr,
	length, baddr, blen and len to store_offset_t.
	(remap_open): Cast -1 to store_offset_t, not off_t.

	* argp.c (struct store_parsed): Change type of interleave from
	off_t to store_offset_t.
	(store_parsed_append_args): Use %Ld instead %ld to print
	interleave value.
	(store_parsed_name): Likewise.

ufs/
2001-01-08  Marcus Brinkmann  <marcus@gnu.org>

	* main.c (main): Use %Ld instead %ld to print store->size.
	* hyper.c (get_hypermetadata): Likewise.
	* inode.c (diskfs_S_file_get_storage_info): Change type of variables
	start and length from off_t to store_offset_t.

utils/
2001-01-08  Marcus Brinkmann  <marcus@gnu.org>

	* storeread.c (main): Change type of addr to store_offset_t,
	also for first argument of local function dump.
	Add comment about store->size as len parameter for store_read.
	Use atoll instead atoi for addr argument.

	* storeinfo.c (print_store): Remove local function pint, add two
	similar functions psiz and poff, accepting and printing a size_t
	or store_offset_t respectively.
	Use psiz to print block_size, poff to print blocks and size of
	store.
	Use %Ld instead %ld to print runs.

	* storecat.c (main): Change type of addr and left to store_offset_t.

1 files changed, 10 insertions, 8 deletions

diff --git a/libstore/stripe.c b/libstore/stripe.c
index 59fb504e..52a596df 100644
--- a/libstore/stripe.c
+++ b/libstore/stripe.c
@@ -27,8 +27,8 @@ extern long lcm (long p, long q);
 
 /* Return ADDR adjust for any block size difference between STORE and
    STRIPE.  We assume that STORE's block size is no less than STRIPE's.  */
-static inline off_t
-addr_adj (off_t addr, struct store *store, struct store *stripe)
+static inline store_offset_t
+addr_adj (store_offset_t addr, struct store *store, struct store *stripe)
 {
   unsigned common_bs = store->log2_block_size;
   unsigned stripe_bs = stripe->log2_block_size;
@@ -40,7 +40,7 @@ addr_adj (off_t addr, struct store *store, struct store *stripe)
 
 static error_t
 stripe_read (struct store *store,
-	     off_t addr, size_t index, size_t amount,
+	     store_offset_t addr, size_t index, size_t amount,
 	     void **buf, size_t *len)
 {
   struct store *stripe = store->children[index];
@@ -49,7 +49,7 @@ stripe_read (struct store *store,
 
 static error_t
 stripe_write (struct store *store,
-	      off_t addr, size_t index, void *buf, size_t len,
+	      store_offset_t addr, size_t index, void *buf, size_t len,
 	      size_t *amount)
 {
   struct store *stripe = store->children[index];
@@ -160,11 +160,13 @@ store_concat_class =
    *array* STRIPES is copied, and so should be freed by the caller).  */
 error_t
 store_ileave_create (struct store *const *stripes, size_t num_stripes,
-		     off_t interleave, int flags, struct store **store)
+		     store_offset_t interleave, int flags,
+		     struct store **store)
 {
   size_t i;
   error_t err;
-  off_t block_size = 1, min_end = 0;
+  size_t block_size = 1;
+  store_offset_t min_end = 0;
   struct store_run runs[num_stripes];
   int common_flags = STORE_BACKEND_FLAGS;
 
@@ -180,7 +182,7 @@ store_ileave_create (struct store *const *stripes, size_t num_stripes,
   for (i = 0; i < num_stripes; i++)
     {
        /* The stripe's end adjusted to the common block size.  */
-      off_t end = stripes[i]->end;
+      store_offset_t end = stripes[i]->end;
 
       runs[i].start = 0;
       runs[i].length = interleave;
@@ -222,7 +224,7 @@ store_concat_create (struct store * const *stores, size_t num_stores,
 {
   size_t i;
   error_t err;
-  off_t block_size = 1;
+  size_t block_size = 1;
   int common_flags = STORE_BACKEND_FLAGS;
   struct store_run runs[num_stores];