diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 8e4407120cbc6556e66959d0549a33b578424f5b..c5bf5ab19bb91f07977dce98a49f3ef490b99deb 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3016,9 +3016,6 @@ static int ext4_da_write_begin(struct file *file, struct address_space *mapping,
 	if (!page)
 		return -ENOMEM;
 
-	/* In case writeback began while the page was unlocked */
-	wait_for_stable_page(page);
-
 #ifdef CONFIG_FS_ENCRYPTION
 	ret = ext4_block_write_begin(page, pos, len,
 				     ext4_da_get_block_prep);
diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c
index d60c086c6e9c7286a415aeee9adf150debe25384..327b9aaba4eaa245a5167aaf8e1bb6dee6f0ef84 100644
--- a/fs/nfs/fs_context.c
+++ b/fs/nfs/fs_context.c
@@ -962,9 +962,12 @@ static int nfs23_parse_monolithic(struct fs_context *fc,
 		ctx->acdirmax	= data->acdirmax;
 		ctx->need_mount	= false;
 
-		memcpy(sap, &data->addr, sizeof(data->addr));
-		ctx->nfs_server.addrlen = sizeof(data->addr);
-		ctx->nfs_server.port = ntohs(data->addr.sin_port);
+		if (!is_remount_fc(fc)) {
+			memcpy(sap, &data->addr, sizeof(data->addr));
+			ctx->nfs_server.addrlen = sizeof(data->addr);
+			ctx->nfs_server.port = ntohs(data->addr.sin_port);
+		}
+
 		if (sap->sa_family != AF_INET ||
 		    !nfs_verify_server_address(sap))
 			goto out_no_address;