From 552c1e49de4fba5aac97cabcc7f6b0760e081982 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 20 Aug 2013 09:55:23 +1000 Subject: [PATCH] Add some test after the markers in a merge. "git rerere" likes to see a space after the "<<<<<<<" and ">>>>>>>". So put it there and add a vaguely relevant word too. Signed-off-by: NeilBrown --- merge2.c | 8 +-- tests/linux/idmap.h/merge | 6 +- tests/linux/inode-fullpatch/merge | 6 +- tests/linux/inode-justrej/lmerge | 6 +- tests/linux/inode-justrej/merge | 6 +- tests/linux/iomap/merge | 12 ++-- tests/linux/md-autostart/merge | 6 +- tests/linux/md-loop/merge | 12 ++-- tests/linux/md-loop/orig | 12 ++-- tests/linux/md-resync/merge | 54 +++++++-------- tests/linux/raid1-A/merge | 24 +++---- tests/linux/raid10-race/merge | 12 ++-- tests/linux/raid5/merge | 102 ++++++++++++++-------------- tests/linux/raid5build/merge | 12 ++-- tests/linux/raid5line/lmerge | 6 +- tests/linux/raid5line/merge | 6 +- tests/linux/rpc_tcp_nonagle/merge | 6 +- tests/simple/all-different-2/lmerge | 6 +- tests/simple/all-different-2/merge | 6 +- tests/simple/all-different/lmerge | 6 +- tests/simple/all-different/merge | 6 +- tests/simple/conflict/merge | 6 +- tests/simple/conflictmixed/lmerge | 6 +- tests/simple/conflictmixed/merge | 6 +- tests/simple/multiple-add/lmerge | 6 +- tests/simple/multiple-add/merge | 6 +- tests/simple/show-wiggle-1/Wmerge | 8 +-- tests/simple/show-wiggle-2/Wmerge | 8 +-- tests/simple/show-wiggle-3/Wmerge | 6 +- tests/simple/trivial-conflict/merge | 6 +- 30 files changed, 189 insertions(+), 189 deletions(-) diff --git a/merge2.c b/merge2.c index 95a4ca2..3bc3862 100644 --- a/merge2.c +++ b/merge2.c @@ -679,7 +679,7 @@ void print_merge(FILE *out, struct file *a, struct file *b, struct file *c, continue; } - fputs(words ? "<<<---" : "<<<<<<<\n", out); + fputs(words ? "<<<---" : "<<<<<<< found\n", out); for (cm = m; cm->in_conflict; cm++) { if (cm->type == Conflict) found_conflict = 1; @@ -690,7 +690,7 @@ void print_merge(FILE *out, struct file *a, struct file *b, struct file *c, printrange(out, a, cm->a+st1, cm->al-st1); st1 = 0; } - fputs(words ? "|||" : "|||||||\n", out); + fputs(words ? "|||" : "||||||| expected\n", out); st1 = st; for (cm = m; cm->in_conflict; cm++) { if (cm->in_conflict == 1 && cm != m) { @@ -720,7 +720,7 @@ void print_merge(FILE *out, struct file *a, struct file *b, struct file *c, * but full conflict display was requested. * So now print out the wiggled result as well. */ - fputs(words ? "&&&" : "&&&&&&&\n", out); + fputs(words ? "&&&" : "&&&&&&& resolution\n", out); st1 = st; for (cm = m; cm->in_conflict; cm++) { int last = 0; @@ -748,7 +748,7 @@ void print_merge(FILE *out, struct file *a, struct file *b, struct file *c, st1 = 0; } } - fputs(words ? "--->>>" : ">>>>>>>\n", out); + fputs(words ? "--->>>" : ">>>>>>> replacement\n", out); m = cm; if (m->in_conflict == 1 && m[1].in_conflict == 0) { /* End of a conflict, no conflict follows */ diff --git a/tests/linux/idmap.h/merge b/tests/linux/idmap.h/merge index 52028f8..5449ec2 100644 --- a/tests/linux/idmap.h/merge +++ b/tests/linux/idmap.h/merge @@ -1,5 +1,5 @@ -<<<<<<< -||||||| +<<<<<<< found +||||||| expected #define IDMAP_STATUS_LOOKUPFAIL IDMAP_STATUS_FAIL @@ -15,4 +15,4 @@ /* XXX get (include) from bits/utmp.h */ #define IDMAP_NAMESZ 128 ->>>>>>> +>>>>>>> replacement diff --git a/tests/linux/inode-fullpatch/merge b/tests/linux/inode-fullpatch/merge index 685b14e..eeaaef6 100644 --- a/tests/linux/inode-fullpatch/merge +++ b/tests/linux/inode-fullpatch/merge @@ -953,12 +953,12 @@ void generic_delete_inode(struct inode *inode) { struct super_operations *op = inode->i_sb->s_op; -<<<<<<< +<<<<<<< found hlist_del_init(&inode->i_hash); -||||||| +||||||| expected list_del_init(&inode->i_hash); ======= ->>>>>>> +>>>>>>> replacement list_del_init(&inode->i_list); inode->i_state|=I_FREEING; inodes_stat.nr_inodes--; diff --git a/tests/linux/inode-justrej/lmerge b/tests/linux/inode-justrej/lmerge index 685b14e..eeaaef6 100644 --- a/tests/linux/inode-justrej/lmerge +++ b/tests/linux/inode-justrej/lmerge @@ -953,12 +953,12 @@ void generic_delete_inode(struct inode *inode) { struct super_operations *op = inode->i_sb->s_op; -<<<<<<< +<<<<<<< found hlist_del_init(&inode->i_hash); -||||||| +||||||| expected list_del_init(&inode->i_hash); ======= ->>>>>>> +>>>>>>> replacement list_del_init(&inode->i_list); inode->i_state|=I_FREEING; inodes_stat.nr_inodes--; diff --git a/tests/linux/inode-justrej/merge b/tests/linux/inode-justrej/merge index 685b14e..eeaaef6 100644 --- a/tests/linux/inode-justrej/merge +++ b/tests/linux/inode-justrej/merge @@ -953,12 +953,12 @@ void generic_delete_inode(struct inode *inode) { struct super_operations *op = inode->i_sb->s_op; -<<<<<<< +<<<<<<< found hlist_del_init(&inode->i_hash); -||||||| +||||||| expected list_del_init(&inode->i_hash); ======= ->>>>>>> +>>>>>>> replacement list_del_init(&inode->i_list); inode->i_state|=I_FREEING; inodes_stat.nr_inodes--; diff --git a/tests/linux/iomap/merge b/tests/linux/iomap/merge index 4f8888e..df2ab57 100644 --- a/tests/linux/iomap/merge +++ b/tests/linux/iomap/merge @@ -233,12 +233,12 @@ void __iomem *ioport_map(unsigned long port, unsigned int nr) return (void __iomem *) (unsigned long) (port + PIO_OFFSET); } -<<<<<<< +<<<<<<< found void ioport_unmap(void __iomem *addr) { /* Nothing to do */ } -||||||| +||||||| expected #ifdef CONFIG_PCI /** * pci_iomap - create a virtual mapping cookie for a PCI BAR @@ -258,15 +258,15 @@ void ioport_unmap(void __iomem *addr) * @maxlen: max length of the memory to map * * Using this function you will get a __iomem address to your device BAR. ->>>>>>> +>>>>>>> replacement EXPORT_SYMBOL(ioport_map); EXPORT_SYMBOL(ioport_unmap); #endif /* CONFIG_HAS_IOPORT */ #ifdef CONFIG_PCI /* Hide the details if this is a MMIO or PIO address space and just do what -<<<<<<< - * you expect in the correct way. */||||||| +<<<<<<< found + * you expect in the correct way. */||||||| expected * you expect from them in the correct way. * * @maxlen specifies the maximum length to map. If you want to get access to @@ -324,7 +324,7 @@ void __iomem *pci_iomap_range(struct pci_dev *dev, int bar, return ioremap(start, len); return ioremap_nocache(start, len); } ->>>>>>> +>>>>>>> replacement /** * pci_iomap - create a virtual mapping cookie for a PCI BAR diff --git a/tests/linux/md-autostart/merge b/tests/linux/md-autostart/merge index b3bde61..24e3244 100644 --- a/tests/linux/md-autostart/merge +++ b/tests/linux/md-autostart/merge @@ -2601,18 +2601,18 @@ static int md_ioctl(struct inode *inode, struct file *file, } goto done_unlock; -<<<<<<< +<<<<<<< found err = autostart_array((kdev_t)arg); if (err) { printk(KERN_WARNING "md: autostart %s failed!\n", partition_name((kdev_t)arg)); -||||||| +||||||| expected err = autostart_array(val_to_kdev(arg)); if (err) { printk(KERN_WARNING "md: autostart %s failed!\n", partition_name(val_to_kdev(arg))); ======= ->>>>>>> +>>>>>>> replacement default:; } diff --git a/tests/linux/md-loop/merge b/tests/linux/md-loop/merge index 682ed20..3b3a017 100644 --- a/tests/linux/md-loop/merge +++ b/tests/linux/md-loop/merge @@ -640,13 +640,13 @@ static void free_mddev(mddev_t *mddev) while (sem_getcount(&mddev->recovery_sem) != 1) schedule(); -<<<<<<< +<<<<<<< found del_mddev_mapping(mddev, MKDEV(MD_MAJOR, mdidx(mddev))); -||||||| +||||||| expected del_mddev_mapping(mddev, mk_kdev(MD_MAJOR, mdidx(mddev))); ======= mddev_map[mdidx(mddev)] = NULL; ->>>>>>> +>>>>>>> replacement md_list_del(&mddev->all_mddevs); kfree(mddev); MOD_DEC_USE_COUNT; @@ -3951,10 +3951,10 @@ MD_EXPORT_SYMBOL(md_wakeup_thread); MD_EXPORT_SYMBOL(md_print_devices); MD_EXPORT_SYMBOL(find_rdev_nr); MD_EXPORT_SYMBOL(md_interrupt_thread); -<<<<<<< +<<<<<<< found MD_EXPORT_SYMBOL(mddev_map); -||||||| +||||||| expected EXPORT_SYMBOL(mddev_map); ======= ->>>>>>> +>>>>>>> replacement MODULE_LICENSE("GPL"); diff --git a/tests/linux/md-loop/orig b/tests/linux/md-loop/orig index 682ed20..3b3a017 100644 --- a/tests/linux/md-loop/orig +++ b/tests/linux/md-loop/orig @@ -640,13 +640,13 @@ static void free_mddev(mddev_t *mddev) while (sem_getcount(&mddev->recovery_sem) != 1) schedule(); -<<<<<<< +<<<<<<< found del_mddev_mapping(mddev, MKDEV(MD_MAJOR, mdidx(mddev))); -||||||| +||||||| expected del_mddev_mapping(mddev, mk_kdev(MD_MAJOR, mdidx(mddev))); ======= mddev_map[mdidx(mddev)] = NULL; ->>>>>>> +>>>>>>> replacement md_list_del(&mddev->all_mddevs); kfree(mddev); MOD_DEC_USE_COUNT; @@ -3951,10 +3951,10 @@ MD_EXPORT_SYMBOL(md_wakeup_thread); MD_EXPORT_SYMBOL(md_print_devices); MD_EXPORT_SYMBOL(find_rdev_nr); MD_EXPORT_SYMBOL(md_interrupt_thread); -<<<<<<< +<<<<<<< found MD_EXPORT_SYMBOL(mddev_map); -||||||| +||||||| expected EXPORT_SYMBOL(mddev_map); ======= ->>>>>>> +>>>>>>> replacement MODULE_LICENSE("GPL"); diff --git a/tests/linux/md-resync/merge b/tests/linux/md-resync/merge index 8118461..3c668c6 100644 --- a/tests/linux/md-resync/merge +++ b/tests/linux/md-resync/merge @@ -977,16 +977,16 @@ static int raid1_diskop(mddev_t *mddev, mdp_disk_t **d, int state) * Deactivate a spare disk: */ case DISKOP_SPARE_INACTIVE: -<<<<<<< +<<<<<<< found if (conf->start_future > 0) { MD_BUG(); err = -EBUSY; break; } -||||||| +||||||| expected close_sync(conf); ======= ->>>>>>> +>>>>>>> replacement sdisk = conf->mirrors + spare_disk; sdisk->operational = 0; sdisk->write_only = 0; @@ -999,16 +999,16 @@ static int raid1_diskop(mddev_t *mddev, mdp_disk_t **d, int state) * property) */ case DISKOP_SPARE_ACTIVE: -<<<<<<< +<<<<<<< found if (conf->start_future > 0) { MD_BUG(); err = -EBUSY; break; } -||||||| +||||||| expected close_sync(conf); ======= ->>>>>>> +>>>>>>> replacement sdisk = conf->mirrors + spare_disk; fdisk = conf->mirrors + failed_disk; @@ -1137,13 +1137,13 @@ static int raid1_diskop(mddev_t *mddev, mdp_disk_t **d, int state) } abort: md_spin_unlock_irq(&conf->device_lock); -<<<<<<< +<<<<<<< found if (state == DISKOP_SPARE_ACTIVE || state == DISKOP_SPARE_INACTIVE) /* should move to "END_REBUILD" when such exists */ raid1_shrink_buffers(conf); print_raid1_conf(conf); -||||||| +||||||| expected if (state == DISKOP_SPARE_ACTIVE || state == DISKOP_SPARE_INACTIVE) { mempool_destroy(conf->r1buf_pool); conf->r1buf_pool = NULL; @@ -1153,7 +1153,7 @@ abort: ======= print_conf(conf); ->>>>>>> +>>>>>>> replacement return err; } @@ -1300,16 +1300,16 @@ static void raid1d (void *data) #undef IO_ERROR #undef REDIRECT_SECTOR -<<<<<<< +<<<<<<< found static void raid1syncd (void *data) { raid1_conf_t *conf = data; -||||||| +||||||| expected static void raid1syncd(void *data) { conf_t *conf = data; ======= ->>>>>>> +>>>>>>> replacement /* * perform a "sync" on one "block" @@ -1470,13 +1470,13 @@ static int raid1_sync_request (mddev_t *mddev, unsigned long sector_nr) return (bsize >> 9); nomem: -<<<<<<< +<<<<<<< found raid1_shrink_buffers(conf); return -ENOMEM; } static void end_sync_read(struct buffer_head *bh, int uptodate) -||||||| +||||||| expected if (!sector_nr) if (init_resync(conf)) return -ENOMEM; @@ -1497,7 +1497,7 @@ static void end_sync_read(struct buffer_head *bh, int uptodate) /* * If there is non-resync activity waiting for us then * put in a delay to throttle resync. ->>>>>>> +>>>>>>> replacement { struct raid1_bh * r1_bh = (struct raid1_bh *)(bh->b_private); @@ -1520,13 +1520,13 @@ static void end_sync_write(struct buffer_head *bh, int uptodate) md_error (r1_bh->mddev, bh->b_dev); if (atomic_dec_and_test(&r1_bh->remaining)) { mddev_t *mddev = r1_bh->mddev; -<<<<<<< +<<<<<<< found unsigned long sect = bh->b_blocknr; int size = bh->b_size; raid1_free_buf(r1_bh); sync_request_done(sect, mddev_to_conf(mddev)); md_done_sync(mddev,size>>9, uptodate); -||||||| +||||||| expected r1_bio->sector = sector_nr; r1_bio->cmd = SPECIAL; @@ -1538,7 +1538,7 @@ static void end_sync_write(struct buffer_head *bh, int uptodate) r1_bio->sector = sector_nr; r1_bio->cmd = SPECIAL; ->>>>>>> +>>>>>>> replacement } } @@ -1760,20 +1760,20 @@ static int raid1_run (mddev_t *mddev) } } -<<<<<<< +<<<<<<< found if (!start_recovery && !(sb->state & (1 << MD_SB_CLEAN)) && (conf->working_disks > 1)) { const char * name = "raid1syncd"; conf->resync_thread = md_register_thread(raid1syncd, conf,name); -||||||| +||||||| expected if (!start_recovery && !(sb->state & (1 << MD_SB_CLEAN)) && (conf->working_disks > 1)) { const char * name = "raid1syncd"; conf->resync_thread = md_register_thread(raid1syncd, conf, name); ======= ->>>>>>> +>>>>>>> replacement /* * Regenerate the "device is in sync with the raid set" bit for @@ -1818,7 +1818,7 @@ out: #undef NONE_OPERATIONAL #undef ARRAY_IS_ACTIVE -<<<<<<< +<<<<<<< found static int raid1_stop_resync (mddev_t *mddev) { raid1_conf_t *conf = mddev_to_conf(mddev); @@ -1838,7 +1838,7 @@ static int raid1_stop_resync (mddev_t *mddev) static int raid1_restart_resync (mddev_t *mddev) { raid1_conf_t *conf = mddev_to_conf(mddev); -||||||| +||||||| expected static int stop_resync(mddev_t *mddev) { conf_t *conf = mddev_to_conf(mddev); @@ -1859,7 +1859,7 @@ static int restart_resync(mddev_t *mddev) { conf_t *conf = mddev_to_conf(mddev); ======= ->>>>>>> +>>>>>>> replacement static int raid1_stop (mddev_t *mddev) { raid1_conf_t *conf = mddev_to_conf(mddev); @@ -1883,14 +1883,14 @@ static mdk_personality_t raid1_personality= status: raid1_status, error_handler: raid1_error, diskop: raid1_diskop, -<<<<<<< +<<<<<<< found stop_resync: raid1_stop_resync, restart_resync: raid1_restart_resync, -||||||| +||||||| expected stop_resync: stop_resync, restart_resync: restart_resync, ======= ->>>>>>> +>>>>>>> replacement sync_request: raid1_sync_request }; diff --git a/tests/linux/raid1-A/merge b/tests/linux/raid1-A/merge index 6e86939..96d1730 100644 --- a/tests/linux/raid1-A/merge +++ b/tests/linux/raid1-A/merge @@ -711,15 +711,15 @@ static int make_request(mddev_t *mddev, struct bio * bio) int i, targets = 0, disks; struct bitmap *bitmap; unsigned long flags; -<<<<<<< -||||||| +<<<<<<< found +||||||| expected struct bio_list bl; struct page **behind_pages = NULL; ======= struct bio_list bl; int bl_count; struct page **behind_pages = NULL; ->>>>>>> +>>>>>>> replacement const int rw = bio_data_dir(bio); const unsigned long do_sync = (bio->bi_rw & REQ_SYNC); const unsigned long do_flush_fua = (bio->bi_rw & (REQ_FLUSH | REQ_FUA)); @@ -915,10 +915,10 @@ static int make_request(mddev_t *mddev, struct bio * bio) bvec->bv_page = r1_bio->behind_pages[j]; if (test_bit(WriteMostly, &conf->mirrors[i].rdev->flags)) atomic_inc(&r1_bio->behind_remaining); -<<<<<<< +<<<<<<< found } -||||||| +||||||| expected bio_list_add(&bl, mbio); } kfree(behind_pages); /* the behind pages are attached to the bios now */ @@ -929,15 +929,15 @@ static int make_request(mddev_t *mddev, struct bio * bio) } kfree(behind_pages); /* the behind pages are attached to the bios now */ ->>>>>>> +>>>>>>> replacement atomic_inc(&r1_bio->remaining); -<<<<<<< +<<<<<<< found spin_lock_irqsave(&conf->device_lock, flags); bio_list_add(&conf->pending_bio_list, mbio); spin_unlock_irqrestore(&conf->device_lock, flags); } r1_bio_write_done(r1_bio); -||||||| +||||||| expected spin_lock_irqsave(&conf->device_lock, flags); bio_list_merge(&conf->pending_bio_list, &bl); bio_list_init(&bl); @@ -950,7 +950,7 @@ static int make_request(mddev_t *mddev, struct bio * bio) bio_list_init(&bl); blk_plug_device(mddev->queue); ->>>>>>> +>>>>>>> replacement /* In case raid1d snuck in to freeze_array */ wake_up(&conf->wait_barrier); @@ -1950,11 +1950,11 @@ static conf_t *setup_conf(mddev_t *mddev) init_waitqueue_head(&conf->wait_barrier); bio_list_init(&conf->pending_bio_list); -<<<<<<< +<<<<<<< found conf->last_used = -1; for (i = 0; i < conf->raid_disks; i++) { -||||||| +||||||| expected bio_list_init(&conf->flushing_bio_list); @@ -1963,7 +1963,7 @@ static conf_t *setup_conf(mddev_t *mddev) bio_list_init(&conf->flushing_bio_list); ->>>>>>> +>>>>>>> replacement disk = conf->mirrors + i; diff --git a/tests/linux/raid10-race/merge b/tests/linux/raid10-race/merge index ac23499..feb9265 100644 --- a/tests/linux/raid10-race/merge +++ b/tests/linux/raid10-race/merge @@ -1417,10 +1417,10 @@ retry_write: mbio->bi_rw = WRITE | do_sync | do_fua; mbio->bi_private = r10_bio; -<<<<<<< +<<<<<<< found atomic_inc(&r10_bio->remaining); spin_lock_irqsave(&conf->device_lock, flags); -||||||| +||||||| expected atomic_inc(&r10_bio->remaining); cb = blk_check_plugged(raid10_unplug, mddev, sizeof(*plug)); @@ -1440,12 +1440,12 @@ retry_write: else plug = NULL; spin_lock_irqsave(&conf->device_lock, flags); ->>>>>>> -<<<<<<< +>>>>>>> replacement +<<<<<<< found bio_list_add(&conf->pending_bio_list, mbio); conf->pending_count++; spin_unlock_irqrestore(&conf->device_lock, flags); -||||||| +||||||| expected if (plug) { bio_list_add(&plug->pending, mbio); plug->pending_cnt++; @@ -1463,7 +1463,7 @@ retry_write: conf->pending_count++; } spin_unlock_irqrestore(&conf->device_lock, flags); ->>>>>>> +>>>>>>> replacement if (!mddev_check_plugged(mddev)) md_wakeup_thread(mddev->thread); } diff --git a/tests/linux/raid5/merge b/tests/linux/raid5/merge index cfc4250..c849af5 100644 --- a/tests/linux/raid5/merge +++ b/tests/linux/raid5/merge @@ -161,7 +161,7 @@ static int grow_buffers(struct stripe_head *sh, int num) for (i=0; ib_data = page_address(page); else { -||||||| +||||||| expected if (!bh) return 1; memset(bh, 0, sizeof (struct buffer_head)); @@ -178,7 +178,7 @@ static int grow_buffers(struct stripe_head *sh, int num) else { ======= if (!(page = alloc_page(GFP_KERNEL))) { ->>>>>>> +>>>>>>> replacement return 1; } sh->dev[i].page = page; @@ -218,13 +218,13 @@ static inline void init_stripe(struct stripe_head *sh, unsigned long sector, int test_bit(R5_LOCKED, &dev->flags)); BUG(); } -<<<<<<< +<<<<<<< found clear_bit(BH_Uptodate, &sh->bh_cache[i]->b_state); -||||||| +||||||| expected clear_buffer_uptodate(sh->bh_cache[i]); ======= dev->flags = 0; ->>>>>>> +>>>>>>> replacement raid5_build_block(sh, i); } insert_hash(conf, sh); @@ -393,11 +393,11 @@ static void raid5_end_read_request (struct bio * bi) #else set_bit(R5_UPTODATE, &sh->dev[i].flags); #endif -<<<<<<< +<<<<<<< found } else { md_error(conf->mddev, bh->b_dev); clear_bit(BH_Uptodate, &bh->b_state); -||||||| +||||||| expected } else { md_error(conf->mddev, bh->b_bdev); clear_buffer_uptodate(bh); @@ -405,7 +405,7 @@ static void raid5_end_read_request (struct bio * bi) } else { md_error(conf->mddev, bi->bi_bdev); clear_bit(R5_UPTODATE, &sh->dev[i].flags); ->>>>>>> +>>>>>>> replacement } #if 0 /* must restore b_page before unlocking buffer... */ @@ -415,13 +415,13 @@ static void raid5_end_read_request (struct bio * bi) clear_bit(BH_Uptodate, &bh->b_state); } #endif -<<<<<<< +<<<<<<< found clear_bit(BH_Lock, &bh->b_state); -||||||| +||||||| expected clear_buffer_locked(bh); ======= clear_bit(R5_LOCKED, &sh->dev[i].flags); ->>>>>>> +>>>>>>> replacement set_bit(STRIPE_HANDLE, &sh->state); release_stripe(sh); } @@ -446,17 +446,17 @@ static void raid5_end_write_request (struct bio *bi) spin_lock_irqsave(&conf->device_lock, flags); if (!uptodate) -<<<<<<< +<<<<<<< found md_error(conf->mddev, bh->b_dev); clear_bit(BH_Lock, &bh->b_state); -||||||| +||||||| expected md_error(conf->mddev, bh->b_bdev); clear_buffer_locked(bh); ======= md_error(conf->mddev, bi->bi_bdev); clear_bit(R5_LOCKED, &sh->dev[i].flags); ->>>>>>> +>>>>>>> replacement set_bit(STRIPE_HANDLE, &sh->state); __release_stripe(conf, sh); spin_unlock_irqrestore(&conf->device_lock, flags); @@ -477,29 +477,29 @@ static void raid5_build_block (struct stripe_head *sh, int i) dev->vec.bv_len = STRIPE_SIZE; dev->vec.bv_offset = 0; -<<<<<<< +<<<<<<< found bh->b_dev = conf->disks[i].dev; -||||||| +||||||| expected bh->b_dev = conf->disks[i].dev; /* FIXME - later we will need bdev here */ ======= dev->req.bi_bdev = conf->disks[i].bdev; dev->req.bi_sector = sh->sector; ->>>>>>> +>>>>>>> replacement dev->req.bi_private = sh; dev->flags = 0; if (i != sh->pd_idx) -<<<<<<< +<<<<<<< found bh->b_size = sh->size; bh->b_list = BUF_LOCKED; return bh; -||||||| +||||||| expected bh->b_size = sh->size; return bh; ======= dev->sector = compute_blocknr(sh, i); ->>>>>>> +>>>>>>> replacement } static int error (mddev_t *mddev, kdev_t dev) @@ -755,16 +755,16 @@ static void compute_block(struct stripe_head *sh, int dd_idx) check_xor(); } if (count != 1) -<<<<<<< +<<<<<<< found xor_block(count, bh_ptr); set_bit(BH_Uptodate, &sh->bh_cache[dd_idx]->b_state); -||||||| +||||||| expected xor_block(count, bh_ptr); set_buffer_uptodate(sh->bh_cache[dd_idx]); ======= xor_block(count, STRIPE_SIZE, ptr); set_bit(R5_UPTODATE, &sh->dev[i].flags); ->>>>>>> +>>>>>>> replacement } static void compute_parity(struct stripe_head *sh, int method) @@ -820,13 +820,13 @@ static void compute_parity(struct stripe_head *sh, int method) sector_t sector = sh->dev[i].sector; copy_data(1, chosen[i], sh->dev[i].page, sector); -<<<<<<< +<<<<<<< found memcpy(bh->b_data, bdata,sh->size); bh_kunmap(chosen[i]); set_bit(BH_Lock, &bh->b_state); mark_buffer_uptodate(bh, 1); -||||||| +||||||| expected memcpy(bh->b_data, bdata,sh->size); bh_kunmap(chosen[i]); @@ -835,7 +835,7 @@ static void compute_parity(struct stripe_head *sh, int method) ======= set_bit(R5_LOCKED, &sh->dev[i].flags); set_bit(R5_UPTODATE, &sh->dev[i].flags); ->>>>>>> +>>>>>>> replacement } switch(method) { @@ -858,12 +858,12 @@ static void compute_parity(struct stripe_head *sh, int method) xor_block(count, STRIPE_SIZE, ptr); if (method != CHECK_PARITY) { -<<<<<<< +<<<<<<< found mark_buffer_uptodate(sh->bh_cache[pd_idx], 1); set_bit(BH_Lock, &sh->bh_cache[pd_idx]->b_state); } else mark_buffer_uptodate(sh->bh_cache[pd_idx], 0); -||||||| +||||||| expected set_buffer_uptodate(sh->bh_cache[pd_idx]); set_buffer_locked(sh->bh_cache[pd_idx]); } else @@ -873,7 +873,7 @@ static void compute_parity(struct stripe_head *sh, int method) set_bit(R5_LOCKED, &sh->dev[pd_idx].flags); } else clear_bit(R5_UPTODATE, &sh->dev[pd_idx].flags); ->>>>>>> +>>>>>>> replacement } /* @@ -1098,17 +1098,17 @@ static void handle_stripe(struct stripe_head *sh) compute_block(sh, i); uptodate++; } else if (conf->disks[i].operational) { -<<<<<<< +<<<<<<< found set_bit(BH_Lock, &bh->b_state); action[i] = READ+1; -||||||| +||||||| expected set_buffer_locked(bh); action[i] = READ+1; ======= set_bit(R5_LOCKED, &dev->flags); action[i] = READ+1; #if 0 ->>>>>>> +>>>>>>> replacement /* if I am just reading this block and we don't have a failed drive, or any pending writes then sidestep the cache */ if (sh->bh_read[i] && !sh->bh_read[i]->b_reqnext && @@ -1170,13 +1170,13 @@ static void handle_stripe(struct stripe_head *sh) if (test_bit(STRIPE_PREREAD_ACTIVE, &sh->state)) { PRINTK("Read_old block %d for r-m-w\n", i); -<<<<<<< +<<<<<<< found set_bit(BH_Lock, &bh->b_state); -||||||| +||||||| expected set_buffer_locked(bh); ======= set_bit(R5_LOCKED, &dev->flags); ->>>>>>> +>>>>>>> replacement action[i] = READ+1; locked++; } else { @@ -1195,13 +1195,13 @@ static void handle_stripe(struct stripe_head *sh) if (test_bit(STRIPE_PREREAD_ACTIVE, &sh->state)) { PRINTK("Read_old block %d for Reconstruct\n", i); -<<<<<<< +<<<<<<< found set_bit(BH_Lock, &bh->b_state); -||||||| +||||||| expected set_buffer_locked(bh); ======= set_bit(R5_LOCKED, &dev->flags); ->>>>>>> +>>>>>>> replacement action[i] = READ+1; locked++; } else { @@ -1265,16 +1265,16 @@ static void handle_stripe(struct stripe_head *sh) } if (uptodate != disks) BUG(); -<<<<<<< +<<<<<<< found bh = sh->bh_cache[failed_num]; set_bit(BH_Lock, &bh->b_state); -||||||| +||||||| expected bh = sh->bh_cache[failed_num]; set_buffer_locked(bh); ======= dev = &sh->dev[failed_num]; set_bit(R5_LOCKED, &dev->flags); ->>>>>>> +>>>>>>> replacement action[failed_num] = WRITE+1; locked++; set_bit(STRIPE_INSYNC, &sh->state); @@ -1328,13 +1328,13 @@ static void handle_stripe(struct stripe_head *sh) generic_make_request(bi); } else { PRINTK("skip op %d on disc %d for sector %ld\n", action[i]-1, i, sh->sector); -<<<<<<< +<<<<<<< found clear_bit(BH_Lock, &bh->b_state); -||||||| +||||||| expected clear_buffer_locked(bh); ======= clear_bit(R5_LOCKED, &dev->flags); ->>>>>>> +>>>>>>> replacement set_bit(STRIPE_HANDLE, &sh->state); } } @@ -1421,10 +1421,10 @@ static int make_request (mddev_t *mddev, int rw, struct bio * bi) handle_stripe(sh); release_stripe(sh); } -<<<<<<< +<<<<<<< found } else bh->b_end_io(bh, test_bit(BH_Uptodate, &bh->b_state)); -||||||| +||||||| expected } else bh->b_end_io(bh, buffer_uptodate(bh)); ======= @@ -1433,11 +1433,11 @@ static int make_request (mddev_t *mddev, int rw, struct bio * bi) if (--bi->bi_phys_segments == 0) bi->bi_end_io(bi); spin_unlock_irq(&conf->device_lock); ->>>>>>> +>>>>>>> replacement return 0; } -<<<<<<< +<<<<<<< found /* * Determine correct block size for this device. */ @@ -1455,10 +1455,10 @@ unsigned int device_bsize (kdev_t dev) return correct_size; } -||||||| +||||||| expected ======= /* FIXME go_faster isn't used */ ->>>>>>> +>>>>>>> replacement static int sync_request (mddev_t *mddev, sector_t sector_nr, int go_faster) { raid5_conf_t *conf = (raid5_conf_t *) mddev->private; diff --git a/tests/linux/raid5build/merge b/tests/linux/raid5build/merge index eaff4ce..b38a90a 100644 --- a/tests/linux/raid5build/merge +++ b/tests/linux/raid5build/merge @@ -10,27 +10,27 @@ static void raid5_build_block (struct stripe_head *sh, int i) dev->vec.bv_len = STRIPE_SIZE; dev->vec.bv_offset = 0; -<<<<<<< +<<<<<<< found bh->b_dev = conf->disks[i].dev; -||||||| +||||||| expected bh->b_dev = conf->disks[i].dev; /* FIXME - later we will need bdev here */ ======= dev->req.bi_bdev = conf->disks[i].bdev; dev->req.bi_sector = sh->sector; ->>>>>>> +>>>>>>> replacement dev->req.bi_private = sh; dev->flags = 0; if (i != sh->pd_idx) -<<<<<<< +<<<<<<< found bh->b_size = sh->size; bh->b_list = BUF_LOCKED; return bh; -||||||| +||||||| expected bh->b_size = sh->size; return bh; ======= dev->sector = compute_blocknr(sh, i); ->>>>>>> +>>>>>>> replacement } diff --git a/tests/linux/raid5line/lmerge b/tests/linux/raid5line/lmerge index 4d8dba6..6f18cae 100644 --- a/tests/linux/raid5line/lmerge +++ b/tests/linux/raid5line/lmerge @@ -1,7 +1,7 @@ clear_bit(BH_Uptodate, &sh->bh_cache[i]->b_state); -<<<<<<< -||||||| +<<<<<<< found +||||||| expected clear_buffer_uptodate(sh->bh_cache[i]); ======= dev->flags = 0; ->>>>>>> +>>>>>>> replacement diff --git a/tests/linux/raid5line/merge b/tests/linux/raid5line/merge index e6ffa40..778efe1 100644 --- a/tests/linux/raid5line/merge +++ b/tests/linux/raid5line/merge @@ -1,7 +1,7 @@ -<<<<<<< +<<<<<<< found clear_bit(BH_Uptodate, &sh->bh_cache[i]->b_state); -||||||| +||||||| expected clear_buffer_uptodate(sh->bh_cache[i]); ======= dev->flags = 0; ->>>>>>> +>>>>>>> replacement diff --git a/tests/linux/rpc_tcp_nonagle/merge b/tests/linux/rpc_tcp_nonagle/merge index 2f9aa46..7ee9a62 100644 --- a/tests/linux/rpc_tcp_nonagle/merge +++ b/tests/linux/rpc_tcp_nonagle/merge @@ -1031,13 +1031,13 @@ svc_tcp_init(struct svc_sock *svsk) sk->write_space = svc_write_space; svsk->sk_reclen = 0; -<<<<<<< +<<<<<<< found svsk->sk_tcplen = 0; /* initialise setting must have enough space to * receive and respond to one request. * svc_tcp_recvfrom will re-adjust if necessary -||||||| +||||||| expected svsk->sk_tcplen = 0; /* initialise setting must have enough space to @@ -1051,7 +1051,7 @@ svc_tcp_init(struct svc_sock *svsk) /* initialise setting must have enough space to * receive and respond to one request. * svc_tcp_recvfrom will re-adjust if necessary ->>>>>>> +>>>>>>> replacement */ svc_sock_setbufsize(svsk->sk_sock, 3 * svsk->sk_server->sv_bufsz, diff --git a/tests/simple/all-different-2/lmerge b/tests/simple/all-different-2/lmerge index 65606f9..a4f6387 100644 --- a/tests/simple/all-different-2/lmerge +++ b/tests/simple/all-different-2/lmerge @@ -1,4 +1,4 @@ -<<<<<<< +<<<<<<< found 1 2 3 @@ -9,7 +9,7 @@ 8 9 0 -||||||| +||||||| expected a b c @@ -31,4 +31,4 @@ G H I J ->>>>>>> +>>>>>>> replacement diff --git a/tests/simple/all-different-2/merge b/tests/simple/all-different-2/merge index 65606f9..a4f6387 100644 --- a/tests/simple/all-different-2/merge +++ b/tests/simple/all-different-2/merge @@ -1,4 +1,4 @@ -<<<<<<< +<<<<<<< found 1 2 3 @@ -9,7 +9,7 @@ 8 9 0 -||||||| +||||||| expected a b c @@ -31,4 +31,4 @@ G H I J ->>>>>>> +>>>>>>> replacement diff --git a/tests/simple/all-different/lmerge b/tests/simple/all-different/lmerge index ab83c87..aea0151 100644 --- a/tests/simple/all-different/lmerge +++ b/tests/simple/all-different/lmerge @@ -1,4 +1,4 @@ -<<<<<<< +<<<<<<< found 1 2 3 @@ -9,7 +9,7 @@ 8 9 0 -||||||| +||||||| expected a b c @@ -31,5 +31,5 @@ G H I J ->>>>>>> +>>>>>>> replacement yes diff --git a/tests/simple/all-different/merge b/tests/simple/all-different/merge index ab83c87..aea0151 100644 --- a/tests/simple/all-different/merge +++ b/tests/simple/all-different/merge @@ -1,4 +1,4 @@ -<<<<<<< +<<<<<<< found 1 2 3 @@ -9,7 +9,7 @@ 8 9 0 -||||||| +||||||| expected a b c @@ -31,5 +31,5 @@ G H I J ->>>>>>> +>>>>>>> replacement yes diff --git a/tests/simple/conflict/merge b/tests/simple/conflict/merge index 4afaeff..152a3c8 100644 --- a/tests/simple/conflict/merge +++ b/tests/simple/conflict/merge @@ -1,10 +1,10 @@ this is a file with the word -<<<<<<< +<<<<<<< found two which is -||||||| +||||||| expected to which is ======= too which is ->>>>>>> +>>>>>>> replacement misspelt diff --git a/tests/simple/conflictmixed/lmerge b/tests/simple/conflictmixed/lmerge index bb4d03c..0fdba3c 100644 --- a/tests/simple/conflictmixed/lmerge +++ b/tests/simple/conflictmixed/lmerge @@ -1,10 +1,10 @@ this is a file with the word -<<<<<<< +<<<<<<< found two which is -||||||| +||||||| expected to which is ======= too which was ->>>>>>> +>>>>>>> replacement misspelt diff --git a/tests/simple/conflictmixed/merge b/tests/simple/conflictmixed/merge index bb4d03c..0fdba3c 100644 --- a/tests/simple/conflictmixed/merge +++ b/tests/simple/conflictmixed/merge @@ -1,10 +1,10 @@ this is a file with the word -<<<<<<< +<<<<<<< found two which is -||||||| +||||||| expected to which is ======= too which was ->>>>>>> +>>>>>>> replacement misspelt diff --git a/tests/simple/multiple-add/lmerge b/tests/simple/multiple-add/lmerge index f2a4151..cb86b10 100644 --- a/tests/simple/multiple-add/lmerge +++ b/tests/simple/multiple-add/lmerge @@ -5,11 +5,11 @@ current version of the -<<<<<<< +<<<<<<< found file. -||||||| +||||||| expected file ======= file that has changed ->>>>>>> +>>>>>>> replacement diff --git a/tests/simple/multiple-add/merge b/tests/simple/multiple-add/merge index f2a4151..cb86b10 100644 --- a/tests/simple/multiple-add/merge +++ b/tests/simple/multiple-add/merge @@ -5,11 +5,11 @@ current version of the -<<<<<<< +<<<<<<< found file. -||||||| +||||||| expected file ======= file that has changed ->>>>>>> +>>>>>>> replacement diff --git a/tests/simple/show-wiggle-1/Wmerge b/tests/simple/show-wiggle-1/Wmerge index 2bb7d41..36a1c78 100644 --- a/tests/simple/show-wiggle-1/Wmerge +++ b/tests/simple/show-wiggle-1/Wmerge @@ -1,13 +1,13 @@ -<<<<<<< +<<<<<<< found This is one line of the file -||||||| +||||||| expected This is 1 line of the file ======= This is 1 line of the document -&&&&&&& +&&&&&&& resolution This is one line of the document ->>>>>>> +>>>>>>> replacement I think this is another line diff --git a/tests/simple/show-wiggle-2/Wmerge b/tests/simple/show-wiggle-2/Wmerge index dadabc6..4e2c710 100644 --- a/tests/simple/show-wiggle-2/Wmerge +++ b/tests/simple/show-wiggle-2/Wmerge @@ -1,13 +1,13 @@ Openning line -<<<<<<< +<<<<<<< found content line with content -||||||| +||||||| expected content line content ======= middle line content -&&&&&&& +&&&&&&& resolution middle line with content ->>>>>>> +>>>>>>> replacement closing line diff --git a/tests/simple/show-wiggle-3/Wmerge b/tests/simple/show-wiggle-3/Wmerge index f12e600..0370beb 100644 --- a/tests/simple/show-wiggle-3/Wmerge +++ b/tests/simple/show-wiggle-3/Wmerge @@ -4,12 +4,12 @@ are other extraneous sections of text that should not cause an extra wiggle -<<<<<<< +<<<<<<< found Here is a line -||||||| +||||||| expected Here was a line ======= Here will be a line ->>>>>>> +>>>>>>> replacement There is nothing else. diff --git a/tests/simple/trivial-conflict/merge b/tests/simple/trivial-conflict/merge index 4e532df..0cee7aa 100644 --- a/tests/simple/trivial-conflict/merge +++ b/tests/simple/trivial-conflict/merge @@ -1,7 +1,7 @@ -<<<<<<< +<<<<<<< found c -||||||| +||||||| expected a ======= b ->>>>>>> +>>>>>>> replacement -- 2.39.5