land b_release_1_4_1 onto b1_4

diff --git a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.5.patch b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.5.patch
index 053c0fb..f69e16c 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.5.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.5.patch
@@ -2357,6 +2357,15 @@ Index: linux-2.6.5-sles9/fs/ext3/ialloc.c
 ===================================================================
 --- linux-2.6.5-sles9.orig/fs/ext3/ialloc.c    2005-02-23 01:01:52.366281264 +0300
 +++ linux-2.6.5-sles9/fs/ext3/ialloc.c 2005-02-23 01:02:37.398435336 +0300
+@@ -566,7 +566,7 @@ repeat:
+       ei->i_dir_start_lookup = 0;
+       ei->i_disksize = 0;
+ 
+-      ei->i_flags = EXT3_I(dir)->i_flags & ~EXT3_INDEX_FL;
++      ei->i_flags = EXT3_I(dir)->i_flags & ~(EXT3_INDEX_FL|EXT3_EXTENTS_FL);
+       if (S_ISLNK(mode))
+               ei->i_flags &= ~(EXT3_IMMUTABLE_FL|EXT3_APPEND_FL);
+       /* dirsync only applies to directories */
 @@ -647,6 +647,18 @@
                DQUOT_FREE_INODE(inode);
                goto fail2;

diff --git a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.9-rhel4.patch b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.9-rhel4.patch
index 02745cc..c8fc99a 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.9-rhel4.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.9-rhel4.patch
@@ -2354,6 +2354,15 @@ Index: linux-stage/fs/ext3/ialloc.c
 ===================================================================
 --- linux-stage.orig/fs/ext3/ialloc.c  2005-02-25 14:50:50.304202816 +0200
 +++ linux-stage/fs/ext3/ialloc.c       2005-02-25 15:33:48.920193600 +0200
+@@ -566,7 +566,7 @@ repeat:
+       ei->i_dir_start_lookup = 0;
+       ei->i_disksize = 0;
+ 
+-      ei->i_flags = EXT3_I(dir)->i_flags & ~EXT3_INDEX_FL;
++      ei->i_flags = EXT3_I(dir)->i_flags & ~(EXT3_INDEX_FL|EXT3_EXTENTS_FL);
+       if (S_ISLNK(mode))
+               ei->i_flags &= ~(EXT3_IMMUTABLE_FL|EXT3_APPEND_FL);
+       /* dirsync only applies to directories */
 @@ -646,6 +646,18 @@
                DQUOT_FREE_INODE(inode);
                goto fail2;

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 40edd50..f384263 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -14,7 +14,7 @@
        - init scripts are now turned off by default; run chkconfig --on
          lustre and chkconfig --on lustrefs to use them
 
-2005-03-18  Cluster File Systems, Inc. <info@clusterfs.com>
+2005-03-22  Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.4.1
        * bug fixes
        - don't LASSERT in ll_release on NULL lld with NFS export (4655, 5760)
@@ -35,13 +35,14 @@
        - shutdown --force/--failover stability (3607,3651,4797,5203,4834)
        - Do not leak request if server was not able to process it (5154)
        - If mds_open unable to find parent dir, make that negative lookup(5154)
+       - don't create new directories with extent-mapping (5909, 5936)
        * miscellania
        - fix lustre/lustrefs init scripts for SuSE (patch from Scali, 5702)
        - don't hold the pinger_sem in ptlrpc_pinger_sending_on_import
        - change obd_increase_kms to obd_adjust_kms (up or down) (5654)
        - lconf, lmc search both /usr/lib and /usr/lib64 for Python libs (5800)
        - support for RHEL4 kernel on i686 (5773)
-       - provide error messages when incompatible logs are encountered (5898)
+        - provide error messages when incompatible logs are encountered (5898)
 
 2005-02-18  Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.4.0.10 (1.4.1 release candidate 1)
@@ -80,6 +81,7 @@
        - align r/w RPCs to PTLRPC_MAX_BRW_SIZE boundaries for performance
        - allow readahead allocations to fail when low on memory (5383)
        - mmap locking landed again, after considerable improvement (2828)
+       - add get_hostaddr() to lustreDB.py for LDAP support (5459)
 
 2004-11-23  Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.4.0

