search for: 229,10

...X_CAPS +#ifdef _POSIX_SOURCE +#undef _POSIX_SOURCE +#include <sys/prctl.h> +#include <sys/capability.h> +#define _POSIX_SOURCE +#else +#include <sys/prctl.h> +#include <sys/capability.h> +#endif +#endif + #include "rsync.h" extern int module_id; @@ -217,6 +229,10 @@ int start_glob=0; int ret; char *request=NULL; +#ifdef HAVE_LINUX_CAPS + cap_t cp; + cap_value_t newcaps[2] = { CAP_SYS_CHROOT, CAP_DAC_READ_SEARCH }; +#endif extern int am_sender; extern int am_server; extern int am_daemon; @@ -373,12 +389,46 @@ } #endif +#ifdef HAVE_LINUX_...

...oncommit, Opt_err, }; static match_table_t tokens = { @@ -85,6 +85,7 @@ static match_table_t tokens = { {Opt_ssd, "ssd"}, {Opt_noacl, "noacl"}, {Opt_notreelog, "notreelog"}, + {Opt_flushoncommit, "flushoncommit"}, {Opt_err, NULL}, }; @@ -228,6 +229,10 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) printk(KERN_INFO "btrfs: disabling tree log\n"); btrfs_set_opt(info->mount_opt, NOTREELOG); break; + case Opt_flushoncommit: + printk(KERN_INFO "btrfs: turning on flush-on-commit\n"); + btr...

Add a new field, VIRTIO_BALLOON_S_AVAIL, to virtio_balloon memory statistics protocol, corresponding to 'Available' in /proc/meminfo. It indicates to the hypervisor how big the balloon can be inflated without pushing the guest system to swap. This metric would be very useful in VM orchestration software to improve memory management of different VMs under overcommit. Signed-off-by: Igor

Add a new field, VIRTIO_BALLOON_S_AVAIL, to virtio_balloon memory statistics protocol, corresponding to 'Available' in /proc/meminfo. It indicates to the hypervisor how big the balloon can be inflated without pushing the guest system to swap. This metric would be very useful in VM orchestration software to improve memory management of different VMs under overcommit. Signed-off-by: Igor

