git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
fs
/
jffs
/
jffs_fm.h
diff --git
a/fs/jffs/jffs_fm.h
b/fs/jffs/jffs_fm.h
index
bc291c4
..
c794d92
100644
(file)
--- a/
fs/jffs/jffs_fm.h
+++ b/
fs/jffs/jffs_fm.h
@@
-20,10
+20,11
@@
#ifndef __LINUX_JFFS_FM_H__
#define __LINUX_JFFS_FM_H__
#ifndef __LINUX_JFFS_FM_H__
#define __LINUX_JFFS_FM_H__
+#include <linux/config.h>
#include <linux/types.h>
#include <linux/jffs.h>
#include <linux/mtd/mtd.h>
#include <linux/types.h>
#include <linux/jffs.h>
#include <linux/mtd/mtd.h>
-#include <linux/
config
.h>
+#include <linux/
mutex
.h>
/* The alignment between two nodes in the flash memory. */
#define JFFS_ALIGN_SIZE 4
/* The alignment between two nodes in the flash memory. */
#define JFFS_ALIGN_SIZE 4
@@
-97,7
+98,7
@@
struct jffs_fmcontrol
struct jffs_fm *tail;
struct jffs_fm *head_extra;
struct jffs_fm *tail_extra;
struct jffs_fm *tail;
struct jffs_fm *head_extra;
struct jffs_fm *tail_extra;
- struct
semaphore
biglock;
+ struct
mutex
biglock;
};
/* Notice the two members head_extra and tail_extra in the jffs_control
};
/* Notice the two members head_extra and tail_extra in the jffs_control
@@
-139,8
+140,9
@@
int jffs_add_node(struct jffs_node *node);
void jffs_fmfree_partly(struct jffs_fmcontrol *fmc, struct jffs_fm *fm,
__u32 size);
void jffs_fmfree_partly(struct jffs_fmcontrol *fmc, struct jffs_fm *fm,
__u32 size);
+#if CONFIG_JFFS_FS_VERBOSE > 0
void jffs_print_fmcontrol(struct jffs_fmcontrol *fmc);
void jffs_print_fmcontrol(struct jffs_fmcontrol *fmc);
-void jffs_print_fm(struct jffs_fm *fm);
+#endif
#if 0
void jffs_print_node_ref(struct jffs_node_ref *ref);
#endif /* 0 */
#if 0
void jffs_print_node_ref(struct jffs_node_ref *ref);
#endif /* 0 */