diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
| commit | 12df7556705aae97f24a397377e17898700d7192 (patch) | |
| tree | 5adc6b1c2aa940263ee2e88fc6645918533da539 /fs/udf/inode.c | |
| parent | 34ddf733c415a8e336c996a4303d9f336e0c81b5 (diff) | |
| parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) | |
Merge branch 'master'
Diffstat (limited to 'fs/udf/inode.c')
| -rw-r--r-- | fs/udf/inode.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 81e0e8459af1..2983afd5e7fd 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c | |||
| @@ -312,12 +312,10 @@ static int udf_get_block(struct inode *inode, sector_t block, struct buffer_head | |||
| 312 | err = 0; | 312 | err = 0; |
| 313 | 313 | ||
| 314 | bh = inode_getblk(inode, block, &err, &phys, &new); | 314 | bh = inode_getblk(inode, block, &err, &phys, &new); |
| 315 | if (bh) | 315 | BUG_ON(bh); |
| 316 | BUG(); | ||
| 317 | if (err) | 316 | if (err) |
| 318 | goto abort; | 317 | goto abort; |
| 319 | if (!phys) | 318 | BUG_ON(!phys); |
| 320 | BUG(); | ||
| 321 | 319 | ||
| 322 | if (new) | 320 | if (new) |
| 323 | set_buffer_new(bh_result); | 321 | set_buffer_new(bh_result); |