diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index c5162a27f1..6bd2f463f8 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-19      Chris Johns <chrisj@rtems.org>
+
+	* libfs/src/rfs/rtems-rfs-rtems-file.c: Add missing unlock in
+	write. Return the error code in close.
+
 2010-10-11      Chris Johns <chrisj@rtems.org>
 
 	* libfs/src/rfs/rtems-rfs-trace.c,
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c b/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c
index 0c918a9fb1..5be618d8c6 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c
+++ b/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c
@@ -100,7 +100,7 @@ rtems_rfs_rtems_file_close (rtems_libio_t* iop)
     rc = rtems_rfs_rtems_error ("file-close: file close", rc);
   
   rtems_rfs_rtems_unlock (fs);
-  return 0;
+  return rc;
 }
 
 /**
@@ -203,7 +203,10 @@ rtems_rfs_rtems_file_write (rtems_libio_t* iop,
   {
     rc = rtems_rfs_file_set_size (file, pos);
     if (rc)
+    {
+      rtems_rfs_rtems_unlock (rtems_rfs_file_fs (file));
       return rtems_rfs_rtems_error ("file-write: write extend", rc);
+    }
     rtems_rfs_file_set_bpos (file, pos);
   }