tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6:
quota: Silence lockdep on quota_on

Linus Torvalds 691c5f73 fbdbf838

+4 -3
+4 -3
fs/quota/dquot.c
··· 2043 2043 invalidate_bdev(sb->s_bdev); 2044 2044 } 2045 2045 mutex_lock(&dqopt->dqonoff_mutex); 2046 - mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA); 2047 2046 if (sb_has_quota_loaded(sb, type)) { 2048 2047 error = -EBUSY; 2049 2048 goto out_lock; ··· 2053 2054 * possible) Also nobody should write to the file - we use 2054 2055 * special IO operations which ignore the immutable bit. */ 2055 2056 down_write(&dqopt->dqptr_sem); 2057 + mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA); 2056 2058 oldflags = inode->i_flags & (S_NOATIME | S_IMMUTABLE | 2057 2059 S_NOQUOTA); 2058 2060 inode->i_flags |= S_NOQUOTA | S_NOATIME | S_IMMUTABLE; 2061 + mutex_unlock(&inode->i_mutex); 2059 2062 up_write(&dqopt->dqptr_sem); 2060 2063 sb->dq_op->drop(inode); 2061 2064 } ··· 2081 2080 goto out_file_init; 2082 2081 } 2083 2082 mutex_unlock(&dqopt->dqio_mutex); 2084 - mutex_unlock(&inode->i_mutex); 2085 2083 spin_lock(&dq_state_lock); 2086 2084 dqopt->flags |= dquot_state_flag(flags, type); 2087 2085 spin_unlock(&dq_state_lock); ··· 2096 2096 out_lock: 2097 2097 if (oldflags != -1) { 2098 2098 down_write(&dqopt->dqptr_sem); 2099 + mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA); 2099 2100 /* Set the flags back (in the case of accidental quotaon() 2100 2101 * on a wrong file we don't want to mess up the flags) */ 2101 2102 inode->i_flags &= ~(S_NOATIME | S_NOQUOTA | S_IMMUTABLE); 2102 2103 inode->i_flags |= oldflags; 2104 + mutex_unlock(&inode->i_mutex); 2103 2105 up_write(&dqopt->dqptr_sem); 2104 2106 } 2105 - mutex_unlock(&inode->i_mutex); 2106 2107 mutex_unlock(&dqopt->dqonoff_mutex); 2107 2108 out_fmt: 2108 2109 put_quota_format(fmt);