Commit 2ec46505 authored by Steven Whitehouse's avatar Steven Whitehouse

GFS2: Use dquot_send_warning()

This adds support to GFS2 to send quota warnings via netlink.
Also it removes a stray \r which was left over from when the
code used to print warnings on the console.
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 86e931a3
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/freezer.h> #include <linux/freezer.h>
#include <linux/quota.h>
#include <linux/dqblk_xfs.h> #include <linux/dqblk_xfs.h>
#include "gfs2.h" #include "gfs2.h"
...@@ -1001,7 +1002,7 @@ static int print_message(struct gfs2_quota_data *qd, char *type) ...@@ -1001,7 +1002,7 @@ static int print_message(struct gfs2_quota_data *qd, char *type)
{ {
struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd; struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd;
printk(KERN_INFO "GFS2: fsid=%s: quota %s for %s %u\r\n", printk(KERN_INFO "GFS2: fsid=%s: quota %s for %s %u\n",
sdp->sd_fsname, type, sdp->sd_fsname, type,
(test_bit(QDF_USER, &qd->qd_flags)) ? "user" : "group", (test_bit(QDF_USER, &qd->qd_flags)) ? "user" : "group",
qd->qd_id); qd->qd_id);
...@@ -1038,6 +1039,10 @@ int gfs2_quota_check(struct gfs2_inode *ip, u32 uid, u32 gid) ...@@ -1038,6 +1039,10 @@ int gfs2_quota_check(struct gfs2_inode *ip, u32 uid, u32 gid)
if (be64_to_cpu(qd->qd_qb.qb_limit) && (s64)be64_to_cpu(qd->qd_qb.qb_limit) < value) { if (be64_to_cpu(qd->qd_qb.qb_limit) && (s64)be64_to_cpu(qd->qd_qb.qb_limit) < value) {
print_message(qd, "exceeded"); print_message(qd, "exceeded");
quota_send_warning(test_bit(QDF_USER, &qd->qd_flags) ?
USRQUOTA : GRPQUOTA, qd->qd_id,
sdp->sd_vfs->s_dev, QUOTA_NL_BHARDWARN);
error = -EDQUOT; error = -EDQUOT;
break; break;
} else if (be64_to_cpu(qd->qd_qb.qb_warn) && } else if (be64_to_cpu(qd->qd_qb.qb_warn) &&
...@@ -1045,6 +1050,9 @@ int gfs2_quota_check(struct gfs2_inode *ip, u32 uid, u32 gid) ...@@ -1045,6 +1050,9 @@ int gfs2_quota_check(struct gfs2_inode *ip, u32 uid, u32 gid)
time_after_eq(jiffies, qd->qd_last_warn + time_after_eq(jiffies, qd->qd_last_warn +
gfs2_tune_get(sdp, gfs2_tune_get(sdp,
gt_quota_warn_period) * HZ)) { gt_quota_warn_period) * HZ)) {
quota_send_warning(test_bit(QDF_USER, &qd->qd_flags) ?
USRQUOTA : GRPQUOTA, qd->qd_id,
sdp->sd_vfs->s_dev, QUOTA_NL_BSOFTWARN);
error = print_message(qd, "warning"); error = print_message(qd, "warning");
qd->qd_last_warn = jiffies; qd->qd_last_warn = jiffies;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment