Thu Jul 18 09:01:20 2013 UTC ()

One more explicit error log, and two bug fixes
1) with recent FUSE, when lookup returns a null ino, it means ENOENT
2) odd corner case that caused a bug on dd if=test of=test conv=notrunc
   This caused the file to be open first ro, then rw. A logic bug in
   perfuse_node_open caused it to skip the second operation, whereas
   it should open for writing, and store the write FH without touching
   the read FH.


(manu)

diff -r1.60 -r1.61 src/lib/libperfuse/ops.c

--- src/lib/libperfuse/ops.c 2012/11/03 15:43:20	1.60
+++ src/lib/libperfuse/ops.c 2013/07/18 09:01:20	1.61

 @@ -1,14 +1,14 @@
-/*  $NetBSD: ops.c,v 1.60 2012/11/03 15:43:20 manu Exp $ */
+/*  $NetBSD: ops.c,v 1.61 2013/07/18 09:01:20 manu Exp $ */
 /*-
  *  Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
+ *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
  *  are met:
  *  1. Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
+ *
 @@ -1359,30 +1359,49 @@ perfuse_node_open(struct puffs_usermount
 	 * - O_TRUNC may be used if mount option atomic_o_trunc is used XXX
+	 *
 	 * O_APPEND makes no sense since FUSE always sends
 	 * the file offset for write operations. If the
 	 * filesystem uses pwrite(), O_APPEND would cause
 	 * the offset to be ignored and cause file corruption.
 	 */
 	mode &= ~(O_CREAT|O_EXCL|O_APPEND);
 	/*
 	 * Do not open twice, and do not reopen for reading
 	 * if we already have write handle.
 	 */
-	if (((mode & FREAD) && (pnd->pnd_flags & PND_RFH)) ||
+	switch (mode & (FREAD|FWRITE)) {
-	    ((mode & FREAD) && (pnd->pnd_flags & PND_WFH)) ||
+	case FREAD:
-	    ((mode & FWRITE) && (pnd->pnd_flags & PND_WFH)))
+		if (pnd->pnd_flags & (PND_RFH|PND_WFH))
-		goto out;
+			goto out;
 		break;
 	case FWRITE:
 		if (pnd->pnd_flags & PND_WFH)
 			goto out;
 		break;
 	case FREAD|FWRITE:
 		if (pnd->pnd_flags & PND_WFH)
 			goto out;
 		/*
 		 * Corner case: if already open for reading (PND_RFH)
 		 * and re-opening FREAD|FWRITE, we need to reopen,
 		 * but only for writing. Note the change on mode
 		 * will only affect perfuse_new_fh()
 		 */
 		if (pnd->pnd_flags & PND_RFH)
 			mode &= ~FREAD;
 		break;
+	}
 	/*
 	 * Queue open on a node so that we do not open
 	 * twice. This would be better with read and
 	 * write distinguished.
 	 */
 	while (pnd->pnd_flags & PND_INOPEN)
 		requeue_request(pu, opc, PCQ_OPEN);
 	pnd->pnd_flags |= PND_INOPEN;
 	/*
 	 * Convert PUFFS mode to FUSE mode: convert FREAD/FWRITE
 	 * to O_RDONLY/O_WRONLY while perserving the other options.
 @@ -2713,28 +2732,28 @@ perfuse_node_reclaim(struct puffs_usermo
 	 * reclaim cancel?
 	 */
 	if (pnd->pnd_puffs_nlookup > nlookup) {
 		pnd->pnd_flags &= ~PND_RECLAIMED;
 		perfuse_node_cache(ps, opc);
 		node_rele(opc);
 		return 0;
+	}
 #ifdef PERFUSE_DEBUG
 	if ((pnd->pnd_flags & PND_OPEN) ||
 	       !TAILQ_EMPTY(&pnd->pnd_pcq))
-		DERRX(EX_SOFTWARE, "%s: opc = %p: still open",
+		DERRX(EX_SOFTWARE, "%s: opc = %p \"%s\": still open",
-		      __func__, opc);
+		      __func__, opc, pnd->pnd_name);
 	if ((pnd->pnd_flags & PND_BUSY) ||
 	       !TAILQ_EMPTY(&pnd->pnd_pcq))
 		DERRX(EX_SOFTWARE, "%s: opc = %p: queued operations",
 		      __func__, opc);
 	if (pnd->pnd_inxchg != 0)
 		DERRX(EX_SOFTWARE, "%s: opc = %p: ongoing operations",
 		      __func__, opc);
 #endif
 	/*
 	 * Send the FORGET message