Merge tag 'md-3.8' of git://neil.brown.name/md

[android-sdk/kernel-video.git] / drivers / md / md.c

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 30ba223e5ed0726048801d1af65371e237cd9c60..3db3d1b271f7ef18650a227a8dd07dbc2b8fefbc 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -452,7 +452,7 @@ void md_flush_request(struct mddev *mddev, struct bio *bio)
        spin_lock_irq(&mddev->write_lock);
        wait_event_lock_irq(mddev->sb_wait,
                            !mddev->flush_bio,
-                           mddev->write_lock, /*nothing*/);
+                           mddev->write_lock);
        mddev->flush_bio = bio;
        spin_unlock_irq(&mddev->write_lock);
 
@@ -4123,7 +4123,7 @@ static struct md_sysfs_entry md_size =
 __ATTR(component_size, S_IRUGO|S_IWUSR, size_show, size_store);
 
 
-/* Metdata version.
+/* Metadata version.
  * This is one of
  *   'none' for arrays with no metadata (good luck...)
  *   'external' for arrays with externally managed metadata,