diff options
| author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-09-22 19:49:27 -0400 |
|---|---|---|
| committer | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-09-22 19:49:27 -0400 |
| commit | f056878332a91ed984a116bad4e7d49aefff9e6e (patch) | |
| tree | 572f4757c8e7811d45e0be0c2ae529c78fb63441 /fs/jbd/commit.c | |
| parent | 3961f7c3cf247eee5df7fabadc7a40f2deeb98f3 (diff) | |
| parent | 7fa07729e439a6184bd824746d06a49cca553f15 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/power/wm97xx_battery.c
Diffstat (limited to 'fs/jbd/commit.c')
| -rw-r--r-- | fs/jbd/commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c index 618e21c0b7a3..4bd882548c45 100644 --- a/fs/jbd/commit.c +++ b/fs/jbd/commit.c | |||
| @@ -308,7 +308,7 @@ void journal_commit_transaction(journal_t *journal) | |||
| 308 | int bufs; | 308 | int bufs; |
| 309 | int flags; | 309 | int flags; |
| 310 | int err; | 310 | int err; |
| 311 | unsigned long blocknr; | 311 | unsigned int blocknr; |
| 312 | ktime_t start_time; | 312 | ktime_t start_time; |
| 313 | u64 commit_time; | 313 | u64 commit_time; |
| 314 | char *tagp = NULL; | 314 | char *tagp = NULL; |