diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-04-21 18:26:56 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-04-21 18:26:56 -0400 |
| commit | e2bca7c76a79b68506bfc3699beb74c0d41fe230 (patch) | |
| tree | 1b0269083de5ccc61a96b615ef271098df8e1b6a /fs/reiserfs | |
| parent | b3c7740a120c8a7775cb63b4d094466da5c01692 (diff) | |
| parent | d54a45e2533ef33678dc340298b022a289d2b3e3 (diff) | |
Merge branch 'for_2.6.34rc_a' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus
Diffstat (limited to 'fs/reiserfs')
| -rw-r--r-- | fs/reiserfs/journal.c | 15 | ||||
| -rw-r--r-- | fs/reiserfs/xattr_security.c | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index ba98546fabbd..f3de5e8a2ae8 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c | |||
| @@ -2217,6 +2217,15 @@ static int journal_read_transaction(struct super_block *sb, | |||
| 2217 | brelse(d_bh); | 2217 | brelse(d_bh); |
| 2218 | return 1; | 2218 | return 1; |
| 2219 | } | 2219 | } |
| 2220 | |||
| 2221 | if (bdev_read_only(sb->s_bdev)) { | ||
| 2222 | reiserfs_warning(sb, "clm-2076", | ||
| 2223 | "device is readonly, unable to replay log"); | ||
| 2224 | brelse(c_bh); | ||
| 2225 | brelse(d_bh); | ||
| 2226 | return -EROFS; | ||
| 2227 | } | ||
| 2228 | |||
| 2220 | trans_id = get_desc_trans_id(desc); | 2229 | trans_id = get_desc_trans_id(desc); |
| 2221 | /* now we know we've got a good transaction, and it was inside the valid time ranges */ | 2230 | /* now we know we've got a good transaction, and it was inside the valid time ranges */ |
| 2222 | log_blocks = kmalloc(get_desc_trans_len(desc) * | 2231 | log_blocks = kmalloc(get_desc_trans_len(desc) * |
| @@ -2459,12 +2468,6 @@ static int journal_read(struct super_block *sb) | |||
| 2459 | goto start_log_replay; | 2468 | goto start_log_replay; |
| 2460 | } | 2469 | } |
| 2461 | 2470 | ||
| 2462 | if (continue_replay && bdev_read_only(sb->s_bdev)) { | ||
| 2463 | reiserfs_warning(sb, "clm-2076", | ||
| 2464 | "device is readonly, unable to replay log"); | ||
| 2465 | return -1; | ||
| 2466 | } | ||
| 2467 | |||
| 2468 | /* ok, there are transactions that need to be replayed. start with the first log block, find | 2471 | /* ok, there are transactions that need to be replayed. start with the first log block, find |
| 2469 | ** all the valid transactions, and pick out the oldest. | 2472 | ** all the valid transactions, and pick out the oldest. |
| 2470 | */ | 2473 | */ |
diff --git a/fs/reiserfs/xattr_security.c b/fs/reiserfs/xattr_security.c index d8b5bfcbdd30..de1fcffd906b 100644 --- a/fs/reiserfs/xattr_security.c +++ b/fs/reiserfs/xattr_security.c | |||
| @@ -76,7 +76,7 @@ int reiserfs_security_init(struct inode *dir, struct inode *inode, | |||
| 76 | return error; | 76 | return error; |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | if (sec->length) { | 79 | if (sec->length && reiserfs_xattrs_initialized(inode->i_sb)) { |
| 80 | blocks = reiserfs_xattr_jcreate_nblocks(inode) + | 80 | blocks = reiserfs_xattr_jcreate_nblocks(inode) + |
| 81 | reiserfs_xattr_nblocks(inode, sec->length); | 81 | reiserfs_xattr_nblocks(inode, sec->length); |
| 82 | /* We don't want to count the directories twice if we have | 82 | /* We don't want to count the directories twice if we have |