Skip to content

Commit

Permalink
[GFS2] Remove dependance on tty_write_message()
Browse files Browse the repository at this point in the history
This removes the call in GFS2 to tty_write_message and replaces
it with a printk. As the export was added by GFS2, we remove this
as well.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
  • Loading branch information
Steven Whitehouse committed Jul 3, 2006
1 parent 0a1340c commit 02630a1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 20 deletions.
23 changes: 4 additions & 19 deletions fs/gfs2/quota.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
#include <linux/spinlock.h>
#include <linux/completion.h>
#include <linux/buffer_head.h>
#include <linux/tty.h>
#include <linux/sort.h>
#include <linux/fs.h>
#include <linux/gfs2_ondisk.h>
Expand Down Expand Up @@ -929,25 +928,11 @@ void gfs2_quota_unlock(struct gfs2_inode *ip)
static int print_message(struct gfs2_quota_data *qd, char *type)
{
struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd;
char *line;
int len;

line = kmalloc(MAX_LINE, GFP_KERNEL);
if (!line)
return -ENOMEM;

len = snprintf(line, MAX_LINE-1,
"GFS2: fsid=%s: quota %s for %s %u\r\n",
sdp->sd_fsname, type,
(test_bit(QDF_USER, &qd->qd_flags)) ? "user" : "group",
qd->qd_id);
line[MAX_LINE-1] = 0;

if (current->signal) { /* Is this test still required? */
tty_write_message(current->signal->tty, line);
}

kfree(line);
printk(KERN_INFO "GFS2: fsid=%s: quota %s for %s %u\r\n",
sdp->sd_fsname, type,
(test_bit(QDF_USER, &qd->qd_flags)) ? "user" : "group",
qd->qd_id);

return 0;
}
Expand Down
1 change: 0 additions & 1 deletion kernel/printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -1040,7 +1040,6 @@ void tty_write_message(struct tty_struct *tty, char *msg)
tty->driver->write(tty, msg, strlen(msg));
return;
}
EXPORT_SYMBOL_GPL(tty_write_message);

/*
* printk rate limiting, lifted from the networking subsystem.
Expand Down

0 comments on commit 02630a1

Please sign in to comment.