projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MIPS: fix syntax for fdt_chosen/initrd.
[oweals/u-boot.git]
/
fs
/
ubifs
/
replay.c
diff --git
a/fs/ubifs/replay.c
b/fs/ubifs/replay.c
index 6393b15b1852d95300181248e114736030b9b2ac..1064cb29ba8828e0b0347d6665d1c0a9b897b368 100644
(file)
--- a/
fs/ubifs/replay.c
+++ b/
fs/ubifs/replay.c
@@
-21,7
+21,6
@@
* larger is the journal, the more memory its index may consume.
*/
* larger is the journal, the more memory its index may consume.
*/
-#define __UBOOT__
#ifdef __UBOOT__
#include <linux/compat.h>
#include <linux/err.h>
#ifdef __UBOOT__
#include <linux/compat.h>
#include <linux/err.h>
@@
-79,7
+78,6
@@
struct bud_entry {
int dirty;
};
int dirty;
};
-#ifndef __UBOOT__
/**
* set_bud_lprops - set free and dirty space used by a bud.
* @c: UBIFS file-system description object
/**
* set_bud_lprops - set free and dirty space used by a bud.
* @c: UBIFS file-system description object
@@
-433,7
+431,6
@@
static int insert_dent(struct ubifs_info *c, int lnum, int offs, int len,
list_add_tail(&r->list, &c->replay_list);
return 0;
}
list_add_tail(&r->list, &c->replay_list);
return 0;
}
-#endif
/**
* ubifs_validate_entry - validate directory or extended attribute entry node.
/**
* ubifs_validate_entry - validate directory or extended attribute entry node.
@@
-467,7
+464,6
@@
int ubifs_validate_entry(struct ubifs_info *c,
return 0;
}
return 0;
}
-#ifndef __UBOOT__
/**
* is_last_bud - check if the bud is the last in the journal head.
* @c: UBIFS file-system description object
/**
* is_last_bud - check if the bud is the last in the journal head.
* @c: UBIFS file-system description object
@@
-1064,4
+1060,3
@@
out:
c->replaying = 0;
return err;
}
c->replaying = 0;
return err;
}
-#endif