From 4b5577c296f4f5a6c31bfe370771e8338bf9f049 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Thu, 24 Mar 2011 15:39:18 +1100 Subject: [PATCH] Remove lots of white-space errors Signed-off-by: NeilBrown --- lib/lafs_allocated_block.c | 2 +- lib/lafs_checkpoint.c | 4 ++-- lib/lafs_cluster_allocate.c | 2 +- lib/lafs_cluster_flush.c | 6 +++--- lib/lafs_dblk.c | 2 +- lib/lafs_dir_next.c | 2 +- lib/lafs_find_dblk.c | 4 ++-- lib/lafs_find_next.c | 2 +- lib/lafs_imap_alloc.c | 2 +- lib/lafs_incorporate.c | 4 +--- lib/lafs_load.c | 4 ++-- lib/lafs_mount.c | 2 +- lib/lafs_print_inode.c | 4 ++-- lib/lafs_print_state.c | 2 +- lib/lafs_read_virtual.c | 1 - lib/lafs_write_dev.c | 4 ++-- lib/lafs_write_state.c | 2 +- lib/lafs_write_virtual.c | 1 - 18 files changed, 23 insertions(+), 27 deletions(-) diff --git a/lib/lafs_allocated_block.c b/lib/lafs_allocated_block.c index 7cf7081..3ce830f 100644 --- a/lib/lafs_allocated_block.c +++ b/lib/lafs_allocated_block.c @@ -16,7 +16,7 @@ void lafs_allocated_block(struct lafs_blk *b, loff_t addr) struct lafs_iblk *p; trace(1,"allocate %d/%lld %s to %lld\n", b->ino->inum, - (long long)b->fileaddr, + (long long)b->fileaddr, (b->flags & B_Index) ? "index":"data", (long long)addr); if (b->parent == NULL) { /* This is the root inode. Its address goes diff --git a/lib/lafs_checkpoint.c b/lib/lafs_checkpoint.c index 049694c..8633b2f 100644 --- a/lib/lafs_checkpoint.c +++ b/lib/lafs_checkpoint.c @@ -40,7 +40,7 @@ int lafs_checkpoint(struct lafs *fs) continue; } } - + if (b->flags & B_Index) { struct lafs_iblk *ib = iblk(b); if (ib->sched_cnt) { @@ -74,7 +74,7 @@ int lafs_checkpoint(struct lafs *fs) lafs_sched_blk(b); list_del_init(&b->leafs); - + lafs_cluster_allocate(b, 0); } fs->checkpointing |= CHECKPOINT_END; diff --git a/lib/lafs_cluster_allocate.c b/lib/lafs_cluster_allocate.c index d042401..96acc4f 100644 --- a/lib/lafs_cluster_allocate.c +++ b/lib/lafs_cluster_allocate.c @@ -21,7 +21,7 @@ void lafs_cluster_allocate(struct lafs_blk *b, int cnum) if (!(b->flags & B_Sched)) abort(); - if (!(b->flags & B_Index) && + if (!(b->flags & B_Index) && b->ino->type == TypeInodeFile && dblk(b)->my_inode && (dblk(b)->my_inode->iflags & I_Dirty)) diff --git a/lib/lafs_cluster_flush.c b/lib/lafs_cluster_flush.c index 442091d..2409d8a 100644 --- a/lib/lafs_cluster_flush.c +++ b/lib/lafs_cluster_flush.c @@ -23,7 +23,7 @@ * * A write cluster always comprises a whole number of rows - it is padded * with zeros if necessary. - * However block addressing follow columns, so the blocks written to + * However block addressing follow columns, so the blocks written to * a cluster may well not be contiguously addressed. * * There are 'width' blocks (or columns) in a row, and either: @@ -308,7 +308,7 @@ void lafs_cluster_flush(struct lafs *fs, int cnum) } if (head_start) cluster_closehead(wc, head_start); - + ch->Hlength = __cpu_to_le16(wc->chead_size); ch->Clength = __cpu_to_le16(cluster_size); ch->verify_type = VerifyNull; @@ -320,7 +320,7 @@ void lafs_cluster_flush(struct lafs *fs, int cnum) ch->checksum = calc_cluster_csum(ch); dv = dev_by_num(fs, wc->seg.dev); - + for (i = 0; i < wc->chead_blocks; i++) { int dev; loff_t sect; diff --git a/lib/lafs_dblk.c b/lib/lafs_dblk.c index 83d2741..7844187 100644 --- a/lib/lafs_dblk.c +++ b/lib/lafs_dblk.c @@ -13,7 +13,7 @@ struct lafs_dblk *lafs_dblk(struct lafs_ino *ino, loff_t bnum) struct lafs_dblk *db; struct lafs *fs = ino->fs; int hash = (long)ino; - + hash ^= bnum; hash ^= hash >> 10; hash &= (1<md.file.seed; if (piece && - lafs_dir_extract(db->b.data, dir->fs->blockbits-8, &de, + lafs_dir_extract(db->b.data, dir->fs->blockbits-8, &de, piece, indexp)->target == 0) hash = *indexp +1; else diff --git a/lib/lafs_find_dblk.c b/lib/lafs_find_dblk.c index 0f744d1..5b9d7c6 100644 --- a/lib/lafs_find_dblk.c +++ b/lib/lafs_find_dblk.c @@ -73,7 +73,7 @@ uint64_t lafs_leaf_lookup(unsigned char *buf, int len, u32 startaddr, if (buf[1]) return 0; switch (buf[0]) { - default: p = 0; + default: p = 0; break; case 1: /* indirect */ @@ -133,7 +133,7 @@ uint64_t lafs_leaf_lookup(unsigned char *buf, int len, u32 startaddr, } cp = buf; cp += lo*12 + 8; - + addr = decode32(cp); cp = buf; diff --git a/lib/lafs_find_next.c b/lib/lafs_find_next.c index f946035..3889247 100644 --- a/lib/lafs_find_next.c +++ b/lib/lafs_find_next.c @@ -55,7 +55,7 @@ static int __block_find_next(struct lafs_ino *inode, u32 *addrp) buf = (unsigned char *)leaf->b.ino->dblock->b.data; } p = lafs_leaf_lookup(buf + offset, - inode->fs->blocksize - offset, leaf->b.fileaddr, + inode->fs->blocksize - offset, leaf->b.fileaddr, addr, &nextd); if (p) return 1; diff --git a/lib/lafs_imap_alloc.c b/lib/lafs_imap_alloc.c index 7e8cb64..fa05481 100644 --- a/lib/lafs_imap_alloc.c +++ b/lib/lafs_imap_alloc.c @@ -41,7 +41,7 @@ int lafs_imap_alloc(struct lafs_ino *imap) clear_c_bit(bit, (unsigned char *)db->b.data); if (*(u32*)(db->b.data) == 0 && db->b.data[fs->blocksize-1] == 0 && - memcmp(db->b.data, + memcmp(db->b.data, db->b.data+4, fs->blocksize-4) == 0) { /* block is completely zero, so we have to punch * a hole diff --git a/lib/lafs_incorporate.c b/lib/lafs_incorporate.c index 5cf3fba..ef5b414 100644 --- a/lib/lafs_incorporate.c +++ b/lib/lafs_incorporate.c @@ -29,7 +29,7 @@ void lafs_incorporate(struct lafs_iblk *ib) if (ib->depth != 1) abort(); - + ip = (void*)(ib->b.ino->dblock->b.data + ib->b.ino->metadata_size); if (*(u16*)ip != __cpu_to_le16(IBLK_INDIRECT)) abort(); @@ -57,5 +57,3 @@ void lafs_incorporate(struct lafs_iblk *ib) (long long)ib->b.ino->dblock->b.fileaddr); lafs_dirty_blk(&ib->b); } - - diff --git a/lib/lafs_load.c b/lib/lafs_load.c index a4ef56e..726d241 100644 --- a/lib/lafs_load.c +++ b/lib/lafs_load.c @@ -155,7 +155,7 @@ static int check_state(struct lafs_device *dev, int which) dev->devices = __le32_to_cpu(sb->devices); } rv = 1; - + out: free(sb); return rv; @@ -246,7 +246,7 @@ struct lafs_device *lafs_load(int fd, long long device_bytes, char **err) found = 0; for (i=0; i<4; i++) found += check_state(dev, i); - + if (!found) *err = "No valid state block found on device"; diff --git a/lib/lafs_mount.c b/lib/lafs_mount.c index bce49ef..754554c 100644 --- a/lib/lafs_mount.c +++ b/lib/lafs_mount.c @@ -30,7 +30,7 @@ char *lafs_mount(struct lafs *fs, int force) return strdup("mount: no devices loaded"); if (fs->loaded_devs != fs->devices) { - asprintf(&err, + asprintf(&err, "need %d devices, only %d loaded", fs->devices, fs->loaded_devs); return err; diff --git a/lib/lafs_print_inode.c b/lib/lafs_print_inode.c index 64ca36d..e5c88bd 100644 --- a/lib/lafs_print_inode.c +++ b/lib/lafs_print_inode.c @@ -59,7 +59,7 @@ void lafs_print_inode(struct lafs_ino *ino) printf(" SS Index : %d\n", (f->usagetable)); printf(" Name : %.40s\n", f->name); break; - case TypeInodeMap: + case TypeInodeMap: im = &ino->md.inodemap; printf(" Map Size : %lu\n", (unsigned long)im->size); break; @@ -149,7 +149,7 @@ void lafs_print_inode(struct lafs_ino *ino) ip = (struct extent*)(body+2); /* printf("body at %p\n", ip);*/ for (; __le16_to_cpu(ip->size) != 0 - && ((char*)(ip+1))<(body+bodybytes) ; ip++) + && ((char*)(ip+1))<(body+bodybytes) ; ip++) printf(" %ld..%ld at %ld\n", (unsigned long)__le32_to_cpu(ip->logical), (unsigned long)__le32_to_cpu(ip->logical)+ diff --git a/lib/lafs_print_state.c b/lib/lafs_print_state.c index d3c8b05..6b6186f 100644 --- a/lib/lafs_print_state.c +++ b/lib/lafs_print_state.c @@ -41,7 +41,7 @@ void lafs_print_state(struct lafs_state *state, int size) if (maxss > (size - sizeof(*state)) / 4) maxss = (size - sizeof(*state)) / 4; for (l=0; l < maxss; l++) - printf(" Root[%d] : %llu\n", l+1, + printf(" Root[%d] : %llu\n", l+1, (unsigned long long)__le64_to_cpu(state->root_inodes[l])); printf("\n"); diff --git a/lib/lafs_read_virtual.c b/lib/lafs_read_virtual.c index 019e2c5..3bfae0a 100644 --- a/lib/lafs_read_virtual.c +++ b/lib/lafs_read_virtual.c @@ -18,7 +18,6 @@ int lafs_read_virtual(struct lafs *fs, char *buf, loff_t addr) (addr - d->start) * fs->blocksize + d->segment_offset, SEEK_SET); n = read(d->fd, buf, fs->blocksize); - if (n == fs->blocksize) return 0; diff --git a/lib/lafs_write_dev.c b/lib/lafs_write_dev.c index cc628fd..5337fec 100644 --- a/lib/lafs_write_dev.c +++ b/lib/lafs_write_dev.c @@ -52,11 +52,11 @@ int lafs_write_dev(struct lafs_device *dev) csum = crc32(0, (uint32_t*)buf, LAFS_DEVBLK_SIZE); pd->checksum = csum; - + for (i=0; i<2; i++) { lseek64(dev->fd, dev->devaddr[i], SEEK_SET); write(dev->fd, buf, LAFS_DEVBLK_SIZE); } - + return 0; } diff --git a/lib/lafs_write_state.c b/lib/lafs_write_state.c index b7b443d..722d615 100644 --- a/lib/lafs_write_state.c +++ b/lib/lafs_write_state.c @@ -23,7 +23,7 @@ int lafs_write_state(struct lafs *fs) memcpy(st->idtag, "LaFS-State-Block", 16); memcpy(st->uuid, fs->uuid, 16); memset(st->version, ' ', 16); - + st->seq = __cpu_to_le32(fs->seq); st->nextyouth = __cpu_to_le16(fs->youth_next); st->checkpointcluster = __cpu_to_le64(fs->checkpoint_cluster); diff --git a/lib/lafs_write_virtual.c b/lib/lafs_write_virtual.c index 872ed38..7db256f 100644 --- a/lib/lafs_write_virtual.c +++ b/lib/lafs_write_virtual.c @@ -16,7 +16,6 @@ int lafs_write_virtual(struct lafs *fs, char *buf, loff_t addr) return -1; lseek64(d->fd, (addr - d->start) * fs->blocksize, SEEK_SET); n = write(d->fd, buf, fs->blocksize); - if (n == fs->blocksize) return 0; -- 2.43.0