Merge branch 'master' into for-linus

This commit is contained in:
Alex Elder
2010-06-04 13:22:30 -05:00
18 changed files with 741 additions and 803 deletions

View File

@@ -249,8 +249,10 @@ xfs_qm_hold_quotafs_ref(
if (!xfs_Gqm) {
xfs_Gqm = xfs_Gqm_init();
if (!xfs_Gqm)
if (!xfs_Gqm) {
mutex_unlock(&xfs_Gqm_lock);
return ENOMEM;
}
}
/*