---- kernel-rh-2.4.18-pristine/drivers/block/blkpg.c Thu Jun 13 12:26:40 2002
-+++ kernel-rh-2.4.18/drivers/block/blkpg.c Thu Jun 13 14:49:48 2002
+--- linux-2.4.18-chaos2-pristine/drivers/quadrics/elan3comms/epcomms.c Fri Jun 14 09:32:47 2002
++++ linux-2.4.18-chaos2/drivers/quadrics/elan3comms/epcomms.c Sat Jun 15 09:42:32 2002
+@@ -2249,7 +2249,7 @@
+ if (EP_EVENT_FIRING (edev, txdElan + offsetof (EP_TXD_ELAN, DataEvent), txd->DataCookie, txdMain->DataEvent) && /* PCI read */
+ EP_EVENT_FIRING (edev, txdElan + offsetof (EP_TXD_ELAN, EnveEvent), txd->EnveCookie, txdMain->EnveEvent)) /* PCI read */
+ {
+- if (delay == 1)
++ if (0 /* delay == 1 */)
+ printf ("LargeTxDataEvent: events set but block copy not completed\n");
+ if (delay > EP_EVENT_FIRING_TLIMIT)
+ panic ("LargeTxDataEvent: events set but block copy not completed\n");
+@@ -2438,7 +2438,7 @@
+
+ if (EP_EVENT_FIRING (edev, rxdElan + offsetof (EP_RXD_ELAN, DataEvent), rxd->DataCookie, rxdMain->DataEvent)) /* PCI read */
+ {
+- if (delay == 1)
++ if (0 /* delay == 1 */)
+ printf ("LargeRxDataEvent: events set but block copy not completed\n");
+ if (delay > EP_EVENT_FIRING_TLIMIT)
+ panic ("LargeRxDataEvent: events set but block copy not completed\n");
+--- linux-2.4.18-chaos2-pristine/drivers/block/blkpg.c Fri Jun 14 09:32:44 2002
++++ linux-2.4.18-chaos2/drivers/block/blkpg.c Sat Jun 15 09:39:31 2002
@@ -295,3 +295,38 @@
}
+EXPORT_SYMBOL(dev_set_rdonly);
+EXPORT_SYMBOL(dev_check_rdonly);
+EXPORT_SYMBOL(dev_clear_rdonly);
---- kernel-rh-2.4.18-pristine/drivers/block/loop.c Thu Jun 13 12:26:40 2002
-+++ kernel-rh-2.4.18/drivers/block/loop.c Thu Jun 13 14:49:48 2002
+--- linux-2.4.18-chaos2-pristine/drivers/block/loop.c Fri Jun 14 09:32:44 2002
++++ linux-2.4.18-chaos2/drivers/block/loop.c Sat Jun 15 09:39:31 2002
@@ -503,6 +503,11 @@
spin_unlock_irq(&lo->lo_lock);
if (lo->lo_flags & LO_FLAGS_READ_ONLY)
goto err;
} else if (rw == READA) {
---- kernel-rh-2.4.18-pristine/drivers/ide/ide-disk.c Thu Jun 13 12:26:43 2002
-+++ kernel-rh-2.4.18/drivers/ide/ide-disk.c Thu Jun 13 14:49:48 2002
+--- linux-2.4.18-chaos2-pristine/drivers/ide/ide-disk.c Fri Jun 14 09:32:45 2002
++++ linux-2.4.18-chaos2/drivers/ide/ide-disk.c Sat Jun 15 09:39:31 2002
@@ -557,6 +557,12 @@
*/
static ide_startstop_t do_rw_disk (ide_drive_t *drive, struct request *rq, unsigned long block)
if (IDE_CONTROL_REG)
OUT_BYTE(drive->ctl,IDE_CONTROL_REG);
---- kernel-rh-2.4.18-pristine/fs/ext3/Makefile Thu Jun 13 12:27:00 2002
-+++ kernel-rh-2.4.18/fs/ext3/Makefile Thu Jun 13 14:49:48 2002
+--- linux-2.4.18-chaos2-pristine/fs/ext3/Makefile Fri Jun 14 09:32:56 2002
++++ linux-2.4.18-chaos2/fs/ext3/Makefile Sat Jun 15 09:39:31 2002
@@ -9,6 +9,8 @@
O_TARGET := ext3.o
obj-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
ioctl.o namei.o super.o symlink.o
obj-m := $(O_TARGET)
---- kernel-rh-2.4.18-pristine/fs/ext3/super.c Thu Jun 13 12:27:01 2002
-+++ kernel-rh-2.4.18/fs/ext3/super.c Thu Jun 13 14:49:48 2002
+--- linux-2.4.18-chaos2-pristine/fs/ext3/super.c Fri Jun 14 09:32:57 2002
++++ linux-2.4.18-chaos2/fs/ext3/super.c Sat Jun 15 09:39:31 2002
@@ -1746,7 +1746,7 @@
unregister_filesystem(&ext3_fs_type);
}
MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions");
---- kernel-rh-2.4.18-pristine/fs/jbd/commit.c Thu Jun 13 12:27:05 2002
-+++ kernel-rh-2.4.18/fs/jbd/commit.c Thu Jun 13 14:49:48 2002
+--- linux-2.4.18-chaos2-pristine/fs/jbd/commit.c Fri Jun 14 09:32:57 2002
++++ linux-2.4.18-chaos2/fs/jbd/commit.c Sat Jun 15 09:39:31 2002
@@ -482,7 +482,7 @@
transaction's t_log_list queue, and metadata buffers are on
the t_iobuf_list queue.
jbd_debug(3, "JBD: commit phase 7\n");
J_ASSERT(commit_transaction->t_sync_datalist == NULL);
---- kernel-rh-2.4.18-pristine/fs/jbd/journal.c Thu Jun 13 12:27:05 2002
-+++ kernel-rh-2.4.18/fs/jbd/journal.c Thu Jun 13 14:49:48 2002
+--- linux-2.4.18-chaos2-pristine/fs/jbd/journal.c Fri Jun 14 09:32:57 2002
++++ linux-2.4.18-chaos2/fs/jbd/journal.c Sat Jun 15 09:39:31 2002
@@ -58,6 +58,7 @@
#endif
EXPORT_SYMBOL(journal_flush);
EXPORT_SYMBOL(journal_init_dev);
EXPORT_SYMBOL(journal_init_inode);
---- kernel-rh-2.4.18-pristine/fs/jbd/transaction.c Thu Jun 13 12:27:05 2002
-+++ kernel-rh-2.4.18/fs/jbd/transaction.c Thu Jun 13 14:49:48 2002
+--- linux-2.4.18-chaos2-pristine/fs/jbd/transaction.c Fri Jun 14 09:32:57 2002
++++ linux-2.4.18-chaos2/fs/jbd/transaction.c Sat Jun 15 09:39:31 2002
@@ -57,6 +57,7 @@
transaction->t_state = T_RUNNING;
transaction->t_tid = journal->j_transaction_sequence++;
* If the handle is marked SYNC, we need to set another commit
* going! We also want to force a commit if the current
* transaction is occupying too much of the log, or if the
---- kernel-rh-2.4.18-pristine/include/linux/blkdev.h Thu Jun 13 12:27:14 2002
-+++ kernel-rh-2.4.18/include/linux/blkdev.h Thu Jun 13 15:18:33 2002
+--- linux-2.4.18-chaos2-pristine/include/linux/blkdev.h Fri Jun 14 09:33:01 2002
++++ linux-2.4.18-chaos2/include/linux/blkdev.h Sat Jun 15 09:55:50 2002
@@ -276,4 +276,9 @@
}
return retval;
+int dev_check_rdonly(kdev_t);
+void dev_clear_rdonly(int);
#endif
---- kernel-rh-2.4.18-pristine/include/linux/jbd.h Thu Jun 13 12:27:14 2002
-+++ kernel-rh-2.4.18/include/linux/jbd.h Thu Jun 13 15:18:35 2002
+--- linux-2.4.18-chaos2-pristine/include/linux/jbd.h Fri Jun 14 09:33:01 2002
++++ linux-2.4.18-chaos2/include/linux/jbd.h Sat Jun 15 09:55:47 2002
@@ -257,6 +257,13 @@
return bh->b_private;
}
extern void journal_lock_updates (journal_t *);
extern void journal_unlock_updates (journal_t *);
---- kernel-rh-2.4.18-pristine/kernel/ksyms.c Thu Jun 13 12:27:15 2002
-+++ kernel-rh-2.4.18/kernel/ksyms.c Thu Jun 13 14:49:48 2002
+--- linux-2.4.18-chaos2-pristine/kernel/ksyms.c Fri Jun 14 09:33:02 2002
++++ linux-2.4.18-chaos2/kernel/ksyms.c Sat Jun 15 09:39:31 2002
@@ -305,6 +305,12 @@
EXPORT_SYMBOL(lock_may_write);
EXPORT_SYMBOL(dcache_readdir);
/* for stackable file systems (lofs, wrapfs, cryptfs, etc.) */
EXPORT_SYMBOL(default_llseek);
EXPORT_SYMBOL(dentry_open);
---- kernel-rh-2.4.18/fs/nfsd/vfs.c.orig-lustre Thu Jun 13 15:28:25 2002
-+++ kernel-rh-2.4.18/fs/nfsd/vfs.c Thu Jun 13 15:28:40 2002
+--- linux-2.4.18-chaos2-pristine/include/linux/dcache.h Fri Jun 14 09:33:01 2002
++++ linux-2.4.18-chaos2/include/linux/dcache.h Sat Jun 15 13:06:39 2002
+@@ -6,6 +6,32 @@
+ #include <asm/atomic.h>
+ #include <linux/mount.h>
+
++#define IT_OPEN (1)
++#define IT_CREAT (1<<1)
++#define IT_MKDIR (1<<2)
++#define IT_LINK (1<<3)
++#define IT_SYMLINK (1<<4)
++#define IT_UNLINK (1<<5)
++#define IT_RMDIR (1<<6)
++#define IT_RENAME (1<<7)
++#define IT_RENAME2 (1<<8)
++#define IT_READDIR (1<<9)
++#define IT_GETATTR (1<<10)
++#define IT_SETATTR (1<<11)
++#define IT_READLINK (1<<12)
++#define IT_MKNOD (1<<13)
++
++struct lookup_intent {
++ int it_op;
++ int it_mode;
++ int it_disposition;
++ int it_status;
++ struct iattr *it_iattr;
++ __u64 it_lock_handle[2];
++ int it_lock_mode;
++ void *it_data;
++};
++
+ /*
+ * linux/include/linux/dcache.h
+ *
+@@ -78,6 +104,7 @@
+ unsigned long d_time; /* used by d_revalidate */
+ struct dentry_operations *d_op;
+ struct super_block * d_sb; /* The root of the dentry tree */
++ struct lookup_intent *d_it;
+ unsigned long d_vfs_flags;
+ void * d_fsdata; /* fs-specific data */
+ void * d_extra_attributes; /* TUX-specific data */
+@@ -91,6 +118,8 @@
+ int (*d_delete)(struct dentry *);
+ void (*d_release)(struct dentry *);
+ void (*d_iput)(struct dentry *, struct inode *);
++ int (*d_revalidate2)(struct dentry *, int, struct lookup_intent *);
++ void (*d_intent_release)(struct dentry *);
+ };
+
+ /* the dentry parameter passed to d_hash and d_compare is the parent
+--- linux-2.4.18-chaos2-pristine/include/linux/fs.h Fri Jun 14 09:33:01 2002
++++ linux-2.4.18-chaos2/include/linux/fs.h Sat Jun 15 09:55:41 2002
+@@ -570,6 +570,7 @@
+
+ /* needed for tty driver, and maybe others */
+ void *private_data;
++ struct lookup_intent *f_intent;
+
+ /* preallocated helper kiobuf to speedup O_DIRECT */
+ struct kiobuf *f_iobuf;
+@@ -827,7 +828,9 @@
+ extern int vfs_link(struct dentry *, struct inode *, struct dentry *);
+ extern int vfs_rmdir(struct inode *, struct dentry *);
+ extern int vfs_unlink(struct inode *, struct dentry *);
+-extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *);
++int vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
++ struct inode *new_dir, struct dentry *new_dentry,
++ struct lookup_intent *it);
+
+ /*
+ * File types
+@@ -888,6 +891,7 @@
+ struct inode_operations {
+ int (*create) (struct inode *,struct dentry *,int);
+ struct dentry * (*lookup) (struct inode *,struct dentry *);
++ struct dentry * (*lookup2) (struct inode *,struct dentry *, struct lookup_intent *);
+ int (*link) (struct dentry *,struct inode *,struct dentry *);
+ int (*unlink) (struct inode *,struct dentry *);
+ int (*symlink) (struct inode *,struct dentry *,const char *);
+@@ -1034,6 +1038,7 @@
+ extern struct vfsmount *kern_mount(struct file_system_type *);
+ extern int may_umount(struct vfsmount *);
+ extern long do_mount(char *, char *, char *, unsigned long, void *);
++struct vfsmount *do_kern_mount(const char *type, int flags, char *name, void *data);
+ extern void umount_tree(struct vfsmount *);
+
+ #define kern_umount mntput
+@@ -1360,6 +1365,7 @@
+ extern loff_t default_llseek(struct file *file, loff_t offset, int origin);
+
+ extern int FASTCALL(__user_walk(const char *, unsigned, struct nameidata *));
++extern int FASTCALL(__user_walk_it(const char *, unsigned, struct nameidata *, struct lookup_intent *it));
+ extern int FASTCALL(path_init(const char *, unsigned, struct nameidata *));
+ extern int FASTCALL(path_walk(const char *, struct nameidata *));
+ extern int FASTCALL(link_path_walk(const char *, struct nameidata *));
+@@ -1370,6 +1376,8 @@
+ extern struct dentry * lookup_hash(struct qstr *, struct dentry *);
+ #define user_path_walk(name,nd) __user_walk(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, nd)
+ #define user_path_walk_link(name,nd) __user_walk(name, LOOKUP_POSITIVE, nd)
++#define user_path_walk_it(name,nd,it) __user_walk_it(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, nd, it)
++#define user_path_walk_link_it(name,nd,it) __user_walk_it(name, LOOKUP_POSITIVE, nd, it)
+
+ extern void iput(struct inode *);
+ extern void force_delete(struct inode *);
+--- linux-2.4.18-chaos2-pristine/fs/nfsd/vfs.c Fri Jun 14 09:32:57 2002
++++ linux-2.4.18-chaos2/fs/nfsd/vfs.c Fri Jun 14 09:53:46 2002
@@ -1285,7 +1285,7 @@
err = nfserr_perm;
} else
if (!err && EX_ISSYNC(tfhp->fh_export)) {
nfsd_sync_dir(tdentry);
nfsd_sync_dir(fdentry);
---- lum-pristine/mm/slab.c Fri Dec 21 10:42:05 2001
-+++ lum/mm/slab.c Fri Jun 14 23:57:09 2002
-@@ -1187,6 +1187,59 @@
+--- linux-2.4.18-chaos2-pristine/fs/namei.c Fri Jun 14 09:32:49 2002
++++ linux-2.4.18-chaos2/fs/namei.c Sat Jun 15 09:52:38 2002
+@@ -94,6 +94,14 @@
+ * XEmacs seems to be relying on it...
+ */
+
++void intent_release(struct dentry *de)
++{
++ if (de->d_op && de->d_op->d_intent_release)
++ de->d_op->d_intent_release(de);
++ de->d_it = NULL;
++}
++
++
+ /* In order to reduce some races, while at the same time doing additional
+ * checking and hopefully speeding things up, we copy filenames to the
+ * kernel data space before using them..
+@@ -260,10 +268,18 @@
+ * Internal lookup() using the new generic dcache.
+ * SMP-safe
+ */
+-static struct dentry * cached_lookup(struct dentry * parent, struct qstr * name, int flags)
++static struct dentry * cached_lookup(struct dentry * parent, struct qstr * name, int flags, struct lookup_intent *it)
+ {
+ struct dentry * dentry = d_lookup(parent, name);
+
++ if (dentry && dentry->d_op && dentry->d_op->d_revalidate2) {
++ if (!dentry->d_op->d_revalidate2(dentry, flags, it) && !d_invalidate(dentry)) {
++ dput(dentry);
++ dentry = NULL;
++ }
++ return dentry;
++ }
++
+ if (dentry && dentry->d_op && dentry->d_op->d_revalidate) {
+ if (!dentry->d_op->d_revalidate(dentry, flags) && !d_invalidate(dentry)) {
+ dput(dentry);
+@@ -281,7 +297,7 @@
+ * make sure that nobody added the entry to the dcache in the meantime..
+ * SMP-safe
+ */
+-static struct dentry * real_lookup(struct dentry * parent, struct qstr * name, int flags)
++static struct dentry * real_lookup(struct dentry * parent, struct qstr * name, int flags, struct lookup_intent *it)
+ {
+ struct dentry * result;
+ struct inode *dir = parent->d_inode;
+@@ -300,6 +316,9 @@
+ result = ERR_PTR(-ENOMEM);
+ if (dentry) {
+ lock_kernel();
++ if (dir->i_op->lookup2)
++ result = dir->i_op->lookup2(dir, dentry, it);
++ else
+ result = dir->i_op->lookup(dir, dentry);
+ unlock_kernel();
+ if (result)
+@@ -322,6 +341,12 @@
+ result = ERR_PTR(-ENOENT);
+ }
+ }
++ if (result->d_op && result->d_op->d_revalidate2) {
++ if (!result->d_op->d_revalidate2(result, flags, it) && !d_invalidate(result)) {
++ dput(result);
++ result = ERR_PTR(-ENOENT);
++ }
++ }
+ return result;
+ }
+
+@@ -447,7 +472,7 @@
+ *
+ * We expect 'base' to be positive and a directory.
+ */
+-int link_path_walk(const char * name, struct nameidata *nd)
++int link_path_walk_it(const char * name, struct nameidata *nd, struct lookup_intent *it)
+ {
+ struct dentry *dentry;
+ struct inode *inode;
+@@ -524,12 +549,12 @@
+ break;
+ }
+ /* This does the actual lookups.. */
+- dentry = cached_lookup(nd->dentry, &this, LOOKUP_CONTINUE);
++ dentry = cached_lookup(nd->dentry, &this, LOOKUP_CONTINUE, NULL);
+ if (!dentry) {
+ err = -EWOULDBLOCKIO;
+ if (atomic)
+ break;
+- dentry = real_lookup(nd->dentry, &this, LOOKUP_CONTINUE);
++ dentry = real_lookup(nd->dentry, &this, LOOKUP_CONTINUE, NULL);
+ err = PTR_ERR(dentry);
+ if (IS_ERR(dentry))
+ break;
+@@ -563,7 +588,7 @@
+ nd->dentry = dentry;
+ }
+ err = -ENOTDIR;
+- if (!inode->i_op->lookup)
++ if (!inode->i_op->lookup && !inode->i_op->lookup2)
+ break;
+ continue;
+ /* here ends the main loop */
+@@ -590,12 +615,12 @@
+ if (err < 0)
+ break;
+ }
+- dentry = cached_lookup(nd->dentry, &this, 0);
++ dentry = cached_lookup(nd->dentry, &this, 0, it);
+ if (!dentry) {
+ err = -EWOULDBLOCKIO;
+ if (atomic)
+ break;
+- dentry = real_lookup(nd->dentry, &this, 0);
++ dentry = real_lookup(nd->dentry, &this, 0, it);
+ err = PTR_ERR(dentry);
+ if (IS_ERR(dentry))
+ break;
+@@ -619,7 +644,8 @@
+ goto no_inode;
+ if (lookup_flags & LOOKUP_DIRECTORY) {
+ err = -ENOTDIR;
+- if (!inode->i_op || !inode->i_op->lookup)
++ if (!inode->i_op || (!inode->i_op->lookup &&
++ !inode->i_op->lookup2))
+ break;
+ }
+ goto return_base;
+@@ -648,12 +674,24 @@
+ return err;
+ }
+
++int link_path_walk(const char * name, struct nameidata *nd)
++{
++ return link_path_walk_it(name, nd, NULL);
++}
++
++int path_walk_it(const char * name, struct nameidata *nd, struct lookup_intent *it)
++{
++ current->total_link_count = 0;
++ return link_path_walk_it(name, nd, it);
++}
++
+ int path_walk(const char * name, struct nameidata *nd)
+ {
+ current->total_link_count = 0;
+- return link_path_walk(name, nd);
++ return link_path_walk_it(name, nd, NULL);
+ }
+
++
+ /* SMP-safe */
+ /* returns 1 if everything is done */
+ static int __emul_lookup_dentry(const char *name, struct nameidata *nd)
+@@ -754,7 +792,8 @@
+ * needs parent already locked. Doesn't follow mounts.
+ * SMP-safe.
+ */
+-struct dentry * lookup_hash(struct qstr *name, struct dentry * base)
++struct dentry * lookup_hash_it(struct qstr *name, struct dentry * base,
++ struct lookup_intent *it)
+ {
+ struct dentry * dentry;
+ struct inode *inode;
+@@ -777,13 +816,16 @@
+ goto out;
+ }
+
+- dentry = cached_lookup(base, name, 0);
++ dentry = cached_lookup(base, name, 0, it);
+ if (!dentry) {
+ struct dentry *new = d_alloc(base, name);
+ dentry = ERR_PTR(-ENOMEM);
+ if (!new)
+ goto out;
+ lock_kernel();
++ if (inode->i_op->lookup2)
++ dentry = inode->i_op->lookup2(inode, new, it);
++ else
+ dentry = inode->i_op->lookup(inode, new);
+ unlock_kernel();
+ if (!dentry)
+@@ -795,6 +837,12 @@
+ return dentry;
+ }
+
++struct dentry * lookup_hash(struct qstr *name, struct dentry * base)
++{
++ return lookup_hash_it(name, base, NULL);
++}
++
++
+ /* SMP-safe */
+ struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
+ {
+@@ -816,7 +864,7 @@
+ }
+ this.hash = end_name_hash(hash);
+
+- return lookup_hash(&this, base);
++ return lookup_hash_it(&this, base, NULL);
+ access:
+ return ERR_PTR(-EACCES);
+ }
+@@ -848,6 +896,22 @@
+ return err;
+ }
+
++int __user_walk_it(const char *name, unsigned flags, struct nameidata *nd, struct lookup_intent *it)
++{
++ char *tmp;
++ int err;
++
++ tmp = getname(name);
++ err = PTR_ERR(tmp);
++ if (!IS_ERR(tmp)) {
++ err = 0;
++ if (path_init(tmp, flags, nd))
++ err = path_walk_it(tmp, nd, it);
++ putname(tmp);
++ }
++ return err;
++}
++
+ /*
+ * It's inline, so penalty for filesystems that don't use sticky bit is
+ * minimal.
+@@ -984,7 +1048,8 @@
+ * for symlinks (where the permissions are checked later).
+ * SMP-safe
+ */
+-int open_namei(const char * pathname, int flag, int mode, struct nameidata *nd)
++int open_namei_it(const char * pathname, int flag, int mode, struct nameidata *nd,
++ struct lookup_intent *it)
+ {
+ int acc_mode, error = 0;
+ struct inode *inode;
+@@ -998,8 +1063,9 @@
+ * The simplest case - just a plain lookup.
+ */
+ if (!(flag & O_CREAT)) {
++
+ if (path_init(pathname, lookup_flags(flag), nd))
+- error = path_walk(pathname, nd);
++ error = path_walk_it(pathname, nd, it);
+ if (error)
+ return error;
+ dentry = nd->dentry;
+@@ -1009,6 +1075,8 @@
+ /*
+ * Create - we need to know the parent.
+ */
++ if (it)
++ it->it_op |= IT_CREAT;
+ if (path_init(pathname, LOOKUP_PARENT, nd))
+ error = path_walk(pathname, nd);
+ if (error)
+@@ -1025,7 +1093,7 @@
+
+ dir = nd->dentry;
+ down(&dir->d_inode->i_sem);
+- dentry = lookup_hash(&nd->last, nd->dentry);
++ dentry = lookup_hash_it(&nd->last, nd->dentry, it);
+
+ do_last:
+ error = PTR_ERR(dentry);
+@@ -1036,6 +1104,7 @@
+
+ /* Negative dentry, just create the file */
+ if (!dentry->d_inode) {
++ dentry->d_it = it;
+ error = vfs_create(dir->d_inode, dentry,
+ mode & ~current->fs->umask);
+ up(&dir->d_inode->i_sem);
+@@ -1195,13 +1264,20 @@
+ }
+ dir = nd->dentry;
+ down(&dir->d_inode->i_sem);
+- dentry = lookup_hash(&nd->last, nd->dentry);
++ dentry = lookup_hash_it(&nd->last, nd->dentry, NULL);
+ putname(nd->last.name);
+ goto do_last;
+ }
+
++int open_namei(const char * pathname, int flag, int mode, struct nameidata *nd)
++{
++ return open_namei_it(pathname, flag, mode, nd, NULL);
++}
++
++
+ /* SMP-safe */
+-static struct dentry *lookup_create(struct nameidata *nd, int is_dir)
++static struct dentry *lookup_create(struct nameidata *nd, int is_dir,
++ struct lookup_intent *it)
+ {
+ struct dentry *dentry;
+
+@@ -1209,7 +1285,7 @@
+ dentry = ERR_PTR(-EEXIST);
+ if (nd->last_type != LAST_NORM)
+ goto fail;
+- dentry = lookup_hash(&nd->last, nd->dentry);
++ dentry = lookup_hash_it(&nd->last, nd->dentry, it);
+ if (IS_ERR(dentry))
+ goto fail;
+ if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode)
+@@ -1255,6 +1331,7 @@
+ char * tmp;
+ struct dentry * dentry;
+ struct nameidata nd;
++ struct lookup_intent it = { IT_CREAT , mode };
+
+ if (S_ISDIR(mode))
+ return -EPERM;
+@@ -1266,11 +1343,12 @@
+ error = path_walk(tmp, &nd);
+ if (error)
+ goto out;
+- dentry = lookup_create(&nd, 0);
++ dentry = lookup_create(&nd, 0, &it);
+ error = PTR_ERR(dentry);
+
+ mode &= ~current->fs->umask;
+ if (!IS_ERR(dentry)) {
++ dentry->d_it = ⁢
+ switch (mode & S_IFMT) {
+ case 0: case S_IFREG:
+ error = vfs_create(nd.dentry->d_inode,dentry,mode);
+@@ -1286,6 +1364,7 @@
+ }
+ dput(dentry);
+ }
++ intent_release(dentry);
+ up(&nd.dentry->d_inode->i_sem);
+ path_release(&nd);
+ out:
+@@ -1324,6 +1403,7 @@
+ {
+ int error = 0;
+ char * tmp;
++ struct lookup_intent it = { IT_MKDIR, mode };
+
+ tmp = getname(pathname);
+ error = PTR_ERR(tmp);
+@@ -1335,13 +1415,15 @@
+ error = path_walk(tmp, &nd);
+ if (error)
+ goto out;
+- dentry = lookup_create(&nd, 1);
++ dentry = lookup_create(&nd, 1, &it);
+ error = PTR_ERR(dentry);
+ if (!IS_ERR(dentry)) {
++ dentry->d_it = ⁢
+ error = vfs_mkdir(nd.dentry->d_inode, dentry,
+ mode & ~current->fs->umask);
+ dput(dentry);
+ }
++ intent_release(dentry);
+ up(&nd.dentry->d_inode->i_sem);
+ path_release(&nd);
+ out:
+@@ -1421,6 +1503,7 @@
+ char * name;
+ struct dentry *dentry;
+ struct nameidata nd;
++ struct lookup_intent it = { IT_RMDIR, 0 };
+
+ name = getname(pathname);
+ if(IS_ERR(name))
+@@ -1443,10 +1526,12 @@
+ goto exit1;
+ }
+ down(&nd.dentry->d_inode->i_sem);
+- dentry = lookup_hash(&nd.last, nd.dentry);
++ dentry = lookup_hash_it(&nd.last, nd.dentry, &it);
+ error = PTR_ERR(dentry);
+ if (!IS_ERR(dentry)) {
++ dentry->d_it = ⁢
+ error = vfs_rmdir(nd.dentry->d_inode, dentry);
++ intent_release(dentry);
+ dput(dentry);
+ }
+ up(&nd.dentry->d_inode->i_sem);
+@@ -1490,6 +1575,7 @@
+ char * name;
+ struct dentry *dentry;
+ struct nameidata nd;
++ struct lookup_intent it = { IT_UNLINK, 0 };
+
+ name = getname(pathname);
+ if(IS_ERR(name))
+@@ -1503,14 +1589,16 @@
+ if (nd.last_type != LAST_NORM)
+ goto exit1;
+ down(&nd.dentry->d_inode->i_sem);
+- dentry = lookup_hash(&nd.last, nd.dentry);
++ dentry = lookup_hash_it(&nd.last, nd.dentry, &it);
+ error = PTR_ERR(dentry);
+ if (!IS_ERR(dentry)) {
++ dentry->d_it = ⁢
+ /* Why not before? Because we want correct error value */
+ if (nd.last.name[nd.last.len])
+ goto slashes;
+ error = vfs_unlink(nd.dentry->d_inode, dentry);
+ exit2:
++ intent_release(dentry);
+ dput(dentry);
+ }
+ up(&nd.dentry->d_inode->i_sem);
+@@ -1557,6 +1645,7 @@
+ int error = 0;
+ char * from;
+ char * to;
++ struct lookup_intent it = { IT_SYMLINK, 0 };
+
+ from = getname(oldname);
+ if(IS_ERR(from))
+@@ -1571,12 +1660,14 @@
+ error = path_walk(to, &nd);
+ if (error)
+ goto out;
+- dentry = lookup_create(&nd, 0);
++ dentry = lookup_create(&nd, 0, &it);
+ error = PTR_ERR(dentry);
+ if (!IS_ERR(dentry)) {
++ dentry->d_it = ⁢
+ error = vfs_symlink(nd.dentry->d_inode, dentry, from);
+ dput(dentry);
+ }
++ intent_release(dentry);
+ up(&nd.dentry->d_inode->i_sem);
+ path_release(&nd);
+ out:
+@@ -1640,6 +1731,7 @@
+ int error;
+ char * from;
+ char * to;
++ struct lookup_intent it = { IT_LINK, 0 };
+
+ from = getname(oldname);
+ if(IS_ERR(from))
+@@ -1662,12 +1754,14 @@
+ error = -EXDEV;
+ if (old_nd.mnt != nd.mnt)
+ goto out_release;
+- new_dentry = lookup_create(&nd, 0);
++ new_dentry = lookup_create(&nd, 0, &it);
+ error = PTR_ERR(new_dentry);
+ if (!IS_ERR(new_dentry)) {
++ new_dentry->d_it = ⁢
+ error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry);
+ dput(new_dentry);
+ }
++ intent_release(new_dentry);
+ up(&nd.dentry->d_inode->i_sem);
+ out_release:
+ path_release(&nd);
+@@ -1708,7 +1802,8 @@
+ * locking].
+ */
+ int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry,
+- struct inode *new_dir, struct dentry *new_dentry)
++ struct inode *new_dir, struct dentry *new_dentry,
++ struct lookup_intent *it)
+ {
+ int error;
+ struct inode *target;
+@@ -1762,12 +1857,14 @@
+ } else
+ double_down(&old_dir->i_zombie,
+ &new_dir->i_zombie);
++ new_dentry->d_it = it;
+ if (IS_DEADDIR(old_dir)||IS_DEADDIR(new_dir))
+ error = -ENOENT;
+ else if (d_mountpoint(old_dentry)||d_mountpoint(new_dentry))
+ error = -EBUSY;
+ else
+ error = old_dir->i_op->rename(old_dir, old_dentry, new_dir, new_dentry);
++ intent_release(new_dentry);
+ if (target) {
+ if (!error)
+ target->i_flags |= S_DEAD;
+@@ -1789,7 +1886,8 @@
+ }
+
+ int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
+- struct inode *new_dir, struct dentry *new_dentry)
++ struct inode *new_dir, struct dentry *new_dentry,
++ struct lookup_intent *it)
+ {
+ int error;
+
+@@ -1816,10 +1914,12 @@
+ DQUOT_INIT(old_dir);
+ DQUOT_INIT(new_dir);
+ double_down(&old_dir->i_zombie, &new_dir->i_zombie);
++ new_dentry->d_it = it;
+ if (d_mountpoint(old_dentry)||d_mountpoint(new_dentry))
+ error = -EBUSY;
+ else
+ error = old_dir->i_op->rename(old_dir, old_dentry, new_dir, new_dentry);
++ intent_release(new_dentry);
+ double_up(&old_dir->i_zombie, &new_dir->i_zombie);
+ if (error)
+ return error;
+@@ -1831,13 +1931,14 @@
+ }
+
+ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
+- struct inode *new_dir, struct dentry *new_dentry)
++ struct inode *new_dir, struct dentry *new_dentry,
++ struct lookup_intent *it)
+ {
+ int error;
+ if (S_ISDIR(old_dentry->d_inode->i_mode))
+- error = vfs_rename_dir(old_dir,old_dentry,new_dir,new_dentry);
++ error = vfs_rename_dir(old_dir,old_dentry,new_dir,new_dentry, it);
+ else
+- error = vfs_rename_other(old_dir,old_dentry,new_dir,new_dentry);
++ error = vfs_rename_other(old_dir,old_dentry,new_dir,new_dentry, it);
+ if (!error) {
+ if (old_dir == new_dir)
+ inode_dir_notify(old_dir, DN_RENAME);
+@@ -1855,6 +1956,7 @@
+ struct dentry * old_dir, * new_dir;
+ struct dentry * old_dentry, *new_dentry;
+ struct nameidata oldnd, newnd;
++ struct lookup_intent it = {IT_RENAME, 0};
+
+ if (path_init(oldname, LOOKUP_PARENT, &oldnd))
+ error = path_walk(oldname, &oldnd);
+@@ -1882,7 +1984,9 @@
+
+ double_lock(new_dir, old_dir);
+
+- old_dentry = lookup_hash(&oldnd.last, old_dir);
++ it.it_op = IT_RENAME;
++ it.it_mode = 0;
++ old_dentry = lookup_hash_it(&oldnd.last, old_dir, &it);
+ error = PTR_ERR(old_dentry);
+ if (IS_ERR(old_dentry))
+ goto exit3;
+@@ -1898,14 +2002,15 @@
+ if (newnd.last.name[newnd.last.len])
+ goto exit4;
+ }
+- new_dentry = lookup_hash(&newnd.last, new_dir);
++ it.it_op = IT_RENAME2;
++ new_dentry = lookup_hash_it(&newnd.last, new_dir, &it);
+ error = PTR_ERR(new_dentry);
+ if (IS_ERR(new_dentry))
+ goto exit4;
+
+ lock_kernel();
+ error = vfs_rename(old_dir->d_inode, old_dentry,
+- new_dir->d_inode, new_dentry);
++ new_dir->d_inode, new_dentry, &it);
+ unlock_kernel();
+
+ dput(new_dentry);
+--- linux-2.4.18-chaos2-pristine/fs/open.c Fri Jun 14 09:32:49 2002
++++ linux-2.4.18-chaos2/fs/open.c Sat Jun 15 09:52:38 2002
+@@ -19,6 +19,8 @@
+ #include <asm/uaccess.h>
+
+ #define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))
++extern int path_walk_it(const char * name, struct nameidata *nd, struct lookup_intent *it);
++extern void intent_release(struct dentry *de);
+
+ int vfs_statfs(struct super_block *sb, struct statfs *buf)
+ {
+@@ -94,14 +96,19 @@
+ struct nameidata nd;
+ struct inode * inode;
+ int error;
++ struct lookup_intent it;
++
++ it.it_op = IT_SETATTR;
++
+
+ error = -EINVAL;
+ if (length < 0) /* sorry, but loff_t says... */
+ goto out;
+
+- error = user_path_walk(path, &nd);
++ error = user_path_walk_it(path, &nd, &it);
+ if (error)
+ goto out;
++ nd.dentry->d_it = ⁢
+ inode = nd.dentry->d_inode;
+
+ /* For directories it's -EISDIR, for other non-regulars - -EINVAL */
+@@ -144,6 +151,7 @@
+ put_write_access(inode);
+
+ dput_and_out:
++ intent_release(nd.dentry);
+ path_release(&nd);
+ out:
+ return error;
+@@ -235,10 +243,14 @@
+ struct nameidata nd;
+ struct inode * inode;
+ struct iattr newattrs;
++ struct lookup_intent it;
++
++ it.it_op = IT_SETATTR;
+
+- error = user_path_walk(filename, &nd);
++ error = user_path_walk_it(filename, &nd, &it);
+ if (error)
+ goto out;
++ nd.dentry->d_it = ⁢
+ inode = nd.dentry->d_inode;
+
+ error = -EROFS;
+@@ -262,6 +274,7 @@
+ }
+ error = notify_change(nd.dentry, &newattrs);
+ dput_and_out:
++ intent_release(nd.dentry);
+ path_release(&nd);
+ out:
+ return error;
+@@ -279,11 +292,15 @@
+ struct nameidata nd;
+ struct inode * inode;
+ struct iattr newattrs;
++ struct lookup_intent it;
++
++ it.it_op = IT_SETATTR;
+
+- error = user_path_walk(filename, &nd);
++ error = user_path_walk_it(filename, &nd, &it);
+
+ if (error)
+ goto out;
++ nd.dentry->d_it = ⁢
+ inode = nd.dentry->d_inode;
+
+ error = -EROFS;
+@@ -306,6 +323,7 @@
+ }
+ error = notify_change(nd.dentry, &newattrs);
+ dput_and_out:
++ intent_release(nd.dentry);
+ path_release(&nd);
+ out:
+ return error;
+@@ -322,6 +340,9 @@
+ int old_fsuid, old_fsgid;
+ kernel_cap_t old_cap;
+ int res;
++ struct lookup_intent it;
++
++ it.it_op = IT_GETATTR;
+
+ if (mode & ~S_IRWXO) /* where's F_OK, X_OK, W_OK, R_OK? */
+ return -EINVAL;
+@@ -339,7 +360,7 @@
+ else
+ current->cap_effective = current->cap_permitted;
+
+- res = user_path_walk(filename, &nd);
++ res = user_path_walk_it(filename, &nd, &it);
+ if (!res) {
+ res = permission(nd.dentry->d_inode, mode);
+ /* SuS v2 requires we report a read only fs too */
+@@ -361,6 +382,9 @@
+ int error;
+ struct nameidata nd;
+ char *name;
++ struct lookup_intent it;
++
++ it.it_op = IT_GETATTR;
+
+ name = getname(filename);
+ error = PTR_ERR(name);
+@@ -369,11 +393,12 @@
+
+ error = 0;
+ if (path_init(name,LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY,&nd))
+- error = path_walk(name, &nd);
++ error = path_walk_it(name, &nd, &it);
+ putname(name);
+ if (error)
+ goto out;
+
++ nd.dentry->d_it = ⁢
+ error = permission(nd.dentry->d_inode,MAY_EXEC);
+ if (error)
+ goto dput_and_out;
+@@ -381,6 +406,7 @@
+ set_fs_pwd(current->fs, nd.mnt, nd.dentry);
+
+ dput_and_out:
++ intent_release(nd.dentry);
+ path_release(&nd);
+ out:
+ return error;
+@@ -421,6 +447,9 @@
+ int error;
+ struct nameidata nd;
+ char *name;
++ struct lookup_intent it;
++
++ it.it_op = IT_GETATTR;
+
+ name = getname(filename);
+ error = PTR_ERR(name);
+@@ -429,11 +458,12 @@
+
+ path_init(name, LOOKUP_POSITIVE | LOOKUP_FOLLOW |
+ LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd);
+- error = path_walk(name, &nd);
++ error = path_walk_it(name, &nd, &it);
+ putname(name);
+ if (error)
+ goto out;
+
++ nd.dentry->d_it = ⁢
+ error = permission(nd.dentry->d_inode,MAY_EXEC);
+ if (error)
+ goto dput_and_out;
+@@ -446,6 +476,7 @@
+ set_fs_altroot();
+ error = 0;
+ dput_and_out:
++ intent_release(nd.dentry);
+ path_release(&nd);
+ out:
+ return error;
+@@ -490,12 +521,15 @@
+ struct inode * inode;
+ int error;
+ struct iattr newattrs;
++ struct lookup_intent it;
+
+- error = user_path_walk(filename, &nd);
++ it.it_op = IT_SETATTR;
++ error = user_path_walk_it(filename, &nd, &it);
+ if (error)
+ goto out;
+ inode = nd.dentry->d_inode;
+
++ nd.dentry->d_it = ⁢
+ error = -EROFS;
+ if (IS_RDONLY(inode))
+ goto dput_and_out;
+@@ -511,6 +545,7 @@
+ error = notify_change(nd.dentry, &newattrs);
+
+ dput_and_out:
++ intent_release(nd.dentry);
+ path_release(&nd);
+ out:
+ return error;
+@@ -580,10 +615,15 @@
+ {
+ struct nameidata nd;
+ int error;
++ struct lookup_intent it;
++
++ it.it_op = IT_SETATTR;
+
+- error = user_path_walk(filename, &nd);
++ error = user_path_walk_it(filename, &nd, &it);
+ if (!error) {
++ nd.dentry->d_it = ⁢
+ error = chown_common(nd.dentry, user, group);
++ intent_release(nd.dentry);
+ path_release(&nd);
+ }
+ return error;
+@@ -593,10 +633,15 @@
+ {
+ struct nameidata nd;
+ int error;
++ struct lookup_intent it;
+
+- error = user_path_walk_link(filename, &nd);
++ it.it_op = IT_SETATTR;
++
++ error = user_path_walk_link_it(filename, &nd, &it);
+ if (!error) {
++ nd.dentry->d_it = ⁢
+ error = chown_common(nd.dentry, user, group);
++ intent_release(nd.dentry);
+ path_release(&nd);
+ }
+ return error;
+@@ -630,10 +675,15 @@
+ * for the internal routines (ie open_namei()/follow_link() etc). 00 is
+ * used by symlinks.
+ */
++extern int open_namei_it(const char *filename, int namei_flags, int mode,
++ struct nameidata *nd, struct lookup_intent *it);
++struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt, int flags, struct lookup_intent *it);
++
+ struct file *filp_open(const char * filename, int flags, int mode)
+ {
+ int namei_flags, error;
+ struct nameidata nd;
++ struct lookup_intent it = {IT_OPEN, 0};
+
+ namei_flags = flags;
+ if ((namei_flags+1) & O_ACCMODE)
+@@ -641,14 +691,14 @@
+ if (namei_flags & O_TRUNC)
+ namei_flags |= 2;
+
+- error = open_namei(filename, namei_flags, mode, &nd);
++ error = open_namei_it(filename, namei_flags, mode, &nd, &it);
+ if (!error)
+- return dentry_open(nd.dentry, nd.mnt, flags);
++ return dentry_open_it(nd.dentry, nd.mnt, flags, &it);
+
+ return ERR_PTR(error);
+ }
+
+-struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
++struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt, int flags, struct lookup_intent *it)
+ {
+ struct file * f;
+ struct inode *inode;
+@@ -690,6 +740,7 @@
+ goto cleanup_all;
+ }
+ f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);
++ f->f_intent = it;
+
+ return f;
+
+@@ -710,6 +761,13 @@
+ return ERR_PTR(error);
+ }
+
++struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
++{
++ return dentry_open_it(dentry, mnt, flags, NULL);
++
++}
++
++
+ /*
+ * Find an empty file descriptor entry, and mark it busy.
+ */
+--- linux-2.4.18-chaos2-pristine/fs/stat.c Fri Jun 14 09:32:49 2002
++++ linux-2.4.18-chaos2/fs/stat.c Sat Jun 15 09:52:38 2002
+@@ -117,8 +117,11 @@
+ {
+ struct nameidata nd;
+ int error;
++ struct lookup_intent it;
++ it.it_op = IT_GETATTR;
+
+- error = user_path_walk_link(name, &nd);
++
++ error = user_path_walk_link_it(name, &nd, &it);
+ if (!error) {
+ error = do_getattr(nd.mnt, nd.dentry, stat);
+ path_release(&nd);
+@@ -269,14 +272,16 @@
+ {
+ struct nameidata nd;
+ int error;
++ struct lookup_intent it;
++ it.it_op = IT_READLINK;
+
+ if (bufsiz <= 0)
+ return -EINVAL;
+
+- error = user_path_walk_link(path, &nd);
++ error = user_path_walk_link_it(path, &nd, &it);
+ if (!error) {
+ struct inode * inode = nd.dentry->d_inode;
+-
++ nd.dentry->d_it = ⁢
+ error = -EINVAL;
+ if (inode->i_op && inode->i_op->readlink &&
+ !(error = do_revalidate(nd.dentry))) {
+--- linux-2.4.18-chaos2-pristine/mm/slab.c Fri Jun 14 09:33:02 2002
++++ linux-2.4.18-chaos2/mm/slab.c Sat Jun 15 09:58:54 2002
+@@ -1216,6 +1216,60 @@
* Called with the cache-lock held.
*/
+{
+ int i;
+ unsigned int objnr;
-+
++#if DEBUG
+ if (cachep->flags & SLAB_RED_ZONE) {
+ objp -= BYTES_PER_WORD;
+ if ( *(unsigned long *)objp != RED_MAGIC2)
+ /* Either write past end, or a double free. */
+ return 0;
+ }
++#endif
+
+ objnr = (objp-slabp->s_mem)/cachep->objsize;
+ if (objnr >= cachep->num)
#if DEBUG
static int kmem_extra_free_checks (kmem_cache_t * cachep,
slab_t *slabp, void * objp)
---- lum-pristine/arch/i386/mm/init.c Fri Dec 21 10:41:53 2001
-+++ lum/arch/i386/mm/init.c Sat Jun 15 00:31:15 2002
+--- linux-2.4.18-chaos2-pristine/arch/i386/mm/init.c Fri Jun 14 09:32:40 2002
++++ linux-2.4.18-chaos2/arch/i386/mm/init.c Sat Jun 15 09:50:07 2002
+@@ -43,6 +43,14 @@
static unsigned long totalram_pages;
static unsigned long totalhigh_pages;
++
+struct page *check_get_page(unsigned long kaddr)
+{
-+#warning FIXME: Lustre team, is this solid?
++#warning FIXME: Lustre team, is this solid enough?
+ return virt_to_page(kaddr);
+}
+
++
int do_check_pgt_cache(int low, int high)
{
int freed = 0;
-@@ -504,12 +502,14 @@
- return(region);
- }
- }
-- panic("No region found for page");
-+//panic("No region found for page");
- return(NULL);
- }
-
- struct page *page_mem_map(struct page *page)
- {
-+ if (!page_region(page, NULL))
-+ return NULL;
- return((struct page *) page_region(page, NULL)->mem_map);
- }
-
---- lum-pristine/include/linux/slab.h Fri Dec 21 10:42:04 2001
-+++ lum/include/linux/slab.h Sat Jun 15 00:34:24 2002
-@@ -57,6 +57,7 @@
- extern int kmem_cache_shrink(kmem_cache_t *);
+--- linux-2.4.18-chaos2-pristine/include/linux/slab.h Fri Jun 14 09:33:02 2002
++++ linux-2.4.18-chaos2/include/linux/slab.h Sat Jun 15 09:55:43 2002
+@@ -58,6 +58,7 @@
+ extern int kmem_cache_shrink_nr(kmem_cache_t *);
extern void *kmem_cache_alloc(kmem_cache_t *, int);
extern void kmem_cache_free(kmem_cache_t *, void *);
+extern int kmem_cache_validate(kmem_cache_t *cachep, void *objp);
extern void *kmalloc(size_t, int);
extern void kfree(const void *);
+--- linux-2.4.18-chaos2-pristine/scripts/mkspec Fri Jun 14 09:33:04 2002
++++ linux-2.4.18-chaos2/scripts/mkspec Sat Jun 15 10:32:39 2002
+@@ -41,6 +41,7 @@
+ echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/lib/modules'
+ echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make modules_install'
+ echo 'cp arch/i386/boot/bzImage $RPM_BUILD_ROOT'"/boot/vmlinuz-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"
++echo 'cp vmlinux $RPM_BUILD_ROOT'"/boot/vmlinux-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"
+ echo 'cp System.map $RPM_BUILD_ROOT'"/boot/System.map-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"
+ echo ""
+ echo "%clean"
git://git.whamcloud.com / fs / lustre-release.git / commitdiff