search for: 669,7

Hi, I noticed the diff wasn't showing the "-" at the start of a deleted file and the details of the second file when attributes are different. This change should fix them. thanks.

...diff.c index 8b0fda0..6a374af 100644 --- a/diff/diff.c +++ b/diff/diff.c @@ -608,7 +608,7 @@ static void deleted (guestfs_h *g, struct file *file) { output_start_line (); - output_string ("+"); + output_string ("-"); output_file (g, file); output_end_line (); } @@ -669,7 +669,7 @@ changed (guestfs_h *g1, struct file *file1, output_end_line (); output_start_line (); output_string ("+"); - output_file (g1, file1); + output_file (g2, file2); output_end_line (); /* Display stats fields that changed. */ -- 1.9.3

...atch taking Eli's comments into account. Comments inline. If you have commit access, I'd fire away. If not, I can. diff --git include/llvm/MC/MCAssembler.h include/llvm/MC/MCAssembler.h index 07ca070..afff96e 100644 --- include/llvm/MC/MCAssembler.h +++ include/llvm/MC/MCAssembler.h @@ -669,7 +669,9 @@ public: - void Finish(); + /// \arg Writer is used for custom object writer (as the MCJIT does), + /// if not specified it is automatically created from backend Nit: End complete sentences end with a period. + void Finish(MCObjectWriter *Writer = 0); diff --git include/llvm/Target...

New patch taking Eli's comments into account. Olivier. On Tue, Jul 20, 2010 at 11:09 PM, Eli Friedman <eli.friedman at gmail.com> wrote: > On Tue, Jul 20, 2010 at 1:36 PM, Olivier Meurant > <meurant.olivier at gmail.com> wrote: >>> Seems reasonable, but I haven't looked at the code yet. I would >>> suggest trying to split your work up into separate

...utex); @@ -622,7 +622,7 @@ nouveau_gem_ioctl_pushbuf_call(struct drm_device *dev, void *data, ret = -EINVAL; goto out; } - pbbo = gem->driver_private; + pbbo = nouveau_gem_object(gem); ret = ttm_bo_reserve(&pbbo->bo, false, false, true, chan->fence.sequence); @@ -669,7 +669,8 @@ nouveau_gem_ioctl_pushbuf_call(struct drm_device *dev, void *data, /* Apply any relocations that are required */ if (do_reloc) { - ret = ttm_bo_kmap(&pbbo->bo, 0, pbbo->bo.mem.num_pages, &pbbo->kmap); + ret = ttm_bo_kmap(&pbbo->bo, 0, pbbo->bo.mem.num_...

...er waiter(s) until they can actually proceed to use the buffer. diff -puN fs/jbd/transaction.c~ext3-scheduling-storm fs/jbd/transaction.c --- 24/fs/jbd/transaction.c~ext3-scheduling-storm 2003-01-16 02:45:19.000000000 -0800 +++ 24-akpm/fs/jbd/transaction.c 2003-01-16 02:45:19.000000000 -0800 @@ -669,7 +669,8 @@ repeat: spin_unlock(&journal_datalist_lock); unlock_journal(journal); /* commit wakes up all shadow buffers after IO */ - sleep_on(&jh2bh(jh)->b_wait); + wait_event(jh2bh(jh)->b_wait, + jh->b_jlist != BJ_Shadow); lock_journal(journal); goto...

...count. > > Comments inline.  If you have commit access, I'd fire away.  If not, I can. > > diff --git include/llvm/MC/MCAssembler.h include/llvm/MC/MCAssembler.h > index 07ca070..afff96e 100644 > --- include/llvm/MC/MCAssembler.h > +++ include/llvm/MC/MCAssembler.h > @@ -669,7 +669,9 @@ public: > -  void Finish(); > +  /// \arg Writer is used for custom object writer (as the MCJIT does), > +  /// if not specified it is automatically created from backend > > Nit: End complete sentences end with a period. > > +  void Finish(MCObjectWriter *Writer = 0...

...um_pages; + if (num_pages) { + map_zeroed_pages(top, num_pages); + descs[i].pfn = top/getpagesize(); + top += num_pages*getpagesize(); + } + return &descs[i]; + } + } + errx(1, "too many devices"); } static struct device *new_device(struct device_list *devices, @@ -669,7 +672,7 @@ static struct device *new_device(struct dev->fd = fd; if (handle_input) set_fd(dev->fd, devices); - dev->desc = new_dev_desc(type, features, num_pages); + dev->desc = new_dev_desc(devices->descs, type, features, num_pages); dev->mem = (void *)(dev->desc-&g...

...um_pages; + if (num_pages) { + map_zeroed_pages(top, num_pages); + descs[i].pfn = top/getpagesize(); + top += num_pages*getpagesize(); + } + return &descs[i]; + } + } + errx(1, "too many devices"); } static struct device *new_device(struct device_list *devices, @@ -669,7 +672,7 @@ static struct device *new_device(struct dev->fd = fd; if (handle_input) set_fd(dev->fd, devices); - dev->desc = new_dev_desc(type, features, num_pages); + dev->desc = new_dev_desc(devices->descs, type, features, num_pages); dev->mem = (void *)(dev->desc-&g...

...18 @@ } void +verifypath(char *file) +{ + if (access(file, F_OK) == -1) + { + errno = ENOENT; + run_err("%s: %s",file,strerror(errno)); + killchild(0); + } +} + + +void toremote(char *targ, int argc, char **argv) { char *bp, *host, *src, *suser, *thost, *tuser, *arg; @@ -656,6 +669,7 @@ if (remin == -1) { xasprintf(&bp, "%s -t %s%s", cmd, *targ == '-' ? "-- " : "", targ); + verifypath(argv[i]);/*added to check for the local existence of file before trying to do anything*/ host = cleanhostname(thost); if...

...lename) } /* Write ADV */ - ret = xpwrite(fd, syslinux_adv, 2 * ADV_SIZE, boot_image_len); - if (ret != 2 * ADV_SIZE) { + if (ext_write_adv_offset(fd, boot_image_len)) { fprintf(stderr, "%s: write failure on %s\n", program, filename); goto error; } @@ -617,9 +669,7 @@ int btrfs_install_file(const char *path, int devfd, struct stat *rst) return 1; } dprintf("write boot_image to 0x%x\n", BTRFS_EXTLINUX_OFFSET); - if (xpwrite(devfd, syslinux_adv, 2 * ADV_SIZE, BTRFS_ADV_OFFSET) - != 2 * ADV_SIZE) { - perror("writing adv"); +...

These patches try to handle the hot-unplug of vsock virtio transport device in a proper way. Maybe move the vsock_core_init()/vsock_core_exit() functions in the module_init and module_exit of vsock_virtio_transport module can't be the best way, but the architecture of vsock_core forces us to this approach for now. The vsock_core proto_ops expect a valid pointer to the transport device, so we

These patches try to handle the hot-unplug of vsock virtio transport device in a proper way. Maybe move the vsock_core_init()/vsock_core_exit() functions in the module_init and module_exit of vsock_virtio_transport module can't be the best way, but the architecture of vsock_core forces us to this approach for now. The vsock_core proto_ops expect a valid pointer to the transport device, so we

...; > int dirty; > > - int expected_count = expected_page_refs(mapping, &folio->page) + extra_count; > > + int expected_count = folio_expected_refs(mapping, folio) + extra_count; > > long nr = folio_nr_pages(folio); > > > > if (!mapping) { > > @@ -669,7 +674,7 @@ static int __buffer_migrate_folio(struct address_space *mapping, > > return migrate_page(mapping, &dst->page, &src->page, mode); > > > > /* Check whether page does not have extra refs before we do more work */ > > - expected_count = expected_...

...; > int dirty; > > - int expected_count = expected_page_refs(mapping, &folio->page) + extra_count; > > + int expected_count = folio_expected_refs(mapping, folio) + extra_count; > > long nr = folio_nr_pages(folio); > > > > if (!mapping) { > > @@ -669,7 +674,7 @@ static int __buffer_migrate_folio(struct address_space *mapping, > > return migrate_page(mapping, &dst->page, &src->page, mode); > > > > /* Check whether page does not have extra refs before we do more work */ > > - expected_count = expected_...

...ret = virtqueue_add_buf(out_vq, sg, 1, 0, in_buf, GFP_ATOMIC); + if (is_console_port(port)) + sg_init_one(sg, in_buf, in_count); + else + sg_init_one(sg, buf->buf, in_count); + ret = virtqueue_add_buf(out_vq, sg, 1, 0, buf, GFP_ATOMIC); /* Tell Host to go! */ virtqueue_kick(out_vq); @@ -669,7 +773,7 @@ static ssize_t port_fops_write(struct file *filp, const char __user *ubuf, size_t count, loff_t *offp) { struct port *port; - char *buf; + struct port_buffer *buf; ssize_t ret; bool nonblock; @@ -696,11 +800,11 @@ static ssize_t port_fops_write(struct file *filp, con...

...ret = virtqueue_add_buf(out_vq, sg, 1, 0, in_buf, GFP_ATOMIC); + if (is_console_port(port)) + sg_init_one(sg, in_buf, in_count); + else + sg_init_one(sg, buf->buf, in_count); + ret = virtqueue_add_buf(out_vq, sg, 1, 0, buf, GFP_ATOMIC); /* Tell Host to go! */ virtqueue_kick(out_vq); @@ -669,7 +773,7 @@ static ssize_t port_fops_write(struct file *filp, const char __user *ubuf, size_t count, loff_t *offp) { struct port *port; - char *buf; + struct port_buffer *buf; ssize_t ret; bool nonblock; @@ -696,11 +800,11 @@ static ssize_t port_fops_write(struct file *filp, con...

...->words) { /* if we've not consumed up to a partial tail word... */ uint32_t b = br->buffer[br->consumed_words] << br->consumed_bits; if(b) { - i = COUNT_ZERO_MSBS(b); + i = FLAC__clz_uint32(b); *val += i; i++; br->consumed_bits += i; @@ -709,7 +669,7 @@ FLAC__bool FLAC__bitreader_read_unary_unsigned(FLAC__BitReader *br, unsigned *va const unsigned end = br->bytes * 8; uint32_t b = (br->buffer[br->consumed_words] & (FLAC__WORD_ALL_ONES << (FLAC__BITS_PER_WORD-end))) << br->consumed_bits; if(b) { - i =...

...,7 @@ int nouveau_bo_wait(struct nouveau_bo *bo, uint32_t access, struct nouveau_client *client) { + struct nouveau_drm *drm = nouveau_drm(&bo->device->object); struct nouveau_bo_priv *nvbo = nouveau_bo(bo); struct drm_nouveau_gem_cpu_prep req; struct nouveau_pushbuf *push; @@ -669,7 +667,7 @@ nouveau_bo_wait(struct nouveau_bo *bo, uint32_t access, if (access & NOUVEAU_BO_NOBLOCK) req.flags |= NOUVEAU_GEM_CPU_PREP_NOWAIT; - ret = drmCommandWrite(bo->device->fd, DRM_NOUVEAU_GEM_CPU_PREP, + ret = drmCommandWrite(drm->fd, DRM_NOUVEAU_GEM_CPU_PREP, &...

...p_intern (argv[optind], n); + if (key == NULL) exit (EXIT_FAILURE); - } - top->config (top, keys[optind], p+1); + top->config (top, key, p+1); } else if (magic_config_key == NULL) { if (i == 0) /* magic script parameter */ @@ -677,9 +669,7 @@ main (int argc, char *argv[]) if (dump_plugin) { top->dump_fields (top); top->free (top); - for (i = 1; i < argc; ++i) - free (keys[i]); - free (keys); + free_interns (); exit (EXIT_SUCCESS); } @@ -717,9 +707,7 @@ main (int argc, char *argv[]) cr...