aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Becker <jlbec@evilplan.org>2012-08-15 02:02:28 -0700
committerJoel Becker <jlbec@evilplan.org>2012-08-15 13:55:18 -0700
commit4538df64655dcfe17b33080b219dc783161a262e (patch)
tree727937c4cd46a894d768b49fea8558147e1264d9
parentcd5889bb8cc295e87e2f791367b7f516cbc7ccb0 (diff)
downloadocfs2-linux-next.tar.gz
ocfs2: Don't spam on -EDQUOT.merge-windowlinux-nextfixesALL
-EDQUOT is a user-visible error, not a logic problem. Teach mlog_errno() to ignore it like it ignores -ENOSPC, etc. Signed-off-by: Joel Becker <jlbec@evilplan.org> Reviewed-by: Jan Kara <jack@suse.cz> Reported-by: Marek Królikowski <admin@wset.edu.pl>
-rw-r--r--fs/ocfs2/cluster/masklog.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ocfs2/cluster/masklog.h b/fs/ocfs2/cluster/masklog.h
index baa2b9ef7eef90..2260fb9e650831 100644
--- a/fs/ocfs2/cluster/masklog.h
+++ b/fs/ocfs2/cluster/masklog.h
@@ -199,7 +199,8 @@ extern struct mlog_bits mlog_and_bits, mlog_not_bits;
#define mlog_errno(st) do { \
int _st = (st); \
if (_st != -ERESTARTSYS && _st != -EINTR && \
- _st != AOP_TRUNCATED_PAGE && _st != -ENOSPC) \
+ _st != AOP_TRUNCATED_PAGE && _st != -ENOSPC && \
+ _st != -EDQUOT) \
mlog(ML_ERROR, "status = %lld\n", (long long)_st); \
} while (0)