projects
/
linux-flexiantxendom0-3.2.10.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix.
[linux-flexiantxendom0-3.2.10.git]
/
fs
/
ocfs2
/
cluster
/
masklog.h
diff --git
a/fs/ocfs2/cluster/masklog.h
b/fs/ocfs2/cluster/masklog.h
index
a42628b
..
75cd877
100644
(file)
--- a/
fs/ocfs2/cluster/masklog.h
+++ b/
fs/ocfs2/cluster/masklog.h
@@
-278,7
+278,7
@@
extern struct mlog_bits mlog_and_bits, mlog_not_bits;
#include <linux/kobject.h>
#include <linux/sysfs.h>
-int mlog_sys_init(struct subsystem *o2cb_subsys);
+int mlog_sys_init(struct kset *o2cb_subsys);
void mlog_sys_shutdown(void);
#endif /* O2CLUSTER_MASKLOG_H */