diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 19:38:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 19:38:18 -0500 |
commit | 1399ff54741b3aa0aaf5097b8559fa30277ebe61 (patch) | |
tree | b384aef82007144b067cc171d2a9aa168b50b262 /fs/reiserfs/journal.c | |
parent | bb37b94c68e7b37eecea8576039ae9396ca07839 (diff) | |
parent | 6b44d4e69c6144d0df71ab47ec90d2009237d48f (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Fix typos in drivers/isdn/hisax/isdnl2.c
Fix typos in doc and comments
BUG_ON conversion for fs/aio.c
BUG_ON conversion for drivers/mmc/omap.c
BUG_ON conversion for drivers/media/video/pwc/pwc-if.c
Fix misc .c/.h comment typos
Fix misc Kconfig typos
Fix typos in /Documentation : Misc
Fix typos in /Documentation : 'U-Z'
Fix typos in /Documentation : 'T''
Fix jiffies.h comment
tabify MAINTAINERS
fix spelling error in include/linux/kernel.h
mqueue.h: don't include linux/types.h
Diffstat (limited to 'fs/reiserfs/journal.c')
-rw-r--r-- | fs/reiserfs/journal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index 85ce2326830..ac93174c963 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c | |||
@@ -1464,7 +1464,7 @@ static int flush_journal_list(struct super_block *s, | |||
1464 | } | 1464 | } |
1465 | 1465 | ||
1466 | /* if someone has this block in a newer transaction, just make | 1466 | /* if someone has this block in a newer transaction, just make |
1467 | ** sure they are commited, and don't try writing it to disk | 1467 | ** sure they are committed, and don't try writing it to disk |
1468 | */ | 1468 | */ |
1469 | if (pjl) { | 1469 | if (pjl) { |
1470 | if (atomic_read(&pjl->j_commit_left)) | 1470 | if (atomic_read(&pjl->j_commit_left)) |
@@ -3384,7 +3384,7 @@ static int remove_from_transaction(struct super_block *p_s_sb, | |||
3384 | 3384 | ||
3385 | /* | 3385 | /* |
3386 | ** for any cnode in a journal list, it can only be dirtied of all the | 3386 | ** for any cnode in a journal list, it can only be dirtied of all the |
3387 | ** transactions that include it are commited to disk. | 3387 | ** transactions that include it are committed to disk. |
3388 | ** this checks through each transaction, and returns 1 if you are allowed to dirty, | 3388 | ** this checks through each transaction, and returns 1 if you are allowed to dirty, |
3389 | ** and 0 if you aren't | 3389 | ** and 0 if you aren't |
3390 | ** | 3390 | ** |
@@ -3426,7 +3426,7 @@ static int can_dirty(struct reiserfs_journal_cnode *cn) | |||
3426 | } | 3426 | } |
3427 | 3427 | ||
3428 | /* syncs the commit blocks, but does not force the real buffers to disk | 3428 | /* syncs the commit blocks, but does not force the real buffers to disk |
3429 | ** will wait until the current transaction is done/commited before returning | 3429 | ** will wait until the current transaction is done/committed before returning |
3430 | */ | 3430 | */ |
3431 | int journal_end_sync(struct reiserfs_transaction_handle *th, | 3431 | int journal_end_sync(struct reiserfs_transaction_handle *th, |
3432 | struct super_block *p_s_sb, unsigned long nblocks) | 3432 | struct super_block *p_s_sb, unsigned long nblocks) |