diff --git a/lustre/kernel_patches/kernel_configs/config-linux-2.4.24-uml b/lustre/kernel_patches/kernel_configs/config-linux-2.4.24-uml
deleted file mode 100644 (file)
index 8ffa9c8..0000000
--- a/lustre/kernel_patches/kernel_configs/config-linux-2.4.24-uml
+++ /dev/null
@@ -1,413 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_USERMODE=y
-# CONFIG_ISA is not set
-# CONFIG_SBUS is not set
-# CONFIG_PCI is not set
-CONFIG_UID16=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-
-#
-# General Setup
-#
-CONFIG_MODE_SKAS=y
-CONFIG_MODE_TT=y
-CONFIG_NET=y
-CONFIG_SYSVIPC=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_SYSCTL=y
-CONFIG_BINFMT_AOUT=y
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_MISC=y
-CONFIG_HOSTFS=y
-CONFIG_HPPFS=y
-CONFIG_MCONSOLE=y
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_HOST_2G_2G is not set
-# CONFIG_UML_SMP is not set
-# CONFIG_SMP is not set
-CONFIG_NEST_LEVEL=0
-CONFIG_KERNEL_HALF_GIGS=1
-# CONFIG_HIGHMEM is not set
-CONFIG_PROC_MM=y
-CONFIG_KERNEL_STACK_ORDER=2
-CONFIG_UML_REAL_TIME_CLOCK=y
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-# CONFIG_KMOD is not set
-
-#
-# Character Devices
-#
-CONFIG_STDIO_CONSOLE=y
-CONFIG_SSL=y
-CONFIG_FD_CHAN=y
-CONFIG_NULL_CHAN=y
-CONFIG_PORT_CHAN=y
-CONFIG_PTY_CHAN=y
-CONFIG_TTY_CHAN=y
-CONFIG_XTERM_CHAN=y
-CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
-CONFIG_CON_CHAN="xterm"
-CONFIG_SSL_CHAN="pty"
-CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX98_PTY_COUNT=256
-# CONFIG_WATCHDOG is not set
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_UML_WATCHDOG is not set
-# CONFIG_UML_SOUND is not set
-# CONFIG_SOUND is not set
-# CONFIG_HOSTAUDIO is not set
-# CONFIG_TTY_LOG is not set
-
-#
-# Block Devices
-#
-CONFIG_BLK_DEV_UBD=y
-# CONFIG_BLK_DEV_UBD_SYNC is not set
-CONFIG_COW=y
-CONFIG_COW_COMMON=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_NBD=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_MMAPPER is not set
-CONFIG_NETDEVICES=y
-
-#
-# Network Devices
-#
-CONFIG_UML_NET=y
-CONFIG_UML_NET_ETHERTAP=y
-CONFIG_UML_NET_TUNTAP=y
-CONFIG_UML_NET_SLIP=y
-CONFIG_UML_NET_SLIRP=y
-CONFIG_UML_NET_DAEMON=y
-CONFIG_UML_NET_MCAST=y
-# CONFIG_UML_NET_PCAP is not set
-CONFIG_DUMMY=y
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-CONFIG_TUN=y
-CONFIG_PPP=y
-# CONFIG_PPP_MULTILINK is not set
-# CONFIG_PPP_FILTER is not set
-# CONFIG_PPP_ASYNC is not set
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PPP_DEFLATE is not set
-# CONFIG_PPP_BSDCOMP is not set
-# CONFIG_PPPOE is not set
-CONFIG_SLIP=y
-# CONFIG_SLIP_COMPRESSED is not set
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-# CONFIG_NETLINK_DEV is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_FILTER is not set
-CONFIG_UNIX=y
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-# CONFIG_INET_ECN is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_IPV6 is not set
-# CONFIG_KHTTPD is not set
-
-#
-#    SCTP Configuration (EXPERIMENTAL)
-#
-CONFIG_IPV6_SCTP__=y
-# CONFIG_IP_SCTP is not set
-# CONFIG_ATM is not set
-# CONFIG_VLAN_8021Q is not set
-
-#
-#  
-#
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-
-#
-# Appletalk devices
-#
-# CONFIG_DEV_APPLETALK is not set
-# CONFIG_DECNET is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_LLC is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_FASTROUTE is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-
-#
-# File systems
-#
-CONFIG_QUOTA=y
-# CONFIG_QFMT_V2 is not set
-CONFIG_AUTOFS_FS=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_REISERFS_FS=y
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_ADFS_FS_RW is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BEFS_DEBUG is not set
-# CONFIG_BFS_FS is not set
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_XATTR_SHARING=y
-CONFIG_EXT3_FS_XATTR_USER=y
-CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_UMSDOS_FS=y
-CONFIG_VFAT_FS=y
-# CONFIG_EFS_FS is not set
-CONFIG_JFFS_FS=y
-CONFIG_JFFS_FS_VERBOSE=0
-CONFIG_JFFS_PROC_FS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_CRAMFS is not set
-# CONFIG_TMPFS is not set
-CONFIG_RAMFS=y
-CONFIG_ISO9660_FS=y
-# CONFIG_JOLIET is not set
-# CONFIG_ZISOFS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_MINIX_FS=y
-# CONFIG_VXFS_FS is not set
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
-# CONFIG_HPFS_FS is not set
-CONFIG_PROC_FS=y
-CONFIG_DEVFS_FS=y
-CONFIG_DEVFS_MOUNT=y
-# CONFIG_DEVFS_DEBUG is not set
-CONFIG_DEVPTS_FS=y
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX4FS_RW is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_XATTR_SHARING=y
-CONFIG_EXT2_FS_XATTR_USER=y
-# CONFIG_SYSV_FS is not set
-# CONFIG_UDF_FS is not set
-# CONFIG_UDF_RW is not set
-# CONFIG_UFS_FS is not set
-# CONFIG_UFS_FS_WRITE is not set
-
-#
-# Network File Systems
-#
-# CONFIG_CODA_FS is not set
-# CONFIG_INTERMEZZO_FS is not set
-# CONFIG_NFS_FS is not set
-# CONFIG_NFS_V3 is not set
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_ROOT_NFS is not set
-# CONFIG_NFSD is not set
-# CONFIG_NFSD_V3 is not set
-# CONFIG_NFSD_TCP is not set
-# CONFIG_SUNRPC is not set
-# CONFIG_LOCKD is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
-# CONFIG_NCPFS_NFS_NS is not set
-# CONFIG_NCPFS_OS2_NS is not set
-# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_NLS is not set
-# CONFIG_NCPFS_EXTRAS is not set
-# CONFIG_ZISOFS_FS is not set
-CONFIG_FS_MBCACHE=y
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_SMB_NLS is not set
-CONFIG_NLS=y
-
-#
-# Native Language Support
-#
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ISO8859_1 is not set
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-
-#
-# SCSI support
-#
-# CONFIG_SCSI is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-# CONFIG_BLK_DEV_MD is not set
-# CONFIG_MD_LINEAR is not set
-# CONFIG_MD_RAID0 is not set
-# CONFIG_MD_RAID1 is not set
-# CONFIG_MD_RAID5 is not set
-# CONFIG_MD_MULTIPATH is not set
-# CONFIG_BLK_DEV_LVM is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_PARTITIONS is not set
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_JEDECPROBE is not set
-# CONFIG_MTD_GEN_PROBE is not set
-# CONFIG_MTD_CFI_INTELEXT is not set
-# CONFIG_MTD_CFI_AMDSTD is not set
-# CONFIG_MTD_CFI_STAA is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
-# CONFIG_MTD_AMDSTD is not set
-# CONFIG_MTD_SHARP is not set
-# CONFIG_MTD_JEDEC is not set
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PCI is not set
-# CONFIG_MTD_PCMCIA is not set
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-CONFIG_MTD_BLKMTD=y
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC1000 is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOCPROBE is not set
-
-#
-# NAND Flash Device Drivers
-#
-# CONFIG_MTD_NAND is not set
-
-#
-# Library routines
-#
-# CONFIG_CRC32 is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-
-#
-# Kernel hacking
-#
-# CONFIG_DEBUG_SLAB is not set
-CONFIG_DEBUGSYM=y
-CONFIG_PT_PROXY=y
-# CONFIG_GPROF is not set
-# CONFIG_GCOV is not set

