diff options
| author | NeilBrown <neilb@suse.de> | 2012-08-01 06:40:02 -0400 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2012-08-01 06:40:02 -0400 |
| commit | bb181e2e48f8c85db08c9cb015cbba9618dbf05c (patch) | |
| tree | 191bc24dd97bcb174535cc217af082f16da3b43d /fs/udf/truncate.c | |
| parent | d57368afe63b3b7b45ce6c2b8c5276417935be2f (diff) | |
| parent | c039c332f23e794deb6d6f37b9f07ff3b27fb2cf (diff) | |
Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md
Pull in pre-requisites for adding raid10 support to dm-raid.
Diffstat (limited to 'fs/udf/truncate.c')
| -rw-r--r-- | fs/udf/truncate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/udf/truncate.c b/fs/udf/truncate.c index 4b98fee8e161..8a9657d7f7c6 100644 --- a/fs/udf/truncate.c +++ b/fs/udf/truncate.c | |||
| @@ -248,7 +248,7 @@ void udf_truncate_extents(struct inode *inode) | |||
| 248 | /* We managed to free all extents in the | 248 | /* We managed to free all extents in the |
| 249 | * indirect extent - free it too */ | 249 | * indirect extent - free it too */ |
| 250 | BUG_ON(!epos.bh); | 250 | BUG_ON(!epos.bh); |
| 251 | udf_free_blocks(sb, inode, &epos.block, | 251 | udf_free_blocks(sb, NULL, &epos.block, |
| 252 | 0, indirect_ext_len); | 252 | 0, indirect_ext_len); |
| 253 | } else if (!epos.bh) { | 253 | } else if (!epos.bh) { |
| 254 | iinfo->i_lenAlloc = lenalloc; | 254 | iinfo->i_lenAlloc = lenalloc; |
| @@ -275,7 +275,7 @@ void udf_truncate_extents(struct inode *inode) | |||
| 275 | 275 | ||
| 276 | if (indirect_ext_len) { | 276 | if (indirect_ext_len) { |
| 277 | BUG_ON(!epos.bh); | 277 | BUG_ON(!epos.bh); |
| 278 | udf_free_blocks(sb, inode, &epos.block, 0, indirect_ext_len); | 278 | udf_free_blocks(sb, NULL, &epos.block, 0, indirect_ext_len); |
| 279 | } else if (!epos.bh) { | 279 | } else if (!epos.bh) { |
| 280 | iinfo->i_lenAlloc = lenalloc; | 280 | iinfo->i_lenAlloc = lenalloc; |
| 281 | mark_inode_dirty(inode); | 281 | mark_inode_dirty(inode); |