diff options
-rw-r--r-- | fs/gfs2/quota.c | 23 | ||||
-rw-r--r-- | kernel/printk.c | 1 |
2 files changed, 4 insertions, 20 deletions
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c index 1892b29ec98d..3ca65c37c354 100644 --- a/fs/gfs2/quota.c +++ b/fs/gfs2/quota.c | |||
@@ -41,7 +41,6 @@ | |||
41 | #include <linux/spinlock.h> | 41 | #include <linux/spinlock.h> |
42 | #include <linux/completion.h> | 42 | #include <linux/completion.h> |
43 | #include <linux/buffer_head.h> | 43 | #include <linux/buffer_head.h> |
44 | #include <linux/tty.h> | ||
45 | #include <linux/sort.h> | 44 | #include <linux/sort.h> |
46 | #include <linux/fs.h> | 45 | #include <linux/fs.h> |
47 | #include <linux/gfs2_ondisk.h> | 46 | #include <linux/gfs2_ondisk.h> |
@@ -929,25 +928,11 @@ void gfs2_quota_unlock(struct gfs2_inode *ip) | |||
929 | static int print_message(struct gfs2_quota_data *qd, char *type) | 928 | static int print_message(struct gfs2_quota_data *qd, char *type) |
930 | { | 929 | { |
931 | struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd; | 930 | struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd; |
932 | char *line; | ||
933 | int len; | ||
934 | 931 | ||
935 | line = kmalloc(MAX_LINE, GFP_KERNEL); | 932 | printk(KERN_INFO "GFS2: fsid=%s: quota %s for %s %u\r\n", |
936 | if (!line) | 933 | sdp->sd_fsname, type, |
937 | return -ENOMEM; | 934 | (test_bit(QDF_USER, &qd->qd_flags)) ? "user" : "group", |
938 | 935 | qd->qd_id); | |
939 | len = snprintf(line, MAX_LINE-1, | ||
940 | "GFS2: fsid=%s: quota %s for %s %u\r\n", | ||
941 | sdp->sd_fsname, type, | ||
942 | (test_bit(QDF_USER, &qd->qd_flags)) ? "user" : "group", | ||
943 | qd->qd_id); | ||
944 | line[MAX_LINE-1] = 0; | ||
945 | |||
946 | if (current->signal) { /* Is this test still required? */ | ||
947 | tty_write_message(current->signal->tty, line); | ||
948 | } | ||
949 | |||
950 | kfree(line); | ||
951 | 936 | ||
952 | return 0; | 937 | return 0; |
953 | } | 938 | } |
diff --git a/kernel/printk.c b/kernel/printk.c index 9772b9e8feee..39ae24d2a415 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
@@ -1040,7 +1040,6 @@ void tty_write_message(struct tty_struct *tty, char *msg) | |||
1040 | tty->driver->write(tty, msg, strlen(msg)); | 1040 | tty->driver->write(tty, msg, strlen(msg)); |
1041 | return; | 1041 | return; |
1042 | } | 1042 | } |
1043 | EXPORT_SYMBOL_GPL(tty_write_message); | ||
1044 | 1043 | ||
1045 | /* | 1044 | /* |
1046 | * printk rate limiting, lifted from the networking subsystem. | 1045 | * printk rate limiting, lifted from the networking subsystem. |