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
Merge to Fedora kernel-2.6.7-1.492
[linux-2.6.git]
/
fs
/
jffs2
/
write.c
diff --git
a/fs/jffs2/write.c
b/fs/jffs2/write.c
index
f28d9d5
..
11c7610
100644
(file)
--- a/
fs/jffs2/write.c
+++ b/
fs/jffs2/write.c
@@
-92,7
+92,7
@@
struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2
struct jffs2_raw_node_ref *raw;
struct jffs2_full_dnode *fn;
size_t retlen;
struct jffs2_raw_node_ref *raw;
struct jffs2_full_dnode *fn;
size_t retlen;
- struct
io
vec vecs[2];
+ struct
k
vec vecs[2];
int ret;
int retried = 0;
unsigned long cnt = 2;
int ret;
int retried = 0;
unsigned long cnt = 2;
@@
-233,7
+233,7
@@
struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jff
struct jffs2_raw_node_ref *raw;
struct jffs2_full_dirent *fd;
size_t retlen;
struct jffs2_raw_node_ref *raw;
struct jffs2_full_dirent *fd;
size_t retlen;
- struct
io
vec vecs[2];
+ struct
k
vec vecs[2];
int retried = 0;
int ret;
int retried = 0;
int ret;