3 files changed, 16 insertions, 35 deletions

diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 4195a01b1535..9a8e66ae04f5 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -1988,7 +1988,6 @@ location_store(struct mddev *mddev, const char *buf, size_t len)
                 if (mddev->bitmap_info.file) {
                         struct file *f = mddev->bitmap_info.file;
                         mddev->bitmap_info.file = NULL;
-                        restore_bitmap_write_access(f);
                         fput(f);
                 }
         } else {
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 4ad5cc4e63e8..3fa2fc0a5dd2 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5181,32 +5181,6 @@ static int restart_array(struct mddev *mddev)
         return 0;
 }
 
-/* similar to deny_write_access, but accounts for our holding a reference
- * to the file ourselves */
-static int deny_bitmap_write_access(struct file * file)
-{
-        struct inode *inode = file->f_mapping->host;
-
-        spin_lock(&inode->i_lock);
-        if (atomic_read(&inode->i_writecount) > 1) {
-                spin_unlock(&inode->i_lock);
-                return -ETXTBSY;
-        }
-        atomic_set(&inode->i_writecount, -1);
-        spin_unlock(&inode->i_lock);
-
-        return 0;
-}
-
-void restore_bitmap_write_access(struct file *file)
-{
-        struct inode *inode = file->f_mapping->host;
-
-        spin_lock(&inode->i_lock);
-        atomic_set(&inode->i_writecount, 1);
-        spin_unlock(&inode->i_lock);
-}
-
 static void md_clean(struct mddev *mddev)
 {
         mddev->array_sectors = 0;
@@ -5427,7 +5401,6 @@ static int do_md_stop(struct mddev * mddev, int mode,
 
                 bitmap_destroy(mddev);
                 if (mddev->bitmap_info.file) {
-                        restore_bitmap_write_access(mddev->bitmap_info.file);
                         fput(mddev->bitmap_info.file);
                         mddev->bitmap_info.file = NULL;
                 }
@@ -5979,7 +5952,7 @@ abort_export:
 
 static int set_bitmap_file(struct mddev *mddev, int fd)
 {
-        int err;
+        int err = 0;
 
         if (mddev->pers) {
                 if (!mddev->pers->quiesce)
@@ -5991,6 +5964,7 @@ static int set_bitmap_file(struct mddev *mddev, int fd)
 
 
         if (fd >= 0) {
+                struct inode *inode;
                 if (mddev->bitmap)
                         return -EEXIST; /* cannot add when bitmap is present */
                 mddev->bitmap_info.file = fget(fd);
@@ -6001,10 +5975,21 @@ static int set_bitmap_file(struct mddev *mddev, int fd)
                         return -EBADF;
                 }
 
-                err = deny_bitmap_write_access(mddev->bitmap_info.file);
-                if (err) {
+                inode = mddev->bitmap_info.file->f_mapping->host;
+                if (!S_ISREG(inode->i_mode)) {
+                        printk(KERN_ERR "%s: error: bitmap file must be a regular file\n",
+                               mdname(mddev));
+                        err = -EBADF;
+                } else if (!(mddev->bitmap_info.file->f_mode & FMODE_WRITE)) {
+                        printk(KERN_ERR "%s: error: bitmap file must open for write\n",
+                               mdname(mddev));
+                        err = -EBADF;
+                } else if (atomic_read(&inode->i_writecount) != 1) {
                         printk(KERN_ERR "%s: error: bitmap file is already in use\n",
                                mdname(mddev));
+                        err = -EBUSY;
+                }
+                if (err) {
                         fput(mddev->bitmap_info.file);
                         mddev->bitmap_info.file = NULL;
                         return err;
@@ -6027,10 +6012,8 @@ static int set_bitmap_file(struct mddev *mddev, int fd)
                 mddev->pers->quiesce(mddev, 0);
         }
         if (fd < 0) {
-                if (mddev->bitmap_info.file) {
-                        restore_bitmap_write_access(mddev->bitmap_info.file);
+                if (mddev->bitmap_info.file)
                         fput(mddev->bitmap_info.file);
-                }
                 mddev->bitmap_info.file = NULL;
         }
 
diff --git a/drivers/md/md.h b/drivers/md/md.h
index 07bba96de260..a49d991f3fe1 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -605,7 +605,6 @@ extern int md_check_no_bitmap(struct mddev *mddev);
 extern int md_integrity_register(struct mddev *mddev);
 extern void md_integrity_add_rdev(struct md_rdev *rdev, struct mddev *mddev);
 extern int strict_strtoul_scaled(const char *cp, unsigned long *res, int scale);
-extern void restore_bitmap_write_access(struct file *file);
 
 extern void mddev_init(struct mddev *mddev);
 extern int md_run(struct mddev *mddev);