diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-10-06 11:36:55 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-10-06 11:36:55 -0400 |
| commit | d94e5fcbf1420366dcb4102bafe04dbcfc0d0d4b (patch) | |
| tree | a9b7de7df6da5c3132cc68169b9c47ba288ccd42 /fs/jbd/commit.c | |
| parent | d55651168a20078a94597a297d5cdfd807bf07b6 (diff) | |
| parent | 374576a8b6f865022c0fd1ca62396889b23d66dd (diff) | |
Merge commit 'v2.6.32-rc3'
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; |