From 0c6538c7c952deae04e2fabcb51bf2e6586a4486 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>
Date: Wed, 18 Nov 2009 17:31:04 +0000
Subject: [PATCH] Fix error in mount() error handling

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@2271 7fd9a85b-ad96-42d3-883c-3090e2eb8679
---
 nuttx/ChangeLog                | 7 +++++++
 nuttx/Documentation/NuttX.html | 8 +++++++-
 nuttx/fs/fs_mount.c            | 8 +++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index d60492160..6dc90caaa 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -964,4 +964,11 @@
 	  NOTE: On initial check-in, mmcsd_sdio.c and stm32_sdio.c are merely
 	  skeleton frameworks for the driver.
 
+	* fs/fs_mount.c -- Correct error handling logic.  If the bind() method
+	  fails, then a reserved node is left in the tree.  This causes subsequent
+	  attempts to mount at the location to fail (reporting that the node
+	  already exists).  This is a probably for block drivers for removable
+	  media: The bind method could fail repeatedly until media is asserted.
+
+
 
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index d14a755ce..28fe87dde 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -8,7 +8,7 @@
   <tr align="center" bgcolor="#e4e4e4">
     <td>
       <h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
-      <p>Last Updated: November 11, 2009</p>
+      <p>Last Updated: November 18, 2009</p>
     </td>
   </tr>
 </table>
@@ -1612,6 +1612,12 @@ nuttx-0.4.14 2009-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 	  NOTE: On initial check-in, mmcsd_sdio.c and stm32_sdio.c are merely
 	  skeleton frameworks for the driver.
 
+	* fs/fs_mount.c -- Correct error handling logic.  If the bind() method
+	  fails, then a reserved node is left in the tree.  This causes subsequent
+	  attempts to mount at the location to fail (reporting that the node
+	  already exists).  This is a probably for block drivers for removable
+	  media: The bind method could fail repeatedly until media is asserted.
+
 pascal-0.1.3 2009-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 
 buildroot-0.1.8 2009-xx-xx &lt;spudmonkey@racsa.co.cr&gt;
diff --git a/nuttx/fs/fs_mount.c b/nuttx/fs/fs_mount.c
index 22af7a136..9dcc21238 100644
--- a/nuttx/fs/fs_mount.c
+++ b/nuttx/fs/fs_mount.c
@@ -227,9 +227,13 @@ int mount(const char *source, const char *target,
   status = mops->bind(blkdrvr_inode, data, &fshandle);
   if (status != 0)
   {
-      /* The inode is unhappy with the blkdrvr for some reason */
+      /* The inode is unhappy with the blkdrvr for some reason.  Back out
+       * the count for the reference we failed to pass and exit with an
+       * error.
+       */
 
       fdbg("Bind method failed: %d\n", status);
+      blkdrvr_inode->i_crefs--;
       errcode = -status;
       goto errout_with_mountpt;
   }
@@ -257,6 +261,8 @@ int mount(const char *source, const char *target,
   /* A lot of goto's!  But they make the error handling much simpler */
 
 errout_with_mountpt:
+  mountpt_inode->i_crefs = 0;
+  inode_remove(target);
   inode_semgive();
   inode_release(blkdrvr_inode);
   inode_release(mountpt_inode);