[PATCH] md: fix return code in set_disk_faulty()

From: NeilBrown <neilb@cse.unsw.edu.au>

 Following are 10 patches for md in 2.6.1-lastest.

 1-6 are simple bugfixes that I am confident should be in 2.6.2.

 7 is a bugfix that is fairly important, but could probably do with a
 bit more testing first.  It is not impossible that it could deadlock,
 though I think I have caught and fixed all the problems.

 8-10 are code simplication.

 So maybe 7-10 should only go in -mm for now, but if it is a while
 before 2.6.2, then maybe they can go in a 2.6.2-pre.

From: Mike Tran <mhtran@us.ibm.com>

 If cannot find the device, return error (ENODEV) Otherwise, return success
 (0)

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 67253852346a27a2b5b84ad36e8f17f410827170..ba0562e6e2e958458a701ef287236810356d341a 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -2356,10 +2356,10 @@ static int set_disk_faulty(mddev_t *mddev, dev_t dev)
 
        rdev = find_rdev(mddev, dev);
        if (!rdev)
-               return 0;
+               return -ENODEV;
 
        md_error(mddev, rdev);
-       return 1;
+       return 0;
 }
 
 static int md_ioctl(struct inode *inode, struct file *file,