change log for rtems (2010-10-18)

[rtems-vc at rtems.org]

 *ccj* (on branch rtems-4-10-branch):
2010-10-19      Chris Johns <chrisj at rtems.org>

        * libfs/src/rfs/rtems-rfs-rtems-file.c: Add missing unlock in
        write. Return the error code in close.

M 1.2635  cpukit/ChangeLog
M 1.2346.2.71  cpukit/ChangeLog
M    1.9  cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c
M 1.4.2.2  cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c

diff -u rtems/cpukit/ChangeLog:1.2634 rtems/cpukit/ChangeLog:1.2635
--- rtems/cpukit/ChangeLog:1.2634	Sun Oct 10 23:34:48 2010
+++ rtems/cpukit/ChangeLog	Mon Oct 18 17:39:32 2010
@@ -1,3 +1,8 @@
+2010-10-19	Chris Johns <chrisj at 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 at rtems.org>
 
 	* libfs/src/rfs/rtems-rfs-trace.c,

diff -u rtems/cpukit/ChangeLog:1.2346.2.70 rtems/cpukit/ChangeLog:1.2346.2.71
--- rtems/cpukit/ChangeLog:1.2346.2.70	Sun Oct 10 23:40:07 2010
+++ rtems/cpukit/ChangeLog	Mon Oct 18 17:48:54 2010
@@ -1,3 +1,8 @@
+2010-10-19      Chris Johns <chrisj at 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 at rtems.org>
 
 	* libfs/src/rfs/rtems-rfs-trace.c,

diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c:1.8 rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c:1.9
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c:1.8	Wed Aug 25 04:37:49 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c	Mon Oct 18 17:39:35 2010
@@ -100,7 +100,7 @@
     rc = rtems_rfs_rtems_error ("file-close: file close", rc);
   
   rtems_rfs_rtems_unlock (fs);
-  return 0;
+  return rc;
 }
 
 /**
@@ -203,7 +203,10 @@
   {
     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);
   }
   

diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c:1.4.2.1 rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c:1.4.2.2
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c:1.4.2.1	Wed Jun 16 22:35:30 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c	Mon Oct 18 17:48:55 2010
@@ -100,7 +100,7 @@
     rc = rtems_rfs_rtems_error ("file-close: file close", rc);
   
   rtems_rfs_rtems_unlock (fs);
-  return 0;
+  return rc;
 }
 
 /**
@@ -203,7 +203,10 @@
   {
     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);
   }
   



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20101018/f47360f1/attachment.html>