1 files changed, 7 insertions, 2 deletions

diff --git a/fs/dquot.c b/fs/dquot.c
index 81d87a413c68..9af789567e51 100644
--- a/fs/dquot.c
+++ b/fs/dquot.c
@@ -250,7 +250,7 @@ static inline struct dquot *find_dquot(unsigned int hashent, struct super_block
 /* Add a dquot to the tail of the free list */
 static inline void put_dquot_last(struct dquot *dquot)
 {
-        list_add(&dquot->dq_free, free_dquots.prev);
+        list_add_tail(&dquot->dq_free, &free_dquots);
         dqstats.free_dquots++;
 }
 
@@ -266,7 +266,7 @@ static inline void put_inuse(struct dquot *dquot)
 {
         /* We add to the back of inuse list so we don't have to restart
          * when traversing this list and we block */
-        list_add(&dquot->dq_inuse, inuse_list.prev);
+        list_add_tail(&dquot->dq_inuse, &inuse_list);
         dqstats.allocated_dquots++;
 }
 
@@ -834,6 +834,9 @@ static void print_warning(struct dquot *dquot, const char warntype)
         if (!need_print_warning(dquot) || (flag && test_and_set_bit(flag, &dquot->dq_flags)))
                 return;
 
+        mutex_lock(&tty_mutex);
+        if (!current->signal->tty)
+                goto out_lock;
         tty_write_message(current->signal->tty, dquot->dq_sb->s_id);
         if (warntype == ISOFTWARN || warntype == BSOFTWARN)
                 tty_write_message(current->signal->tty, ": warning, ");
@@ -861,6 +864,8 @@ static void print_warning(struct dquot *dquot, const char warntype)
                         break;
         }
         tty_write_message(current->signal->tty, msg);
+out_lock:
+        mutex_unlock(&tty_mutex);
 }
 
 static inline void flush_warnings(struct dquot **dquots, char *warntype)