On Wed, 2007-10-17 at 15:11 -0700, [EMAIL PROTECTED] wrote: > Subject: reiserfs: fix up lockdep warnings > From: Jeff Mahoney <[EMAIL PROTECTED]> > > Add I_MUTEX_XATTR annotations to the inode locking in the reiserfs xattr code. > > Signed-off-by: Jeff Mahoney <[EMAIL PROTECTED]> > Cc: Christoph Hellwig <[EMAIL PROTECTED]> > Cc: Chris Mason <[EMAIL PROTECTED]> > Cc: "Vladimir V. Saveliev" <[EMAIL PROTECTED]> > Cc: Peter Zijlstra <[EMAIL PROTECTED]>
Yep looks good,
want me to push this through the lockdep tree, or will you forward it?
In which case:
Acked-by: Peter Zijlstra <[EMAIL PROTECTED]>
> Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
> ---
>
> fs/reiserfs/xattr.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff -puN fs/reiserfs/xattr.c~reiserfs-fix-up-lockdep-warnings
> fs/reiserfs/xattr.c
> --- a/fs/reiserfs/xattr.c~reiserfs-fix-up-lockdep-warnings
> +++ a/fs/reiserfs/xattr.c
> @@ -484,7 +484,7 @@ reiserfs_xattr_set(struct inode *inode,
> /* Resize it so we're ok to write there */
> newattrs.ia_size = buffer_size;
> newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
> - mutex_lock(&xinode->i_mutex);
> + mutex_lock_nested(&xinode->i_mutex, I_MUTEX_XATTR);
> err = notify_change(fp->f_path.dentry, &newattrs);
> if (err)
> goto out_filp;
> @@ -1223,7 +1223,8 @@ int reiserfs_xattr_init(struct super_blo
> if (!IS_ERR(dentry)) {
> if (!(mount_flags & MS_RDONLY) && !dentry->d_inode) {
> struct inode *inode = dentry->d_parent->d_inode;
> - mutex_lock(&inode->i_mutex);
> + mutex_lock_nested(&inode->i_mutex,
> + I_MUTEX_XATTR);
> err = inode->i_op->mkdir(inode, dentry, 0700);
> mutex_unlock(&inode->i_mutex);
> if (err) {
signature.asc
Description: This is a digitally signed message part
