Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6] / include / linux / jffs2_fs_i.h

diff --git a/include/linux/jffs2_fs_i.h b/include/linux/jffs2_fs_i.h
index a5db884ec607a2626982a6d791ec9e72c5dfa23d..ad565bf9dcc15cf679f27965d0239bfceb6c4ff1 100644 (file)
--- a/include/linux/jffs2_fs_i.h
+++ b/include/linux/jffs2_fs_i.h
@@ -1,4 +1,4 @@
-/* $Id: jffs2_fs_i.h,v 1.18 2005/07/17 11:13:48 dedekind Exp $ */
+/* $Id: jffs2_fs_i.h,v 1.19 2005/11/07 11:14:52 gleixner Exp $ */
 
 #ifndef _JFFS2_FS_I
 #define _JFFS2_FS_I
@@ -8,11 +8,11 @@
 #include <asm/semaphore.h>
 
 struct jffs2_inode_info {
-       /* We need an internal semaphore similar to inode->i_sem.
+       /* We need an internal mutex similar to inode->i_mutex.
           Unfortunately, we can't used the existing one, because
           either the GC would deadlock, or we'd have to release it
           before letting GC proceed. Or we'd have to put ugliness
-          into the GC code so it didn't attempt to obtain the i_sem
+          into the GC code so it didn't attempt to obtain the i_mutex
           for the inode(s) which are already locked */
        struct semaphore sem;
 
@@ -25,7 +25,7 @@ struct jffs2_inode_info {
        /* There may be one datanode which isn't referenced by any of the
           above fragments, if it contains a metadata update but no actual
           data - or if this is a directory inode */
-       /* This also holds the _only_ dnode for symlinks/device nodes, 
+       /* This also holds the _only_ dnode for symlinks/device nodes,
           etc. */
        struct jffs2_full_dnode *metadata;