diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
| commit | a23e66f3b8cfdedec14541e71ef29a754870a20c (patch) | |
| tree | f8ac23572982e92e6f8ae09c4039db627bdf53ee /fs/buffer.c | |
| parent | 04c470adb01c62bb9bd663cfc4875cf0a4eb01ab (diff) | |
| parent | ede6f5aea054d3fb67c78857f7abdee602302043 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index a13f09b696f7..c26da785938a 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
| @@ -2022,7 +2022,6 @@ int block_write_begin(struct file *file, struct address_space *mapping, | |||
| 2022 | if (pos + len > inode->i_size) | 2022 | if (pos + len > inode->i_size) |
| 2023 | vmtruncate(inode, inode->i_size); | 2023 | vmtruncate(inode, inode->i_size); |
| 2024 | } | 2024 | } |
| 2025 | goto out; | ||
| 2026 | } | 2025 | } |
| 2027 | 2026 | ||
| 2028 | out: | 2027 | out: |