git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/hda-samsung-p50' into topic/hda
[pandora-kernel.git]
/
fs
/
ocfs2
/
journal.h
diff --git
a/fs/ocfs2/journal.h
b/fs/ocfs2/journal.h
index
61045ee
..
5432c7f
100644
(file)
--- a/
fs/ocfs2/journal.h
+++ b/
fs/ocfs2/journal.h
@@
-144,7
+144,7
@@
static inline void ocfs2_inode_set_new(struct ocfs2_super *osb,
}
/* Exported only for the journal struct init code in super.c. Do not call. */
}
/* Exported only for the journal struct init code in super.c. Do not call. */
-
int
ocfs2_orphan_scan_init(struct ocfs2_super *osb);
+
void
ocfs2_orphan_scan_init(struct ocfs2_super *osb);
void ocfs2_orphan_scan_stop(struct ocfs2_super *osb);
void ocfs2_orphan_scan_exit(struct ocfs2_super *osb);
void ocfs2_orphan_scan_stop(struct ocfs2_super *osb);
void ocfs2_orphan_scan_exit(struct ocfs2_super *osb);