Commit 4eae06de authored by Amir Goldstein's avatar Amir Goldstein Committed by Miklos Szeredi
Browse files

ovl: lockdep annotate of nested OVL_I(inode)->lock 



This fixes a lockdep splat when mounting a nested overlayfs.

Fixes: a015dafc ("ovl: use ovl_inode mutex to synchronize...")
Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 39dae59d

fs/overlayfs/inode.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/posix_acl.h>

#include <linux/posix_acl.h>

#include <linux/ratelimit.h>

#include <linux/ratelimit.h>

#include "overlayfs.h"

#include "overlayfs.h"

#include "ovl_entry.h"





int ovl_setattr(struct dentry *dentry, struct iattr *attr)

int ovl_setattr(struct dentry *dentry, struct iattr *attr)

{

{
@@ -409,6 +410,7 @@ static inline void ovl_lockdep_annotate_inode_mutex_key(struct inode *inode) 
#ifdef CONFIG_LOCKDEP

#ifdef CONFIG_LOCKDEP

	static struct lock_class_key ovl_i_mutex_key[OVL_MAX_NESTING];

	static struct lock_class_key ovl_i_mutex_key[OVL_MAX_NESTING];

	static struct lock_class_key ovl_i_mutex_dir_key[OVL_MAX_NESTING];

	static struct lock_class_key ovl_i_mutex_dir_key[OVL_MAX_NESTING];

	static struct lock_class_key ovl_i_lock_key[OVL_MAX_NESTING];





	int depth = inode->i_sb->s_stack_depth - 1;

	int depth = inode->i_sb->s_stack_depth - 1;
@@ -419,6 +421,8 @@ static inline void ovl_lockdep_annotate_inode_mutex_key(struct inode *inode) 
		lockdep_set_class(&inode->i_rwsem, &ovl_i_mutex_dir_key[depth]);

		lockdep_set_class(&inode->i_rwsem, &ovl_i_mutex_dir_key[depth]);

	else

	else

		lockdep_set_class(&inode->i_rwsem, &ovl_i_mutex_key[depth]);

		lockdep_set_class(&inode->i_rwsem, &ovl_i_mutex_key[depth]);



	lockdep_set_class(&OVL_I(inode)->lock, &ovl_i_lock_key[depth]);

#endif

#endif

}

}