]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[POWERPC] spufs: lockdep annotations for spufs_dir_close
authorChristoph Hellwig <hch@lst.de>
Thu, 8 May 2008 05:29:12 +0000 (15:29 +1000)
committerJeremy Kerr <jk@ozlabs.org>
Thu, 8 May 2008 05:29:12 +0000 (15:29 +1000)
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>
arch/powerpc/platforms/cell/spufs/inode.c

index 5faedf5a09a0c3ad52ccc3acff5f1ee3886a071c..f407b24718554f474a153dc9a66e93d88518739f 100644 (file)
@@ -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);