diff --git a/lustre/kernel_patches/patches/ext3-extents-2.4.21-chaos.patch b/lustre/kernel_patches/patches/ext3-extents-2.4.21-chaos.patch
index c392ac9..3b4d07b 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-extents-2.4.21-chaos.patch
+++ b/lustre/kernel_patches/patches/ext3-extents-2.4.21-chaos.patch
@@ -2319,6 +2319,15 @@ Index: linux-2.4.21-rhel/fs/ext3/ialloc.c
 ===================================================================
 --- linux-2.4.21-rhel.orig/fs/ext3/ialloc.c    2005-03-04 00:44:34.000000000 +0300
 +++ linux-2.4.21-rhel/fs/ext3/ialloc.c 2005-03-04 00:44:35.000000000 +0300
+@@ -553,7 +553,7 @@ repeat:
+       inode->i_blksize = PAGE_SIZE;
+       inode->i_blocks = 0;
+       inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+-      ei->i_flags = EXT3_I(dir)->i_flags & ~EXT3_INDEX_FL;
++      ei->i_flags = EXT3_I(dir)->i_flags & ~(EXT3_INDEX_FL|EXT3_EXTENTS_FL);
+       if (S_ISLNK(mode))
+               ei->i_flags &= ~(EXT3_IMMUTABLE_FL|EXT3_APPEND_FL);
+ #ifdef EXT3_FRAGMENTS
 @@ -596,6 +596,19 @@
                iloc.bh = NULL;
                goto fail;