...bd_new_option new_option; size_t nr_options; uint64_t version; uint32_t option; uint32_t optlen; char data[MAX_OPTION_LENGTH+1]; - struct new_handshake_finish handshake_finish; + struct nbd_new_handshake_finish handshake_finish; const char *optname; uint64_t exportsize; @@ -229,10 +229,10 @@ negotiate_handshake_newstyle_options (struct connection *conn) return -1; version = be64toh (new_option.version); - if (version != NEW_VERSION) { + if (version != NBD_NEW_VERSION) { nbdkit_error ("unknown option version %" PRIx64...

.../virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -30,6 +30,7 @@ #include <linux/balloon_compaction.h> #include <linux/oom.h> #include <linux/wait.h> +#include <linux/mm.h> /* * Balloon device works in 4K page units. So each page is pointed to by @@ -229,10 +230,13 @@ static void update_balloon_stats(struct virtio_balloon *vb) unsigned long events[NR_VM_EVENT_ITEMS]; struct sysinfo i; int idx = 0; + long available; all_vm_events(events); si_meminfo(&i); + available = si_mem_available(); + update_stat(vb, idx++, VIRTIO_BALLOON_S_...

...pu/drm/nouveau/nv50_graph.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c index 857a096..08d87b7 100644 --- a/drivers/gpu/drm/nouveau/nv50_graph.c +++ b/drivers/gpu/drm/nouveau/nv50_graph.c @@ -229,10 +229,6 @@ nv50_graph_create_context(struct nouveau_channel *chan) nouveau_grctx_vals_load(dev, ctx); } nv_wo32(dev, ctx, 0x00000/4, chan->ramin->instance >> 12); - if ((dev_priv->chipset & 0xf0) == 0xa0) - nv_wo32(dev, ctx, 0x00004/4, 0x00000000); - else - nv_wo32(dev...

...ause the system not to boot since ubuntu will attempt to > mount the filesystem as a minix filesystem. I suspect the simplest solution is to probe for ext3 and ext2 before minix. --- fstype.c.old 2006-03-31 15:51:31.000000000 -0500 +++ fstype.c 2006-03-31 15:59:39.000000000 -0500 @@ -229,6 +229,10 @@ int (*identify)(const void *, unsigned long long *); }; +/* Minix needs to come after ext[23] to make sure that the + * minix can't get mistaken for it. + */ + static struct imagetype images[] = { { 0, "gzip", gzip_image...

.../virtgpu_ioctl.c | 6 +++--- 3 files changed, 7 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h index 1d6e4ffee7d1..d4d82679d83a 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.h +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h @@ -229,10 +229,6 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj, struct drm_file *file); void virtio_gpu_gem_object_close(struct drm_gem_object *obj, struct drm_file *file); -struct virtio_gpu_object* -virtio_gpu_alloc_object(struct drm_device *dev, - struct virtio_gpu_ob...

.../virtgpu_ioctl.c | 6 +++--- 3 files changed, 7 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h index f8a586029400..577a8103670e 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.h +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h @@ -229,10 +229,6 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj, struct drm_file *file); void virtio_gpu_gem_object_close(struct drm_gem_object *obj, struct drm_file *file); -struct virtio_gpu_object* -virtio_gpu_alloc_object(struct drm_device *dev, - struct virtio_gpu_ob...

...fifo *pfifo = nouveau_fifo(subdev); struct nouveau_engine *engine = nv_engine(subdev); struct nouveau_object *engctx; - struct nouveau_handle *handle; struct nv31_mpeg_priv *priv = (void *)subdev; u32 inst = nv_rd32(priv, 0x00b318) & 0x000fffff; u32 stat = nv_rd32(priv, 0x00b100); @@ -229,10 +222,8 @@ nv31_mpeg_intr(struct nouveau_subdev *subdev) } if (type == 0x00000010) { - handle = nouveau_handle_get_class(engctx, 0x3174); - if (handle && !nv_call(handle->object, mthd, data)) + if (!nv31_mpeg_mthd_dma(priv, mthd, data)) show &= ~0x01000000; - n...

.../virtio_balloon.c > @@ -30,6 +30,7 @@ > #include <linux/balloon_compaction.h> > #include <linux/oom.h> > #include <linux/wait.h> > +#include <linux/mm.h> > > /* > * Balloon device works in 4K page units. So each page is pointed to by > @@ -229,10 +230,13 @@ static void update_balloon_stats(struct virtio_balloon *vb) > unsigned long events[NR_VM_EVENT_ITEMS]; > struct sysinfo i; > int idx = 0; > + long available; > > all_vm_events(events); > si_meminfo(&i); > > + available = si_mem_available();...

.../virtio_balloon.c > @@ -30,6 +30,7 @@ > #include <linux/balloon_compaction.h> > #include <linux/oom.h> > #include <linux/wait.h> > +#include <linux/mm.h> > > /* > * Balloon device works in 4K page units. So each page is pointed to by > @@ -229,10 +230,13 @@ static void update_balloon_stats(struct virtio_balloon *vb) > unsigned long events[NR_VM_EVENT_ITEMS]; > struct sysinfo i; > int idx = 0; > + long available; > > all_vm_events(events); > si_meminfo(&i); > > + available = si_mem_available();...

...uilder-repository\n"; + machine_readable_printf "virt-builder-repository\n"; exit 0 ); diff --git a/common/mltools/tools_utils.ml b/common/mltools/tools_utils.ml index 920977e42..271e7d55f 100644 --- a/common/mltools/tools_utils.ml +++ b/common/mltools/tools_utils.ml @@ -229,10 +229,60 @@ let human_size i = ) ) +type machine_readable_output_type = + | NoOutput + | Channel of out_channel + | File of string +let machine_readable_output = ref NoOutput +let machine_readable_channel = ref None +let machine_readable_printf fs = + let get_machine_readable_channe...

...E_IS ("ubuntu")) distro = OS_DISTRO_UBUNTU; + else if (VALUE_IS ("void")) + distro = OS_DISTRO_VOID_LINUX; } else if (STRPREFIX (line, "PRETTY_NAME=")) { free (product_name); product_name = safe_strndup (g, value, value_len); @@ -229,10 +231,18 @@ parse_os_release (guestfs_h *g, struct inspect_fs *fs, const char *filename) } /* If we haven't got all the fields, exit right away. */ - if (distro == OS_DISTRO_UNKNOWN || product_name == NULL || - version.v_major == -1 || version.v_minor == -1) + if (distro == OS_...

...ed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c index 6094805fbd63..06b19883a06b 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c @@ -229,10 +229,8 @@ nvkm_outp_init_route(struct nvkm_outp *outp) return; ior = nvkm_ior_find(disp, type, -1); - if (!ior) { - WARN_ON(1); + if (WARN_ON(!ior)) return; - } /* Determine the specific OR, if any, this device is attached to. */ if (ior->func->route.get) { @@ -248,10 +246...

...alue xpathobjv) +v2v_xml_xpathobj_ptr_nr_nodes (value xpathobjv) { CAMLparam1 (xpathobjv); - xmlXPathObjectPtr xpathobj = Xpathobj_val (xpathobjv); + xmlXPathObjectPtr xpathobj = Xpathobj_ptr_val (xpathobjv); if (xpathobj->nodesetval == NULL) CAMLreturn (Val_int (0)); @@ -226,10 +229,10 @@ v2v_xml_xpathobj_nr_nodes (value xpathobjv) } value -v2v_xml_xpathobj_get_node_ptr (value xpathobjv, value iv) +v2v_xml_xpathobj_ptr_get_node_ptr (value xpathobjv, value iv) { CAMLparam2 (xpathobjv, iv); - xmlXPathObjectPtr xpathobj = Xpathobj_val (xpathobjv); + xmlXPathObjectPtr xp...

...alue xpathobjv) +v2v_xml_xpathobj_ptr_nr_nodes (value xpathobjv) { CAMLparam1 (xpathobjv); - xmlXPathObjectPtr xpathobj = Xpathobj_val (xpathobjv); + xmlXPathObjectPtr xpathobj = Xpathobj_ptr_val (xpathobjv); if (xpathobj->nodesetval == NULL) CAMLreturn (Val_int (0)); @@ -226,10 +229,10 @@ v2v_xml_xpathobj_nr_nodes (value xpathobjv) } value -v2v_xml_xpathobj_get_node_ptr (value xpathobjv, value iv) +v2v_xml_xpathobj_ptr_get_node_ptr (value xpathobjv, value iv) { CAMLparam2 (xpathobjv, iv); - xmlXPathObjectPtr xpathobj = Xpathobj_val (xpathobjv); + xmlXPathObjectPtr xp...

The following patches were made over Linus tree. The patches fix 3 issues: 1. If a user performs LIO LUN unmapping before the endpoint has been cleared then we can end up trying to free a bogus tmf struct if the TMF is still exucuting when we do the unmap. 2. If vhost_scsi_setup_vq_cmds fails we can leave the tpg->vhost_scsi pointer set and we can end up trying to access a freed struct. 3.

We should have only one NBD protocol file. Let's make nbdkit's version the canonical one, and use it in libnbd. Rich.