projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge
[cascardo/linux.git]
/
fs
/
ocfs2
/
quota_global.c
diff --git
a/fs/ocfs2/quota_global.c
b/fs/ocfs2/quota_global.c
index
279aef6
..
92fcd57
100644
(file)
--- a/
fs/ocfs2/quota_global.c
+++ b/
fs/ocfs2/quota_global.c
@@
-556,7
+556,7
@@
int __ocfs2_sync_dquot(struct dquot *dquot, int freeing)
spin_unlock(&dq_data_lock);
err = ocfs2_qinfo_lock(info, freeing);
if (err < 0) {
spin_unlock(&dq_data_lock);
err = ocfs2_qinfo_lock(info, freeing);
if (err < 0) {
- mlog(ML_ERROR, "Failed to lock quota info, lo
o
sing quota write"
+ mlog(ML_ERROR, "Failed to lock quota info, losing quota write"
" (type=%d, id=%u)\n", dquot->dq_type,
(unsigned)dquot->dq_id);
goto out;
" (type=%d, id=%u)\n", dquot->dq_type,
(unsigned)dquot->dq_id);
goto out;