X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzfs_vfsops.c;h=8a82d9d4b226ecbe4514545b5f95145977a04cf0;hb=e30c0ada6d0174e044b96fbedf5946c3be66e956;hp=1e8e6af9ab06f55a670c4f0b40a0951d10630add;hpb=03f9ba9d990efb911026ebee0902671915db01a3;p=zfs.git

diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c
index 1e8e6af..8a82d9d 100644
--- a/module/zfs/zfs_vfsops.c
+++ b/module/zfs/zfs_vfsops.c
@@ -1088,7 +1088,7 @@ zfsvfs_teardown(zfs_sb_t *zsb, boolean_t unmounting)
 		 * for non-snapshots.
 		 */
 		shrink_dcache_sb(zsb->z_parent->z_sb);
-		invalidate_inodes(zsb->z_parent->z_sb);
+		(void) spl_invalidate_inodes(zsb->z_parent->z_sb, 0);
 	}
 
 	/*
@@ -1292,6 +1292,46 @@ zfs_umount(struct super_block *sb)
 EXPORT_SYMBOL(zfs_umount);
 
 int
+zfs_remount(struct super_block *sb, int *flags, char *data)
+{
+	zfs_sb_t *zsb = sb->s_fs_info;
+	boolean_t readonly = B_FALSE;
+	boolean_t setuid = B_TRUE;
+	boolean_t exec = B_TRUE;
+	boolean_t devices = B_TRUE;
+	boolean_t atime = B_TRUE;
+
+	if (*flags & MS_RDONLY)
+		readonly = B_TRUE;
+
+	if (*flags & MS_NOSUID) {
+		devices = B_FALSE;
+		setuid = B_FALSE;
+	} else {
+		if (*flags & MS_NODEV)
+			devices = B_FALSE;
+	}
+
+	if (*flags & MS_NOEXEC)
+		exec = B_FALSE;
+
+	if (*flags & MS_NOATIME)
+		atime = B_FALSE;
+
+	/*
+	 * Invoke our callbacks to set required flags.
+	 */
+	readonly_changed_cb(zsb, readonly);
+	setuid_changed_cb(zsb, setuid);
+	exec_changed_cb(zsb, exec);
+	devices_changed_cb(zsb, devices);
+	atime_changed_cb(zsb, atime);
+
+	return (0);
+}
+EXPORT_SYMBOL(zfs_remount);
+
+int
 zfs_vget(struct vfsmount *vfsp, struct inode **ipp, fid_t *fidp)
 {
 	zfs_sb_t	*zsb = VTOZSB(vfsp);