diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:04:32 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:04:32 -0500 |
| commit | d12418fdeafdc08dd5bbec89d3e07e47ee75da55 (patch) | |
| tree | ac94d5bf58360b89fc7439fb52182c17d0674b0a /fs/cifs/inode.c | |
| parent | c2d1cec1c77f7714672c1efeae075424c929e0d5 (diff) | |
| parent | 238c6d54830c624f34ac9cf123ac04aebfca5013 (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'fs/cifs/inode.c')
| -rw-r--r-- | fs/cifs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index f247da9f4edc..5ab9896fdcb2 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
| @@ -1641,7 +1641,7 @@ do_expand: | |||
| 1641 | i_size_write(inode, offset); | 1641 | i_size_write(inode, offset); |
| 1642 | spin_unlock(&inode->i_lock); | 1642 | spin_unlock(&inode->i_lock); |
| 1643 | out_truncate: | 1643 | out_truncate: |
| 1644 | if (inode->i_op && inode->i_op->truncate) | 1644 | if (inode->i_op->truncate) |
| 1645 | inode->i_op->truncate(inode); | 1645 | inode->i_op->truncate(inode); |
| 1646 | return 0; | 1646 | return 0; |
| 1647 | out_sig: | 1647 | out_sig: |