X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzfs_dir.c;h=8f1a0c2cc8f1f229829be5c7509854afd250bf62;hb=aec69371a6a2e94534809c5e9ba22e7b0e276937;hp=0df7cc1f83d8cbdcc265fbf1d8a20a722bc7a860;hpb=b00131d43ca344d4b205a03ab3eb771a060e5087;p=zfs.git

diff --git a/module/zfs/zfs_dir.c b/module/zfs/zfs_dir.c
index 0df7cc1..8f1a0c2 100644
--- a/module/zfs/zfs_dir.c
+++ b/module/zfs/zfs_dir.c
@@ -64,11 +64,11 @@ static int
 zfs_match_find(zfs_sb_t *zsb, znode_t *dzp, char *name, boolean_t exact,
     boolean_t update, int *deflags, pathname_t *rpnp, uint64_t *zoid)
 {
+	boolean_t conflict = B_FALSE;
 	int error;
 
 	if (zsb->z_norm) {
 		matchtype_t mt = MT_FIRST;
-		boolean_t conflict = B_FALSE;
 		size_t bufsz = 0;
 		char *buf = NULL;
 
@@ -84,11 +84,23 @@ zfs_match_find(zfs_sb_t *zsb, znode_t *dzp, char *name, boolean_t exact,
 		 */
 		error = zap_lookup_norm(zsb->z_os, dzp->z_id, name, 8, 1,
 		    zoid, mt, buf, bufsz, &conflict);
-		if (!error && deflags)
-			*deflags = conflict ? ED_CASE_CONFLICT : 0;
 	} else {
 		error = zap_lookup(zsb->z_os, dzp->z_id, name, 8, 1, zoid);
 	}
+
+	/*
+	 * Allow multiple entries provided the first entry is
+	 * the object id.  Non-zpl consumers may safely make
+	 * use of the additional space.
+	 *
+	 * XXX: This should be a feature flag for compatibility
+	 */
+	if (error == EOVERFLOW)
+		error = 0;
+
+	if (zsb->z_norm && !error && deflags)
+		*deflags = conflict ? ED_CASE_CONFLICT : 0;
+
 	*zoid = ZFS_DIRENT_OBJ(*zoid);
 
 #ifdef HAVE_DNLC
@@ -1045,7 +1057,7 @@ top:
 		return (ENOENT);
 	}
 
-	if (zsb->z_vfs->mnt_flags & MNT_READONLY) {
+	if (zfs_is_readonly(zsb)) {
 		zfs_dirent_unlock(dl);
 		return (EROFS);
 	}