From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Aug 2020 16:40:34 +0000 (-0700)
Subject: Merge branch 'hch.init_path' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e1ec517e18acc0aa9795ff92c15f0adabcb12db9;p=linux.git

Merge branch 'hch.init_path' of git://git./linux/kernel/git/viro/vfs

Pull init and set_fs() cleanups from Al Viro:
 "Christoph's 'getting rid of ksys_...() uses under KERNEL_DS' series"

* 'hch.init_path' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (50 commits)
  init: add an init_dup helper
  init: add an init_utimes helper
  init: add an init_stat helper
  init: add an init_mknod helper
  init: add an init_mkdir helper
  init: add an init_symlink helper
  init: add an init_link helper
  init: add an init_eaccess helper
  init: add an init_chmod helper
  init: add an init_chown helper
  init: add an init_chroot helper
  init: add an init_chdir helper
  init: add an init_rmdir helper
  init: add an init_unlink helper
  init: add an init_umount helper
  init: add an init_mount helper
  init: mark create_dev as __init
  init: mark console_on_rootfs as __init
  init: initialize ramdisk_execute_command at compile time
  devtmpfs: refactor devtmpfsd()
  ...
---

e1ec517e18acc0aa9795ff92c15f0adabcb12db9
diff --cc drivers/md/md.c
index 153bc766bc5aa,ee622b67424e8..15bbdc1630ed5
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@@ -7877,21 -7790,23 +7861,21 @@@ static void md_release(struct gendisk *
  	mddev_put(mddev);
  }
  
 -static int md_media_changed(struct gendisk *disk)
 -{
 -	struct mddev *mddev = disk->private_data;
 -
 -	return mddev->changed;
 -}
 -
 -static int md_revalidate(struct gendisk *disk)
 +static unsigned int md_check_events(struct gendisk *disk, unsigned int clearing)
  {
  	struct mddev *mddev = disk->private_data;
 +	unsigned int ret = 0;
  
 +	if (mddev->changed)
 +		ret = DISK_EVENT_MEDIA_CHANGE;
  	mddev->changed = 0;
 -	return 0;
 +	return ret;
  }
 +
- static const struct block_device_operations md_fops =
+ const struct block_device_operations md_fops =
  {
  	.owner		= THIS_MODULE,
 +	.submit_bio	= md_submit_bio,
  	.open		= md_open,
  	.release	= md_release,
  	.ioctl		= md_ioctl,