# 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.589   -> 1.590  
#	 fs/reiserfs/super.c	1.22    -> 1.23   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/09/03	davem@nuts.ninka.net	1.587.11.6
# [TIGON3]: When not low-power, only set GPIO enables in lclctrl on 5700 chips
# --------------------------------------------
# 02/09/03	davem@nuts.ninka.net	1.587.9.8
# arch/sparc64/lib/VIScsum.S: Do not use VIS on oddly aligned buffer.
# --------------------------------------------
# 02/09/03	davem@nuts.ninka.net	1.587.12.11
# drivers/net/ppp_generic.c: Revert my idiotic unaligned SKB changes.
# --------------------------------------------
# 02/09/03	davem@nuts.ninka.net	1.587.9.9
# arch/sparc64/lib/VIScsum.S: Fix endianness bugs in previous change.
# --------------------------------------------
# 02/09/03	davem@nuts.ninka.net	1.587.9.10
# arch/sparc64/kernel/ioctl32.c: Frob cmd in PPPIOCS{PASS,ACTIVE}.
# --------------------------------------------
# 02/09/04	bmatheny@purdue.edu	1.587.10.27
# [PATCH] Lexar USB CF Reader
# 
# Two weeks ago I sent this patch to the listed USB storage maintainer
# (mdharm-usb@one-eyed-alien.net) and have not yet heard back. The
# attached patch adds support for the Lexar USB CF Reader identified by
# id_product 0xb002, version 0x0113 (which is the version I have). This
# patch is against the 2.4.19 kernel, sorry if this is the wrong address
# to send this stuff to. Thanks.
# --------------------------------------------
# 02/09/04	petkan@users.sourceforge.net	1.587.10.28
# [PATCH] USB: pegasus driver patch
# 
#   forgotten flag
# --------------------------------------------
# 02/09/05	cel@citi.umich.edu	1.587.1.27
# [PATCH] prevent oops in xprt_lock_write, against 2.4.20
# 
# hi marcelo-
# 
# when several RPC requests want to reconnect a TCP transport socket at
# once, xprt_lock_write serializes the tasks to prevent multiple socket
# connects.  however, TCP connects are always done by a RPC child task that
# has no request slot.  xprt_lock_write can oops if there is no request slot
# allocated to the invoking RPC task.  reviewed and accepted by Trond.
# 
# i had thought the 2.5.32 patch wouldn't apply to 2.4.20, but Trond pointed
# out to me that his xprt_lock_write patches snuck into 2.4.20-pre5, which i
# hadn't noticed.
# --------------------------------------------
# 02/09/09	davem@nuts.ninka.net	1.587.11.7
# [TIGON3]: Merge TSO code from 2.5.x driver, disabled in 2.4.x
# --------------------------------------------
# 02/09/09	davem@nuts.ninka.net	1.587.12.12
# [TCP]: Delay tstamp state commit in input fast path until we verify csum.
# --------------------------------------------
# 02/09/09	davem@nuts.ninka.net	1.587.11.8
# Merge nuts.ninka.net:/home/davem/src/BK/tg3-2.4
# into nuts.ninka.net:/home/davem/src/BK/net-2.4
# --------------------------------------------
# 02/09/09	viro@math.psu.edu	1.587.1.28
# [PATCH] handle_initrd() and request_module()
# 
# 	Makes sure that during linuxrc execution (future) init has sane
# root and cwd - instead of doing chdir before linuxrc we do open before
# and fchdir after.
# 
# 	Current code becomes a problem if linuxrc triggers demand-loading
# of modules (rather than exlicit insmod), since request_module() sets
# root/cwd or modprobe to that of init.  I.e. we really want the task with
# PID 1 to have root and cwd set to root of initrd for the duration of
# linuxrc.
# --------------------------------------------
# 02/09/09	sct@redhat.com	1.587.1.29
# [PATCH] 2.4.20-pre4/ext3: Fix O_SYNC for non-data-journaled
# 
# Patch now fixed up to avoid conflicting with hch's b_inode cleanup:
# 
# ext3 has its own code which marks buffers dirty, in addition to the setting
# done by the core generic_commit_write code.  However, the core code does
# 
#                         if (!atomic_set_buffer_dirty(bh)) {
#                                 __mark_dirty(bh);
#                                 buffer_insert_inode_queue(bh, inode);
# 
# so if ext3 marks the buffer dirty itself, the core fails to put it on the
# per-inode list of dirty buffers.  Hence, fsync_inode_buffers() misses it.
# 
# The fix is to let ext3 put the buffer on the inode queue manually when
# walking the page's buffer lists in its page write code.
# --------------------------------------------
# 02/09/09	marcelo@plucky.distro.conectiva	1.587.1.30
# Merge bk://linuxusb.bkbits.net/marcelo-2.4
# into plucky.distro.conectiva:/home/marcelo/bk/linux-2.4
# --------------------------------------------
# 02/09/09	paulkf@microgate.com	1.587.1.31
# [PATCH] Configure.help (synclinkmp/_cs)
# 
# The following patch contains the help sections for
# the SyncLink MP/CS drivers added to 2.4.20-pre5.
# --------------------------------------------
# 02/09/09	green@angband.namesys.com	1.590
# reiserfs: Mistakenly forgotten inode attributes option was added back.
# --------------------------------------------
#
diff -Nru a/fs/reiserfs/super.c b/fs/reiserfs/super.c
--- a/fs/reiserfs/super.c	Tue Sep 10 13:49:45 2002
+++ b/fs/reiserfs/super.c	Tue Sep 10 13:49:45 2002
@@ -569,6 +569,7 @@
 		{"hash", 'h', hash, FORCE_HASH_DETECT},
 		
 		{"resize", 'r', 0, -1},
+		{"attrs", 0, 0, REISERFS_ATTRS},
 		{NULL, 0, 0, 0}
     };
 	

.