From 40e6642b6ef8651f7d30ddab4088b626b69879e9 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Thu, 16 Oct 2008 07:46:23 +0200
Subject: [PATCH] --- yaml --- r: 115487 b: refs/heads/master c:
 496aa8a98f5ab22ced46be5dc2087cdf3d029bd7 h: refs/heads/master i:   115485:
 31e88c3d755c4c9e5bed5ed98db4d21557c24152   115483:
 1a5239cc84f9653efb63175b0f28af5d1d11168d   115479:
 d213e5fbf4ef4c38f032d7d2c88829e160c3e85d   115471:
 64220a318c65406aa8dabff70b91cfe7bfdf8edb   115455:
 316cdde86a2dde08a9bbf0b1e6a22fd1df3ff736 v: v3

---
 [refs]                 | 2 +-
 trunk/block/blk-core.c | 5 +++--
 trunk/block/genhd.c    | 2 +-
 trunk/fs/block_dev.c   | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 51b614b248af..010d6cb683dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80a4b58e36b63d7b0b592beb1bd6410aadeeb63c
+refs/heads/master: 496aa8a98f5ab22ced46be5dc2087cdf3d029bd7
diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c
index 91532f2d2fa7..8517264eb71e 100644
--- a/trunk/block/blk-core.c
+++ b/trunk/block/blk-core.c
@@ -1018,8 +1018,9 @@ static void part_round_stats_single(int cpu, struct hd_struct *part,
 }
 
 /**
- * part_round_stats()	- Round off the performance stats on a struct
- * disk_stats.
+ * part_round_stats() - Round off the performance stats on a struct disk_stats.
+ * @cpu: cpu number for stats access
+ * @part: target partition
  *
  * The average IO queue length and utilisation statistics are maintained
  * by observing the current state of the queue length and the amount of
diff --git a/trunk/block/genhd.c b/trunk/block/genhd.c
index b8defae2ec03..646e1d2507c7 100644
--- a/trunk/block/genhd.c
+++ b/trunk/block/genhd.c
@@ -534,7 +534,7 @@ void unlink_gendisk(struct gendisk *disk)
 /**
  * get_gendisk - get partitioning information for a given device
  * @devt: device to get partitioning information for
- * @part: returned partition index
+ * @partno: returned partition index
  *
  * This function gets the structure containing partitioning
  * information for the given device @devt.
diff --git a/trunk/fs/block_dev.c b/trunk/fs/block_dev.c
index d84f0469a016..218408eed1bb 100644
--- a/trunk/fs/block_dev.c
+++ b/trunk/fs/block_dev.c
@@ -1262,7 +1262,7 @@ EXPORT_SYMBOL(ioctl_by_bdev);
 
 /**
  * lookup_bdev  - lookup a struct block_device by name
- * @pathname:	special file representing the block device
+ * @path:	special file representing the block device
  *
  * Get a reference to the blockdevice at @pathname in the current
  * namespace if possible and return it.  Return ERR_PTR(error)