656c656
< 	err = dquot_initialize(inode);
---
> 	err = f2fs_dquot_initialize(inode);
708,710d707
< 	/* Needed for iput() to work correctly and not trash data */
< 	sbi->sb->s_flags |= SB_ACTIVE;
< 
1165c1162,1163
< 	down_write(&sbi->quota_sem);
---
> 	if (!down_write_trylock(&sbi->quota_sem))
> 		return true;