diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-01-24 15:34:47 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-01-24 15:34:47 -0500 |
| commit | 0a0fc0ddbe732779366ab6b1b879f62195e65967 (patch) | |
| tree | 7b42490a676cf39ae0691b6859ecf7fd410f229b /fs/affs | |
| parent | 4d5dbd0945d9e0833dd7964a3d6ee33157f7cc7a (diff) | |
| parent | 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 (diff) | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'fs/affs')
| -rw-r--r-- | fs/affs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/affs/inode.c b/fs/affs/inode.c index 9ebe881c67..44d439cb69 100644 --- a/fs/affs/inode.c +++ b/fs/affs/inode.c | |||
| @@ -244,10 +244,10 @@ affs_put_inode(struct inode *inode) | |||
| 244 | pr_debug("AFFS: put_inode(ino=%lu, nlink=%u)\n", inode->i_ino, inode->i_nlink); | 244 | pr_debug("AFFS: put_inode(ino=%lu, nlink=%u)\n", inode->i_ino, inode->i_nlink); |
| 245 | affs_free_prealloc(inode); | 245 | affs_free_prealloc(inode); |
| 246 | if (atomic_read(&inode->i_count) == 1) { | 246 | if (atomic_read(&inode->i_count) == 1) { |
| 247 | down(&inode->i_sem); | 247 | mutex_lock(&inode->i_mutex); |
| 248 | if (inode->i_size != AFFS_I(inode)->mmu_private) | 248 | if (inode->i_size != AFFS_I(inode)->mmu_private) |
| 249 | affs_truncate(inode); | 249 | affs_truncate(inode); |
| 250 | up(&inode->i_sem); | 250 | mutex_unlock(&inode->i_mutex); |
| 251 | } | 251 | } |
| 252 | } | 252 | } |
| 253 | 253 | ||