diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2012-09-04 22:48:21 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-09-04 22:48:21 +0100 |
| commit | bc1daea5962e9bf9123a923977a4ed5a560630c5 (patch) | |
| tree | 93f5eee62ccc22fd87b004bbb41569b1ea044437 /fs/udf/inode.c | |
| parent | b0e76e3105f12382015dc2bf08b88fb60154ba80 (diff) | |
| parent | 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d (diff) | |
| download | linux-aarch64-bc1daea5962e9bf9123a923977a4ed5a560630c5.tar.gz | |
Merge tag 'v3.6-rc4' into upstream
Linux 3.6-rc4
Diffstat (limited to 'fs/udf/inode.c')
| -rw-r--r-- | fs/udf/inode.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index fafaad795cd..aa233469b3c 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -1124,14 +1124,17 @@ int udf_setsize(struct inode *inode, loff_t newsize) if (err) return err; down_write(&iinfo->i_data_sem); - } else + } else { iinfo->i_lenAlloc = newsize; + goto set_size; + } } err = udf_extend_file(inode, newsize); if (err) { up_write(&iinfo->i_data_sem); return err; } +set_size: truncate_setsize(inode, newsize); up_write(&iinfo->i_data_sem); } else { |