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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
include
/
linux
/
reiserfs_fs_sb.h
diff --git
a/include/linux/reiserfs_fs_sb.h
b/include/linux/reiserfs_fs_sb.h
index
62a7169
..
3a28742
100644
(file)
--- a/
include/linux/reiserfs_fs_sb.h
+++ b/
include/linux/reiserfs_fs_sb.h
@@
-249,7
+249,8
@@
struct reiserfs_journal {
int j_errno;
/* when flushing ordered buffers, throttle new ordered writers */
- struct work_struct j_work;
+ struct delayed_work j_work;
+ struct super_block *j_work_sb;
atomic_t j_async_throttle;
};