diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 001f9cb..0f9ea73 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2501,7 +2501,8 @@
 	 * so ourselves when necessary.
 	 */
 	sb->s_flags  |= MS_POSIXACL;
- 	nfs_initialise_sb(sb);
+	sb->s_xattr  = old_sb->s_xattr;
+	nfs_initialise_sb(sb);
 }
 
 /*
@@ -2516,6 +2517,7 @@
 	 * so ourselves when necessary.
 	 */
 	sb->s_flags  |= MS_POSIXACL;
+	sb->s_xattr = nfs4_xattr_handlers;
 	nfs_initialise_sb(sb);
 }