Merge tag 'net-next-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev...

[platform/kernel/linux-starfive.git] / drivers / block / drbd / drbd_main.c

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index ea82d67..79ab532 100644 (file)
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -37,7 +37,6 @@
 #include <linux/notifier.h>
 #include <linux/kthread.h>
 #include <linux/workqueue.h>
-#define __KERNEL_SYSCALLS__
 #include <linux/unistd.h>
 #include <linux/vmalloc.h>
 #include <linux/sched/signal.h>
@@ -50,8 +49,8 @@
 #include "drbd_debugfs.h"
 
 static DEFINE_MUTEX(drbd_main_mutex);
-static int drbd_open(struct block_device *bdev, fmode_t mode);
-static void drbd_release(struct gendisk *gd, fmode_t mode);
+static int drbd_open(struct gendisk *disk, blk_mode_t mode);
+static void drbd_release(struct gendisk *gd);
 static void md_sync_timer_fn(struct timer_list *t);
 static int w_bitmap_io(struct drbd_work *w, int unused);
 
@@ -1887,9 +1886,9 @@ int drbd_send_all(struct drbd_connection *connection, struct socket *sock, void
        return 0;
 }
 
-static int drbd_open(struct block_device *bdev, fmode_t mode)
+static int drbd_open(struct gendisk *disk, blk_mode_t mode)
 {
-       struct drbd_device *device = bdev->bd_disk->private_data;
+       struct drbd_device *device = disk->private_data;
        unsigned long flags;
        int rv = 0;
 
@@ -1899,7 +1898,7 @@ static int drbd_open(struct block_device *bdev, fmode_t mode)
         * and no race with updating open_cnt */
 
        if (device->state.role != R_PRIMARY) {
-               if (mode & FMODE_WRITE)
+               if (mode & BLK_OPEN_WRITE)
                        rv = -EROFS;
                else if (!drbd_allow_oos)
                        rv = -EMEDIUMTYPE;
@@ -1913,9 +1912,10 @@ static int drbd_open(struct block_device *bdev, fmode_t mode)
        return rv;
 }
 
-static void drbd_release(struct gendisk *gd, fmode_t mode)
+static void drbd_release(struct gendisk *gd)
 {
        struct drbd_device *device = gd->private_data;
+
        mutex_lock(&drbd_main_mutex);
        device->open_cnt--;
        mutex_unlock(&drbd_main_mutex);