projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs: Remove a whole lot of function wrappers and forward declarations
[yaffs2.git]
/
yaffs_yaffs1.c
diff --git
a/yaffs_yaffs1.c
b/yaffs_yaffs1.c
index b6c43e5ef3571c88c4e8a25b1698fa4efa372bee..4d10096374ef9f7ac42d9065defcceb0ffd78d67 100644
(file)
--- a/
yaffs_yaffs1.c
+++ b/
yaffs_yaffs1.c
@@
-86,7
+86,7
@@
int yaffs1_scan(struct yaffs_dev *dev)
for (blk = dev->internal_start_block;
!alloc_failed && blk <= dev->internal_end_block; blk++) {
for (blk = dev->internal_start_block;
!alloc_failed && blk <= dev->internal_end_block; blk++) {
-
YYIELD
();
+
cond_resched
();
bi = yaffs_get_block_info(dev, blk);
state = bi->block_state;
bi = yaffs_get_block_info(dev, blk);
state = bi->block_state;
@@
-217,9
+217,9
@@
int yaffs1_scan(struct yaffs_dev *dev)
struct yaffs_shadow_fixer *fixer;
fixer =
struct yaffs_shadow_fixer *fixer;
fixer =
-
YMALLOC
(sizeof
- (struct
-
yaffs_shadow_fixer)
);
+
kmalloc
(sizeof
+ (struct yaffs_shadow_fixer),
+
GFP_NOFS
);
if (fixer) {
fixer->next = shadow_fixers;
shadow_fixers = fixer;
if (fixer) {
fixer->next = shadow_fixers;
shadow_fixers = fixer;
@@
-422,7
+422,7
@@
int yaffs1_scan(struct yaffs_dev *dev)
if (obj)
yaffs_update_oh(obj, NULL, 1, 0, 0, NULL);
if (obj)
yaffs_update_oh(obj, NULL, 1, 0, 0, NULL);
-
YFREE
(fixer);
+
kfree
(fixer);
}
}
}
}