# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.592   -> 1.593  
#	 fs/reiserfs/super.c	1.23    -> 1.24   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/09/09	alan@lxorguk.ukuu.org.uk	1.587.1.34
# [PATCH] PATCH: remove bogoprintk, add LBA28 to paride
# 
# --------------------------------------------
# 02/09/09	alan@lxorguk.ukuu.org.uk	1.587.1.35
# [PATCH] PATCHL make i845 gart recover after suspend
# 
# --------------------------------------------
# 02/09/09	alan@lxorguk.ukuu.org.uk	1.587.1.36
# [PATCH] PATCH: enable amd watchdog in config.in
# 
# --------------------------------------------
# 02/09/09	alan@lxorguk.ukuu.org.uk	1.587.1.37
# [PATCH] PATCH: makefile for amd tco
# 
# --------------------------------------------
# 02/09/09	alan@lxorguk.ukuu.org.uk	1.587.1.38
# [PATCH] PATCH: fix missing checks in video1394
# 
# --------------------------------------------
# 02/09/09	alan@lxorguk.ukuu.org.uk	1.587.1.39
# [PATCH] PATCH: more irda __FUNCTION__ stuff
# 
# --------------------------------------------
# 02/09/09	alan@lxorguk.ukuu.org.uk	1.587.1.40
# [PATCH] PATCH: fix sisfb errors
# 
# --------------------------------------------
# 02/09/09	alan@lxorguk.ukuu.org.uk	1.587.1.41
# [PATCH] PATCH: IRDA function stuff
# 
# --------------------------------------------
# 02/09/09	alan@lxorguk.ukuu.org.uk	1.587.1.42
# [PATCH] PATCH: further khttpd updates
# 
# --------------------------------------------
# 02/09/09	neilb@cse.unsw.edu.au	1.587.1.43
# [PATCH] PATCH - kNFSd - More small fixes for TCP nfsd
# 
# sk_inuse should be bigger than "char" as we can
# have more than 255 server threads.  Due to the way the count
# is used, this is unlikely to actually cause a problem, but it
# should nonetheless be fixed.
# 
# Also, two printk generate more noise than we would like,
# so turn them into dprintk (debugging printk).
# 
# 
# 
#  ----------- Diffstat output ------------
#  ./include/linux/sunrpc/svcsock.h |    2 +-
#  ./net/sunrpc/svcsock.c           |   11 +++++------
#  2 files changed, 6 insertions(+), 7 deletions(-)
# --------------------------------------------
# 02/09/09	kkeil@suse.de	1.587.1.44
# [PATCH] Fixup Eicon Diva support
# 
# Here a cleanup patch against 2.4.20-pre5.
# 
# * add the missing hunks for the Diva202 detection code
# * adjust md5sums.
# * removes also some comment markers from the development process,
#   which were included in the original patch by a mistake of me
# --------------------------------------------
# 02/09/09	marcelo@plucky.distro.conectiva	1.587.1.45
# Merge master.kernel.org:/home/davem/BK/sparc-2.4
# into plucky.distro.conectiva:/home/marcelo/bk/linux-2.4
# --------------------------------------------
# 02/09/09	marcelo@plucky.distro.conectiva	1.587.1.46
# Merge master.kernel.org:/home/davem/BK/net-2.4
# into plucky.distro.conectiva:/home/marcelo/bk/linux-2.4
# --------------------------------------------
# 02/09/10	green@angband.namesys.com	1.593
# reiserfs: Fix a problem with delayed unlinks and remounting RW filesystem RW.
# --------------------------------------------
#
diff -Nru a/fs/reiserfs/super.c b/fs/reiserfs/super.c
--- a/fs/reiserfs/super.c	Tue Sep 10 13:49:47 2002
+++ b/fs/reiserfs/super.c	Tue Sep 10 13:49:47 2002
@@ -664,7 +664,7 @@
   }
 
   if (*mount_flags & MS_RDONLY) {
-    /* remount rean-only */
+    /* remount read-only */
     if (s->s_flags & MS_RDONLY)
       /* it is read-only already */
       return 0;
@@ -680,6 +680,10 @@
     journal_mark_dirty(&th, s, SB_BUFFER_WITH_SB (s));
     s->s_dirt = 0;
   } else {
+    /* remount read-write */
+    if (!(s->s_flags & MS_RDONLY))
+	return 0; /* We are read-write already */
+
     s->u.reiserfs_sb.s_mount_state = sb_state(rs) ;
     s->s_flags &= ~MS_RDONLY ; /* now it is safe to call journal_begin */
     journal_begin(&th, s, 10) ;

.