---

yaml
---
r: 251225
b: refs/heads/master
c: 3c64b58
h: refs/heads/master
i:
  251223: 26ce5b0
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5489377ce40d52fb722dcd811617114cebad7bba
+refs/heads/master: 3c64b58cd614c976dcb19e16fa59ab620b3fe130

trunk/drivers/xen/blkback/vbd.c

@@ -30,8 +30,9 @@
 
 #include "common.h"
 
-#define vbd_sz(_v)   ((_v)->bdev->bd_part ?				\
-		      (_v)->bdev->bd_part->nr_sects : get_capacity((_v)->bdev->bd_disk))
+#define vbd_sz(_v)	((_v)->bdev->bd_part ? \
+			 (_v)->bdev->bd_part->nr_sects : \
+			  get_capacity((_v)->bdev->bd_disk))
 
 unsigned long long vbd_size(struct vbd *vbd)
 {
@@ -40,7 +41,7 @@ unsigned long long vbd_size(struct vbd *vbd)
 
 unsigned int vbd_info(struct vbd *vbd)
 {
-	return vbd->type | (vbd->readonly?VDISK_READONLY:0);
+	return vbd->type | (vbd->readonly ? VDISK_READONLY : 0);
 }
 
 unsigned long vbd_secsize(struct vbd *vbd)
@@ -126,15 +127,15 @@ void vbd_resize(struct blkif_st *blkif)
 
 	printk(KERN_INFO "VBD Resize: Domid: %d, Device: (%d, %d)\n",
 		blkif->domid, MAJOR(vbd->pdevice), MINOR(vbd->pdevice));
-	printk(KERN_INFO "VBD Resize: new size %Lu\n", new_size);
+	printk(KERN_INFO "VBD Resize: new size %llu\n", new_size);
 	vbd->size = new_size;
 again:
 	err = xenbus_transaction_start(&xbt);
 	if (err) {
 		printk(KERN_WARNING "Error starting transaction");
 		return;
 	}
-	err = xenbus_printf(xbt, dev->nodename, "sectors", "%Lu",
+	err = xenbus_printf(xbt, dev->nodename, "sectors", "%llu",
 			    vbd_size(vbd));
 	if (err) {
 		printk(KERN_WARNING "Error writing new size");