Merge tag 'kgdb-fixes-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danie...

[linux.git] / arch / um / drivers / ubd_kern.c

diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 6627d7c30f3700954ca655527b3490dbf28dacde..247f95da057b598399ce9170c83f45db5070a2f6 100644 (file)
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -113,6 +113,7 @@ static const struct block_device_operations ubd_blops = {
         .open          = ubd_open,
         .release       = ubd_release,
         .ioctl         = ubd_ioctl,
+        .compat_ioctl  = blkdev_compat_ptr_ioctl,
        .getgeo         = ubd_getgeo,
 };
 
@@ -561,7 +562,7 @@ static inline int ubd_file_size(struct ubd *ubd_dev, __u64 *size_out)
        __u32 version;
        __u32 align;
        char *backing_file;
-       time_t mtime;
+       time64_t mtime;
        unsigned long long size;
        int sector_size;
        int bitmap_offset;
@@ -600,9 +601,9 @@ static int read_cow_bitmap(int fd, void *buf, int offset, int len)
        return 0;
 }
 
-static int backing_file_mismatch(char *file, __u64 size, time_t mtime)
+static int backing_file_mismatch(char *file, __u64 size, time64_t mtime)
 {
-       unsigned long modtime;
+       time64_t modtime;
        unsigned long long actual;
        int err;
 
@@ -628,7 +629,7 @@ static int backing_file_mismatch(char *file, __u64 size, time_t mtime)
                return -EINVAL;
        }
        if (modtime != mtime) {
-               printk(KERN_ERR "mtime mismatch (%ld vs %ld) of COW header vs "
+               printk(KERN_ERR "mtime mismatch (%lld vs %lld) of COW header vs "
                       "backing file\n", mtime, modtime);
                return -EINVAL;
        }
@@ -671,7 +672,7 @@ static int open_ubd_file(char *file, struct openflags *openflags, int shared,
                  unsigned long *bitmap_len_out, int *data_offset_out,
                  int *create_cow_out)
 {
-       time_t mtime;
+       time64_t mtime;
        unsigned long long size;
        __u32 version, align;
        char *backing_file;