diff --git a/lustre/kernel_patches/patches/ext3-extents-2.4.21-suse2.patch b/lustre/kernel_patches/patches/ext3-extents-2.4.21-suse2.patch
index 7cfd7ee..eb295e1 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-extents-2.4.21-suse2.patch
+++ b/lustre/kernel_patches/patches/ext3-extents-2.4.21-suse2.patch
@@ -2310,6 +2310,16 @@ Index: linux-2.4.21-suse2/fs/ext3/ialloc.c
 ===================================================================
 --- linux-2.4.21-suse2.orig/fs/ext3/ialloc.c   2004-11-02 20:31:37.000000000 +0300
 +++ linux-2.4.21-suse2/fs/ext3/ialloc.c        2004-11-02 20:34:00.000000000 +0300
+@@ -553,7 +553,8 @@ repeat:
+       inode->i_blksize = PAGE_SIZE;
+       inode->i_blocks = 0;
+       inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+-      inode->u.ext3_i.i_flags = dir->u.ext3_i.i_flags & ~EXT3_INDEX_FL;
++      inode->u.ext3_i.i_flags = dir->u.ext3_i.i_flags &
++              ~(EXT3_INDEX_FL | EXT3_EXTENTS_FL);
+       if (S_ISLNK(mode))
+               inode->u.ext3_i.i_flags &= ~(EXT3_IMMUTABLE_FL|EXT3_APPEND_FL);
+ #ifdef EXT3_FRAGMENTS
 @@ -592,6 +592,19 @@
                iloc.bh = NULL;
                goto fail;

diff --git a/lustre/kernel_patches/patches/ext3-extents-2.4.24.patch b/lustre/kernel_patches/patches/ext3-extents-2.4.24.patch
index 1ad7c36..81dc7ad 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-extents-2.4.24.patch
+++ b/lustre/kernel_patches/patches/ext3-extents-2.4.24.patch
@@ -2309,6 +2309,16 @@ Index: linux-2.4.24/fs/ext3/ialloc.c
 ===================================================================
 --- linux-2.4.24.orig/fs/ext3/ialloc.c 2004-11-02 20:28:32.000000000 +0300
 +++ linux-2.4.24/fs/ext3/ialloc.c      2004-11-02 20:32:17.000000000 +0300
+@@ -553,7 +553,8 @@ repeat:
+       inode->i_blksize = PAGE_SIZE;
+       inode->i_blocks = 0;
+       inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+-      inode->u.ext3_i.i_flags = dir->u.ext3_i.i_flags & ~EXT3_INDEX_FL;
++      inode->u.ext3_i.i_flags = dir->u.ext3_i.i_flags &
++              ~(EXT3_INDEX_FL | EXT3_EXTENTS_FL);
+       if (S_ISLNK(mode))
+               inode->u.ext3_i.i_flags &= ~(EXT3_IMMUTABLE_FL|EXT3_APPEND_FL);
+ #ifdef EXT3_FRAGMENTS
 @@ -592,6 +592,19 @@
                iloc.bh = NULL;
                goto fail;

diff --git a/lustre/kernel_patches/patches/ext3-extents-2.6.5.patch b/lustre/kernel_patches/patches/ext3-extents-2.6.5.patch
index 053c0fb..f69e16c 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-extents-2.6.5.patch
+++ b/lustre/kernel_patches/patches/ext3-extents-2.6.5.patch
@@ -2357,6 +2357,15 @@ Index: linux-2.6.5-sles9/fs/ext3/ialloc.c
 ===================================================================
 --- linux-2.6.5-sles9.orig/fs/ext3/ialloc.c    2005-02-23 01:01:52.366281264 +0300
 +++ linux-2.6.5-sles9/fs/ext3/ialloc.c 2005-02-23 01:02:37.398435336 +0300
