From: Andrew Morton Cc: Ingo Molnar Signed-off-by: Andrew Morton --- mm/memory.c | 4 ++-- nfsd/vfs.c | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN mm/memory.c~mutex-subsystem-semaphore-to-mutex-vfs-i_sem-fixes mm/memory.c --- devel/mm/memory.c~mutex-subsystem-semaphore-to-mutex-vfs-i_sem-fixes 2006-01-07 01:35:28.000000000 -0800 +++ devel-akpm/mm/memory.c 2006-01-07 01:35:54.000000000 -0800 @@ -1784,13 +1784,13 @@ int vmtruncate_range(struct inode *inode if (!inode->i_op || !inode->i_op->truncate_range) return -ENOSYS; - down(&inode->i_sem); + mutex_lock(&inode->i_mutex); down_write(&inode->i_alloc_sem); unmap_mapping_range(mapping, offset, (end - offset), 1); truncate_inode_pages_range(mapping, offset, end); inode->i_op->truncate_range(inode, offset, end); up_write(&inode->i_alloc_sem); - up(&inode->i_sem); + mutex_unlock(&inode->i_mutex); return 0; } diff -puN fs/nfsd/vfs.c~mutex-subsystem-semaphore-to-mutex-vfs-i_sem-fixes fs/nfsd/vfs.c _