diff options
| author | Igor Mammedov <niallain@gmail.com> | 2008-04-28 19:08:21 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-28 19:08:21 -0400 |
| commit | e9f20d6f03e8df393b001dab6dc5226c2a5daf57 (patch) | |
| tree | 73e94fa5e4f83576c97e36187b809c5aad2ade30 /fs/ufs/inode.c | |
| parent | bf62fd887cab230f5952b611bde25e8e15acb454 (diff) | |
| parent | e31a94ed371c70855eb30b77c490d6d85dd4da26 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/ufs/inode.c')
| -rw-r--r-- | fs/ufs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c index 5446b888fc8e..39f877898565 100644 --- a/fs/ufs/inode.c +++ b/fs/ufs/inode.c | |||
| @@ -929,7 +929,7 @@ void ufs_delete_inode (struct inode * inode) | |||
| 929 | old_i_size = inode->i_size; | 929 | old_i_size = inode->i_size; |
| 930 | inode->i_size = 0; | 930 | inode->i_size = 0; |
| 931 | if (inode->i_blocks && ufs_truncate(inode, old_i_size)) | 931 | if (inode->i_blocks && ufs_truncate(inode, old_i_size)) |
| 932 | ufs_warning(inode->i_sb, __FUNCTION__, "ufs_truncate failed\n"); | 932 | ufs_warning(inode->i_sb, __func__, "ufs_truncate failed\n"); |
| 933 | ufs_free_inode (inode); | 933 | ufs_free_inode (inode); |
| 934 | unlock_kernel(); | 934 | unlock_kernel(); |
| 935 | return; | 935 | return; |