+@@ -566,7 +566,7 @@ repeat:
+       ei->i_dir_start_lookup = 0;
+       ei->i_disksize = 0;
+ 
+-      ei->i_flags = EXT3_I(dir)->i_flags & ~EXT3_INDEX_FL;
++      ei->i_flags = EXT3_I(dir)->i_flags & ~(EXT3_INDEX_FL|EXT3_EXTENTS_FL);
+       if (S_ISLNK(mode))
+               ei->i_flags &= ~(EXT3_IMMUTABLE_FL|EXT3_APPEND_FL);
+       /* dirsync only applies to directories */
 @@ -647,6 +647,18 @@
                DQUOT_FREE_INODE(inode);
                goto fail2;

diff --git a/lustre/kernel_patches/patches/ext3-extents-2.6.9-rhel4.patch b/lustre/kernel_patches/patches/ext3-extents-2.6.9-rhel4.patch
index 02745cc..c8fc99a 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-extents-2.6.9-rhel4.patch
+++ b/lustre/kernel_patches/patches/ext3-extents-2.6.9-rhel4.patch
@@ -2354,6 +2354,15 @@ Index: linux-stage/fs/ext3/ialloc.c
 ===================================================================
 --- linux-stage.orig/fs/ext3/ialloc.c  2005-02-25 14:50:50.304202816 +0200
 +++ linux-stage/fs/ext3/ialloc.c       2005-02-25 15:33:48.920193600 +0200
+@@ -566,7 +566,7 @@ repeat:
+       ei->i_dir_start_lookup = 0;
+       ei->i_disksize = 0;
+ 
+-      ei->i_flags = EXT3_I(dir)->i_flags & ~EXT3_INDEX_FL;
++      ei->i_flags = EXT3_I(dir)->i_flags & ~(EXT3_INDEX_FL|EXT3_EXTENTS_FL);
+       if (S_ISLNK(mode))
+               ei->i_flags &= ~(EXT3_IMMUTABLE_FL|EXT3_APPEND_FL);
+       /* dirsync only applies to directories */
 @@ -646,6 +646,18 @@
                DQUOT_FREE_INODE(inode);
                goto fail2;

