diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-11 03:36:51 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-11 03:36:51 -0400 |
| commit | 6396fc3b3ff3f6b942992b653a62df11dcef9bea (patch) | |
| tree | db3c7cbe833b43c653adc99f70941431c5ff7c4e /fs/quota/dquot.c | |
| parent | 4785879e4d340e24e54f6de2ccfc42728b912808 (diff) | |
| parent | 3d30701b58970425e1d45994d6cb82f828924fdd (diff) | |
Merge branch 'master' into for-next
Conflicts:
fs/exofs/inode.c
Diffstat (limited to 'fs/quota/dquot.c')
| -rw-r--r-- | fs/quota/dquot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index ef72b1699429..aad1316a977f 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c | |||
| @@ -898,7 +898,7 @@ static void add_dquot_ref(struct super_block *sb, int type) | |||
| 898 | 898 | ||
| 899 | spin_lock(&inode_lock); | 899 | spin_lock(&inode_lock); |
| 900 | list_for_each_entry(inode, &sb->s_inodes, i_sb_list) { | 900 | list_for_each_entry(inode, &sb->s_inodes, i_sb_list) { |
| 901 | if (inode->i_state & (I_FREEING|I_CLEAR|I_WILL_FREE|I_NEW)) | 901 | if (inode->i_state & (I_FREEING|I_WILL_FREE|I_NEW)) |
| 902 | continue; | 902 | continue; |
| 903 | #ifdef CONFIG_QUOTA_DEBUG | 903 | #ifdef CONFIG_QUOTA_DEBUG |
| 904 | if (unlikely(inode_get_rsv_space(inode) > 0)) | 904 | if (unlikely(inode_get_rsv_space(inode) > 0)) |