summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2008-05-08 15:29:12 +1000
committerJeremy Kerr <jk@ozlabs.org>2008-05-08 15:29:12 +1000
commit02539d71fa98d5737bb668b02286c76241e4bac9 (patch)
treeb7da735722b2356e61f5296ed4d8b2f828393495 /arch/powerpc
parent7a28a1549f9514f3b0dd3dde5c7337ba5d44fba3 (diff)
downloadop-kernel-dev-02539d71fa98d5737bb668b02286c76241e4bac9.zip
op-kernel-dev-02539d71fa98d5737bb668b02286c76241e4bac9.tar.gz
[POWERPC] spufs: lockdep annotations for spufs_dir_close
We need to acquire the parent i_mutex with I_MUTEX_PARENT to keep lockdep happy. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/platforms/cell/spufs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index 5faedf5..f407b24 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -224,7 +224,7 @@ static int spufs_dir_close(struct inode *inode, struct file *file)
parent = dir->d_parent->d_inode;
ctx = SPUFS_I(dir->d_inode)->i_ctx;
- mutex_lock(&parent->i_mutex);
+ mutex_lock_nested(&parent->i_mutex, I_MUTEX_PARENT);
ret = spufs_rmdir(parent, dir);
mutex_unlock(&parent->i_mutex);
WARN_ON(ret);
OpenPOWER on IntegriCloud