diff --git a/lustre/kernel_patches/patches/uml_malloc_fix.patch b/lustre/kernel_patches/patches/uml_malloc_fix.patch
deleted file mode 100644 (file)
index cba2993..0000000
--- a/lustre/kernel_patches/patches/uml_malloc_fix.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- uml-2.4/arch/um/kernel/process_kern.c.orig 2004-04-15 23:26:49.000000000 +0300
-+++ uml-2.4/arch/um/kernel/process_kern.c      2004-04-15 23:49:38.312250576 +0300
-@@ -16,6 +16,7 @@
- #include "linux/module.h"
- #include "linux/init.h"
- #include "linux/capability.h"
-+#include "linux/vmalloc.h"
- #include "asm/unistd.h"
- #include "asm/mman.h"
- #include "asm/segment.h"
-@@ -279,6 +280,11 @@ void *um_kmalloc(int size)
-       return(kmalloc(size, GFP_KERNEL));
- }
- 
-+void *um_vmalloc(int size)
-+{
-+      return(vmalloc(size));
-+}
-+
- void *um_kmalloc_atomic(int size)
- {
-       return(kmalloc(size, GFP_ATOMIC));
---- uml-2.4/arch/um/main.c.orig        2004-04-15 23:58:28.786606216 +0300
-+++ uml-2.4/arch/um/main.c     2004-04-15 23:53:32.706617216 +0300
-@@ -161,7 +161,7 @@ extern void *__real_malloc(int);
- void *__wrap_malloc(int size)
- {
-       if(CAN_KMALLOC())
--              return(um_kmalloc(size));
-+              return(um_vmalloc(size));
-       else
-               return(__real_malloc(size));
- }
-@@ -179,7 +179,7 @@ extern void __real_free(void *);
- 
- void __wrap_free(void *ptr)
- {
--      if(CAN_KMALLOC()) kfree(ptr);
-+      if(CAN_KMALLOC()) vfree(ptr);
-       else __real_free(ptr);
- }
- 
---- uml-2.4/arch/um/include/user.h.orig        2004-04-15 23:41:57.000000000 +0300
-+++ uml-2.4/arch/um/include/user.h     2004-04-15 23:41:34.000000000 +0300
-@@ -12,6 +12,7 @@ extern void schedule(void);
- extern void *um_kmalloc(int size);
- extern void *um_kmalloc_atomic(int size);
- extern void kfree(void *ptr);
-+extern void vfree(void *ptr);
- extern int in_aton(char *str);
- extern int open_gdb_chan(void);
- 
-
-

diff --git a/lustre/kernel_patches/series/vanilla-2.4.24 b/lustre/kernel_patches/series/vanilla-2.4.24
index 3dd0d43..9d16d81 100644 (file)
--- a/lustre/kernel_patches/series/vanilla-2.4.24
+++ b/lustre/kernel_patches/series/vanilla-2.4.24
@@ -43,4 +43,3 @@ export-show_task-2.4-vanilla.patch
 export-zap-page-range.patch
 uml-sigusr1-2.4-vanilla.patch 
 remove-suid-2.4-rhel.patch
-uml_malloc_fix.patch

diff --git a/lustre/tests/local.sh b/lustre/tests/local.sh
index 5812c97..156ee6b 100755 (executable)
--- a/lustre/tests/local.sh
+++ b/lustre/tests/local.sh
@@ -40,11 +40,8 @@ ${LMC} --add mds --node localhost --mds mds1 --fstype $FSTYPE \
 # configure ost
 ${LMC} -m $config --add lov --lov lov1 --mds mds1 --stripe_sz $STRIPE_BYTES \
        --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0 $LOVOPT || exit 20
-# only specify "--mkfsoptions='-i 8192'" here because test fs is so small,
-# on a real fs this is not needed unless all files tiny with many stripes
 ${LMC} --add ost --nspath /mnt/ost_ns --node localhost --lov lov1 \
-       --fstype $FSTYPE --dev $OSTDEV --size $OSTSIZE \
-       --mkfsoptions="-i 8192" $JARG $OSTOPT || exit 30
+       --fstype $FSTYPE --dev $OSTDEV --size $OSTSIZE $JARG $OSTOPT || exit 30
 
 # create client config
 ${LMC} --add mtpt --node localhost --path $MOUNT --mds mds1 --lov lov1 \

diff --git a/lustre/tests/lov.sh b/lustre/tests/lov.sh
index dd782c6..e9ddfa7 100755 (executable)
--- a/lustre/tests/lov.sh
+++ b/lustre/tests/lov.sh
@@ -50,11 +50,8 @@ for num in `seq $OSTCOUNT`; do
     OST=ost$num
     DEVPTR=OSTDEV$num
     eval $DEVPTR=${!DEVPTR:=$TMP/$OST-`hostname`}
-    # only specify "--mkfsoptions='-i 8192'" here because test fs is so small,
-    # on a real fs this is not needed unless all files tiny with many stripes
     ${LMC} --add ost --node localhost --lov lov1 --ost $OST --fstype $FSTYPE \
-       --dev ${!DEVPTR} --size $OSTSIZE --mkfsoptions="-i 8192" \
-       $JARG $OSTOPT || exit 30
+       --dev ${!DEVPTR} --size $OSTSIZE $JARG $OSTOPT || exit 30
 done
 
 

diff --git a/lustre/utils/lconf b/lustre/utils/lconf
index 2343844..7f1939c 100755 (executable)
--- a/lustre/utils/lconf
+++ b/lustre/utils/lconf
@@ -972,8 +972,11 @@ def def_mount_options(fstype, target):
     """returns deafult mount options for passed fstype and target (mds, ost)"""
     if fstype == 'ext3' or fstype == 'ldiskfs':
         mountfsoptions = "errors=remount-ro"
-        if target == 'ost' and sys_get_branch() == '2.4':
-            mountfsoptions = "%s,asyncdel" % (mountfsoptions)
+        if target == 'ost':
+            if sys_get_branch() == '2.4':
+                mountfsoptions = "%s,asyncdel" % (mountfsoptions)
+            #else:
+            #    mountfsoptions = "%s,extents,mballoc" % (mountfsoptions)
         return mountfsoptions
     return ""