---- linux-2.4.18-12-uml-pristine/arch/ia64/mm/init.c Mon Sep 9 14:41:40 2002
-+++ linux-2.4.18-12-uml/arch/ia64/mm/init.c Mon Sep 9 16:08:12 2002
+--- linux-2.4.18-17.8.0-uml-pristine/include/linux/lustre_version.h Wed Dec 31 19:00:00 1969
++++ linux-2.4.18-17.8.0-uml/include/linux/lustre_version.h Wed Nov 6 02:34:14 2002
+@@ -0,0 +1 @@
++#define LUSTRE_KERNEL_VERSION 2
+--- linux-2.4.18-17.8.0-uml-pristine/arch/ia64/mm/init.c 2002-10-19 11:44:08.000000000 -0600
++++ linux-2.4.18-17.8.0-uml/arch/ia64/mm/init.c 2002-10-19 11:44:51.000000000 -0600
@@ -37,6 +37,12 @@
static unsigned long totalram_pages;
int
do_check_pgt_cache (int low, int high)
{
---- linux-2.4.18-12-uml-pristine/arch/i386/mm/init.c Mon Sep 9 14:41:54 2002
-+++ linux-2.4.18-12-uml/arch/i386/mm/init.c Mon Sep 9 16:08:12 2002
+--- linux-2.4.18-17.8.0-uml-pristine/arch/i386/mm/init.c 2002-10-19 11:44:04.000000000 -0600
++++ linux-2.4.18-17.8.0-uml/arch/i386/mm/init.c 2002-10-19 11:44:51.000000000 -0600
@@ -43,6 +43,12 @@
static unsigned long totalram_pages;
static unsigned long totalhigh_pages;
int do_check_pgt_cache(int low, int high)
{
int freed = 0;
---- linux-2.4.18-12-uml-pristine/drivers/block/blkpg.c Mon Sep 9 14:41:58 2002
-+++ linux-2.4.18-12-uml/drivers/block/blkpg.c Mon Sep 9 16:08:12 2002
+--- linux-2.4.18-17.8.0-uml-pristine/drivers/block/blkpg.c 2002-10-19 11:43:55.000000000 -0600
++++ linux-2.4.18-17.8.0-uml/drivers/block/blkpg.c 2002-10-19 11:44:51.000000000 -0600
@@ -297,3 +297,38 @@
}
+EXPORT_SYMBOL(dev_set_rdonly);
+EXPORT_SYMBOL(dev_check_rdonly);
+EXPORT_SYMBOL(dev_clear_rdonly);
---- linux-2.4.18-12-uml-pristine/drivers/block/loop.c Mon Sep 9 14:41:58 2002
-+++ linux-2.4.18-12-uml/drivers/block/loop.c Mon Sep 9 16:08:12 2002
+--- linux-2.4.18-17.8.0-uml-pristine/drivers/block/loop.c 2002-10-19 11:43:55.000000000 -0600
++++ linux-2.4.18-17.8.0-uml/drivers/block/loop.c 2002-10-19 11:44:51.000000000 -0600
@@ -491,6 +491,11 @@
spin_unlock_irq(&lo->lo_lock);
if (lo->lo_flags & LO_FLAGS_READ_ONLY)
goto err;
} else if (rw == READA) {
---- linux-2.4.18-12-uml-pristine/drivers/ide/ide-disk.c Mon Sep 9 14:41:57 2002
-+++ linux-2.4.18-12-uml/drivers/ide/ide-disk.c Mon Sep 9 16:08:12 2002
+--- linux-2.4.18-17.8.0-uml-pristine/drivers/ide/ide-disk.c 2002-10-19 11:43:58.000000000 -0600
++++ linux-2.4.18-17.8.0-uml/drivers/ide/ide-disk.c 2002-10-19 11:44:51.000000000 -0600
@@ -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);
---- linux-2.4.18-12-uml-pristine/fs/ext3/Makefile Fri Dec 21 10:41:55 2001
-+++ linux-2.4.18-12-uml/fs/ext3/Makefile Mon Sep 9 16:08:12 2002
+--- linux-2.4.18-17.8.0-uml-pristine/fs/ext3/Makefile 2002-10-19 11:43:53.000000000 -0600
++++ linux-2.4.18-17.8.0-uml/fs/ext3/Makefile 2002-10-19 11:44:51.000000000 -0600
@@ -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)
---- linux-2.4.18-12-uml-pristine/fs/ext3/super.c Mon Sep 9 14:41:50 2002
-+++ linux-2.4.18-12-uml/fs/ext3/super.c Mon Sep 9 16:08:12 2002
+--- linux-2.4.18-17.8.0-uml-pristine/fs/ext3/super.c 2002-10-19 11:43:53.000000000 -0600
++++ linux-2.4.18-17.8.0-uml/fs/ext3/super.c 2002-10-19 11:44:51.000000000 -0600
@@ -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");
---- linux-2.4.18-12-uml-pristine/include/linux/slab.h Wed Sep 11 12:32:08 2002
-+++ linux-2.4.18-12-uml/include/linux/slab.h Wed Sep 18 15:52:16 2002
+--- linux-2.4.18-17.8.0-uml-pristine/include/linux/slab.h 2002-10-19 11:43:54.000000000 -0600
++++ linux-2.4.18-17.8.0-uml/include/linux/slab.h 2002-11-02 00:49:24.000000000 -0700
@@ -57,6 +57,7 @@
extern int kmem_cache_shrink(kmem_cache_t *);
extern void *kmem_cache_alloc(kmem_cache_t *, int);
extern void *kmalloc(size_t, int);
extern void kfree(const void *);
---- linux-2.4.18-12-uml-pristine/kernel/ksyms.c Mon Sep 9 14:41:58 2002
-+++ linux-2.4.18-12-uml/kernel/ksyms.c Mon Sep 9 16:08:12 2002
-@@ -306,6 +306,12 @@
+--- linux-2.4.18-17.8.0-uml-pristine/kernel/ksyms.c 2002-10-19 11:43:53.000000000 -0600
++++ linux-2.4.18-17.8.0-uml/kernel/ksyms.c 2002-11-02 01:09:34.000000000 -0700
+@@ -292,6 +292,7 @@
+ EXPORT_SYMBOL(set_page_dirty);
+ EXPORT_SYMBOL(vfs_readlink);
+ EXPORT_SYMBOL(vfs_follow_link);
++EXPORT_SYMBOL(vfs_follow_link_it);
+ EXPORT_SYMBOL(page_readlink);
+ EXPORT_SYMBOL(page_follow_link);
+ EXPORT_SYMBOL(page_symlink_inode_operations);
+@@ -306,6 +307,12 @@
EXPORT_SYMBOL_GPL(nr_free_pages);
EXPORT_SYMBOL_GPL(page_cache_size);
/* for stackable file systems (lofs, wrapfs, cryptfs, etc.) */
EXPORT_SYMBOL(default_llseek);
EXPORT_SYMBOL(dentry_open);
---- linux-2.4.18-12-uml-pristine/include/linux/dcache.h Wed Sep 11 12:32:08 2002
-+++ linux-2.4.18-12-uml/include/linux/dcache.h Wed Sep 18 14:21:14 2002
+--- linux-2.4.18-17.8.0-uml-pristine/include/linux/dcache.h 2002-10-19 11:43:54.000000000 -0600
++++ linux-2.4.18-17.8.0-uml/include/linux/dcache.h 2002-11-02 00:49:24.000000000 -0700
@@ -6,6 +6,34 @@
#include <asm/atomic.h>
#include <linux/mount.h>
};
/* the dentry parameter passed to d_hash and d_compare is the parent
---- linux-2.4.18-12-uml-pristine/include/linux/fs.h Wed Sep 11 12:32:08 2002
-+++ linux-2.4.18-12-uml/include/linux/fs.h Wed Sep 18 15:52:16 2002
+--- linux-2.4.18-17.8.0-uml-pristine/include/linux/fs.h 2002-10-19 11:43:54.000000000 -0600
++++ linux-2.4.18-17.8.0-uml/include/linux/fs.h 2002-11-02 00:49:24.000000000 -0700
@@ -576,6 +576,7 @@
/* needed for tty driver, and maybe others */
int (*link) (struct dentry *,struct inode *,struct dentry *);
int (*unlink) (struct inode *,struct dentry *);
int (*symlink) (struct inode *,struct dentry *,const char *);
-@@ -1046,6 +1050,7 @@
+@@ -907,6 +911,8 @@
+ struct inode *, struct dentry *);
+ int (*readlink) (struct dentry *, char *,int);
+ int (*follow_link) (struct dentry *, struct nameidata *);
++ int (*follow_link2) (struct dentry *, struct nameidata *,
++ struct lookup_intent *it);
+ void (*truncate) (struct inode *);
+ int (*permission) (struct inode *, int);
+ int (*revalidate) (struct dentry *);
+@@ -1046,6 +1052,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 *);
extern void umount_tree(struct vfsmount *);
#define kern_umount mntput
-@@ -1380,6 +1385,7 @@
+@@ -1380,6 +1387,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(path_init(const char *, unsigned, struct nameidata *));
extern int FASTCALL(path_walk(const char *, struct nameidata *));
extern int FASTCALL(path_lookup(const char *, unsigned, struct nameidata *));
-@@ -1391,6 +1397,8 @@
+@@ -1391,6 +1399,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)
extern void inode_init_once(struct inode *);
extern void iput(struct inode *);
---- linux-2.4.18-12-uml-pristine/fs/dcache.c Mon Sep 9 14:41:54 2002
-+++ linux-2.4.18-12-uml/fs/dcache.c Mon Sep 9 16:08:12 2002
-@@ -645,6 +645,7 @@
+@@ -1491,6 +1501,8 @@
+
+ extern int vfs_readlink(struct dentry *, char *, int, const char *);
+ extern int vfs_follow_link(struct nameidata *, const char *);
++extern int vfs_follow_link_it(struct nameidata *, const char *,
++ struct lookup_intent *it);
+ extern int page_readlink(struct dentry *, char *, int);
+ extern int page_follow_link(struct dentry *, struct nameidata *);
+ extern struct inode_operations page_symlink_inode_operations;
+--- linux-2.4.18-17.8.0-uml-pristine/fs/dcache.c 2002-10-19 11:43:53.000000000 -0600
++++ linux-2.4.18-17.8.0-uml/fs/dcache.c 2002-10-31 13:10:34.000000000 -0700
+@@ -150,6 +150,8 @@
+ unhash_it:
+ list_del_init(&dentry->d_hash);
+
++
++
+ kill_it: {
+ struct dentry *parent;
+ list_del(&dentry->d_child);
+@@ -645,6 +647,7 @@
dentry->d_fsdata = NULL;
dentry->d_extra_attributes = NULL;
dentry->d_mounted = 0;
INIT_LIST_HEAD(&dentry->d_hash);
INIT_LIST_HEAD(&dentry->d_lru);
INIT_LIST_HEAD(&dentry->d_subdirs);
---- linux-2.4.18-12-uml-pristine/fs/nfsd/vfs.c Mon Sep 9 14:41:50 2002
-+++ linux-2.4.18-12-uml/fs/nfsd/vfs.c Mon Sep 9 16:08:12 2002
+--- linux-2.4.18-17.8.0-uml-pristine/fs/nfsd/vfs.c 2002-10-19 11:43:53.000000000 -0600
++++ linux-2.4.18-17.8.0-uml/fs/nfsd/vfs.c 2002-10-19 11:44:51.000000000 -0600
@@ -1298,7 +1298,7 @@
err = nfserr_perm;
} else
unlock_kernel();
if (!err && EX_ISSYNC(tfhp->fh_export)) {
nfsd_sync_dir(tdentry);
---- linux-2.4.18-12-uml-pristine/fs/namei.c Mon Sep 9 14:41:56 2002
-+++ linux-2.4.18-12-uml/fs/namei.c Wed Sep 18 16:59:58 2002
-@@ -94,6 +94,14 @@
+--- linux-2.4.18-17.8.0-uml-pristine/fs/namei.c 2002-10-19 11:43:53.000000000 -0600
++++ linux-2.4.18-17.8.0-uml/fs/namei.c 2002-11-02 01:02:26.000000000 -0700
+@@ -1,3 +1,6 @@
++
++
++
+ /*
+ * linux/fs/namei.c
+ *
+@@ -94,6 +97,14 @@
* XEmacs seems to be relying on it...
*/
/* 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,19 @@
+@@ -260,10 +271,19 @@
* Internal lookup() using the new generic dcache.
* SMP-safe
*/
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 +298,8 @@
+@@ -281,7 +301,8 @@
* make sure that nobody added the entry to the dcache in the meantime..
* SMP-safe
*/
{
struct dentry * result;
struct inode *dir = parent->d_inode;
-@@ -300,6 +318,9 @@
+@@ -300,6 +321,9 @@
result = ERR_PTR(-ENOMEM);
if (dentry) {
lock_kernel();
result = dir->i_op->lookup(dir, dentry);
unlock_kernel();
if (result)
-@@ -321,6 +342,12 @@
+@@ -321,6 +345,12 @@
dput(result);
result = ERR_PTR(-ENOENT);
}
}
return result;
}
-@@ -449,7 +476,8 @@
+@@ -334,7 +364,8 @@
+ * Without that kind of total limit, nasty chains of consecutive
+ * symlinks can cause almost arbitrarily long lookups.
+ */
+-static inline int do_follow_link(struct dentry *dentry, struct nameidata *nd)
++static inline int do_follow_link(struct dentry *dentry, struct nameidata *nd,
++ struct lookup_intent *it)
+ {
+ int err;
+ if (current->link_count >= max_recursive_link)
+@@ -348,10 +379,14 @@
+ current->link_count++;
+ current->total_link_count++;
+ UPDATE_ATIME(dentry->d_inode);
+- err = dentry->d_inode->i_op->follow_link(dentry, nd);
++ if (dentry->d_inode->i_op->follow_link2)
++ err = dentry->d_inode->i_op->follow_link2(dentry, nd, it);
++ else
++ err = dentry->d_inode->i_op->follow_link(dentry, nd);
+ current->link_count--;
+ return err;
+ loop:
++ intent_release(dentry, it);
+ path_release(nd);
+ return -ELOOP;
+ }
+@@ -449,7 +484,8 @@
*
* We expect 'base' to be positive and a directory.
*/
{
struct dentry *dentry;
struct inode *inode;
-@@ -526,12 +554,12 @@
+@@ -526,12 +562,12 @@
break;
}
/* This does the actual lookups.. */
err = PTR_ERR(dentry);
if (IS_ERR(dentry))
break;
-@@ -565,7 +593,7 @@
+@@ -548,8 +584,8 @@
+ if (!inode->i_op)
+ goto out_dput;
+
+- if (inode->i_op->follow_link) {
+- err = do_follow_link(dentry, nd);
++ if (inode->i_op->follow_link || inode->i_op->follow_link2) {
++ err = do_follow_link(dentry, nd, it);
+ dput(dentry);
+ if (err)
+ goto return_err;
+@@ -565,7 +601,7 @@
nd->dentry = dentry;
}
err = -ENOTDIR;
break;
continue;
/* here ends the main loop */
-@@ -592,12 +620,12 @@
+@@ -592,12 +628,12 @@
if (err < 0)
break;
}
err = PTR_ERR(dentry);
if (IS_ERR(dentry))
break;
-@@ -621,7 +649,8 @@
+@@ -606,8 +642,10 @@
+ ;
+ inode = dentry->d_inode;
+ if ((lookup_flags & LOOKUP_FOLLOW)
+- && inode && inode->i_op && inode->i_op->follow_link) {
+- err = do_follow_link(dentry, nd);
++ && inode && inode->i_op &&
++ (inode->i_op->follow_link ||
++ inode->i_op->follow_link2)) {
++ err = do_follow_link(dentry, nd, it);
+ dput(dentry);
+ if (err)
+ goto return_err;
+@@ -621,7 +659,8 @@
goto no_inode;
if (lookup_flags & LOOKUP_DIRECTORY) {
err = -ENOTDIR;
break;
}
goto return_base;
-@@ -663,10 +693,21 @@
+@@ -663,10 +702,21 @@
return err;
}
}
/* SMP-safe */
-@@ -751,6 +795,17 @@
+@@ -751,6 +801,17 @@
}
/* SMP-safe */
int path_lookup(const char *path, unsigned flags, struct nameidata *nd)
{
int error = 0;
-@@ -779,7 +834,8 @@
+@@ -779,7 +840,8 @@
* needs parent already locked. Doesn't follow mounts.
* SMP-safe.
*/
{
struct dentry * dentry;
struct inode *inode;
-@@ -802,13 +858,16 @@
+@@ -802,13 +864,16 @@
goto out;
}
dentry = inode->i_op->lookup(inode, new);
unlock_kernel();
if (!dentry)
-@@ -820,6 +879,12 @@
+@@ -820,6 +885,12 @@
return dentry;
}
/* SMP-safe */
struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
{
-@@ -841,7 +906,7 @@
+@@ -841,7 +912,7 @@
}
this.hash = end_name_hash(hash);
access:
return ERR_PTR(-EACCES);
}
-@@ -872,6 +937,23 @@
+@@ -872,6 +943,23 @@
return err;
}
/*
* It's inline, so penalty for filesystems that don't use sticky bit is
* minimal.
-@@ -1010,7 +1092,8 @@
+@@ -1010,7 +1098,8 @@
* for symlinks (where the permissions are checked later).
* SMP-safe
*/
{
int acc_mode, error = 0;
struct inode *inode;
-@@ -1024,7 +1107,7 @@
+@@ -1024,7 +1113,7 @@
* The simplest case - just a plain lookup.
*/
if (!(flag & O_CREAT)) {
if (error)
return error;
dentry = nd->dentry;
-@@ -1034,6 +1117,10 @@
+@@ -1034,6 +1123,10 @@
/*
* Create - we need to know the parent.
*/
error = path_lookup(pathname, LOOKUP_PARENT, nd);
if (error)
return error;
-@@ -1049,7 +1137,7 @@
+@@ -1049,7 +1142,7 @@
dir = nd->dentry;
down(&dir->d_inode->i_sem);
do_last:
error = PTR_ERR(dentry);
-@@ -1058,6 +1146,7 @@
+@@ -1058,6 +1151,7 @@
goto exit;
}
/* Negative dentry, just create the file */
if (!dentry->d_inode) {
error = vfs_create(dir->d_inode, dentry,
-@@ -1177,8 +1267,10 @@
+@@ -1091,7 +1185,8 @@
+ error = -ENOENT;
+ if (!dentry->d_inode)
+ goto exit_dput;
+- if (dentry->d_inode->i_op && dentry->d_inode->i_op->follow_link)
++ if (dentry->d_inode->i_op && (dentry->d_inode->i_op->follow_link ||
++ dentry->d_inode->i_op->follow_link2))
+ goto do_link;
+
+ dput(nd->dentry);
+@@ -1177,8 +1272,10 @@
return 0;
exit_dput:
path_release(nd);
return error;
-@@ -1198,6 +1290,8 @@
+@@ -1197,7 +1294,12 @@
+ * are done. Procfs-like symlinks just set LAST_BIND.
*/
UPDATE_ATIME(dentry->d_inode);
- error = dentry->d_inode->i_op->follow_link(dentry, nd);
+- error = dentry->d_inode->i_op->follow_link(dentry, nd);
++ if (dentry->d_inode->i_op->follow_link2)
++ error = dentry->d_inode->i_op->follow_link2(dentry, nd, it);
++ else
++ error = dentry->d_inode->i_op->follow_link(dentry, nd);
+ if (error)
+ intent_release(dentry, it);
dput(dentry);
if (error)
return error;
-@@ -1219,13 +1313,20 @@
+@@ -1219,13 +1321,20 @@
}
dir = nd->dentry;
down(&dir->d_inode->i_sem);
{
struct dentry *dentry;
-@@ -1233,7 +1334,7 @@
+@@ -1233,7 +1342,7 @@
dentry = ERR_PTR(-EEXIST);
if (nd->last_type != LAST_NORM)
goto fail;
if (IS_ERR(dentry))
goto fail;
if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode)
-@@ -1279,6 +1380,7 @@
+@@ -1279,6 +1388,7 @@
char * tmp;
struct dentry * dentry;
struct nameidata nd;
if (S_ISDIR(mode))
return -EPERM;
-@@ -1289,7 +1391,7 @@
+@@ -1289,7 +1399,7 @@
error = path_lookup(tmp, LOOKUP_PARENT, &nd);
if (error)
goto out;
error = PTR_ERR(dentry);
mode &= ~current->fs->umask;
-@@ -1307,6 +1410,7 @@
+@@ -1307,6 +1417,7 @@
default:
error = -EINVAL;
}
dput(dentry);
}
up(&nd.dentry->d_inode->i_sem);
-@@ -1347,6 +1451,7 @@
+@@ -1347,6 +1458,7 @@
{
int error = 0;
char * tmp;
tmp = getname(pathname);
error = PTR_ERR(tmp);
-@@ -1357,11 +1462,12 @@
+@@ -1357,11 +1469,12 @@
error = path_lookup(tmp, LOOKUP_PARENT, &nd);
if (error)
goto out;
dput(dentry);
}
up(&nd.dentry->d_inode->i_sem);
-@@ -1445,6 +1552,7 @@
+@@ -1445,6 +1558,7 @@
char * name;
struct dentry *dentry;
struct nameidata nd;
name = getname(pathname);
if(IS_ERR(name))
-@@ -1466,10 +1574,11 @@
+@@ -1466,10 +1580,11 @@
goto exit1;
}
down(&nd.dentry->d_inode->i_sem);
dput(dentry);
}
up(&nd.dentry->d_inode->i_sem);
-@@ -1513,6 +1623,7 @@
+@@ -1513,6 +1628,7 @@
char * name;
struct dentry *dentry;
struct nameidata nd;
name = getname(pathname);
if(IS_ERR(name))
-@@ -1525,7 +1636,7 @@
+@@ -1525,7 +1641,7 @@
if (nd.last_type != LAST_NORM)
goto exit1;
down(&nd.dentry->d_inode->i_sem);
error = PTR_ERR(dentry);
if (!IS_ERR(dentry)) {
/* Why not before? Because we want correct error value */
-@@ -1533,6 +1644,7 @@
+@@ -1533,6 +1649,7 @@
goto slashes;
error = vfs_unlink(nd.dentry->d_inode, dentry);
exit2:
dput(dentry);
}
up(&nd.dentry->d_inode->i_sem);
-@@ -1579,6 +1692,7 @@
+@@ -1579,6 +1696,7 @@
int error = 0;
char * from;
char * to;
from = getname(oldname);
if(IS_ERR(from))
-@@ -1592,10 +1706,12 @@
+@@ -1592,10 +1710,12 @@
error = path_lookup(to, LOOKUP_PARENT, &nd);
if (error)
goto out;
dput(dentry);
}
up(&nd.dentry->d_inode->i_sem);
-@@ -1660,6 +1777,7 @@
+@@ -1660,6 +1780,7 @@
{
int error;
char * to;
to = getname(newname);
error = PTR_ERR(to);
-@@ -1667,7 +1785,7 @@
+@@ -1667,7 +1788,7 @@
struct dentry *new_dentry;
struct nameidata nd, old_nd;
if (error)
goto exit;
error = path_lookup(to, LOOKUP_PARENT, &nd);
-@@ -1676,10 +1794,12 @@
+@@ -1676,10 +1797,12 @@
error = -EXDEV;
if (old_nd.mnt != nd.mnt)
goto out_release;
dput(new_dentry);
}
up(&nd.dentry->d_inode->i_sem);
-@@ -1720,7 +1841,8 @@
+@@ -1720,7 +1843,8 @@
* locking].
*/
int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry,
{
int error;
struct inode *target;
-@@ -1778,6 +1900,7 @@
+@@ -1778,6 +1902,7 @@
error = -EBUSY;
else
error = old_dir->i_op->rename(old_dir, old_dentry, new_dir, new_dentry);
if (target) {
if (!error)
target->i_flags |= S_DEAD;
-@@ -1799,7 +1923,8 @@
+@@ -1799,7 +1924,8 @@
}
int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
{
int error;
-@@ -1830,6 +1951,7 @@
+@@ -1830,6 +1956,7 @@
error = -EBUSY;
else
error = old_dir->i_op->rename(old_dir, old_dentry, new_dir, new_dentry);
+ new_dir->d_inode, new_dentry, &it);
unlock_kernel();
-+ intent_release(new_dentry, &it);
++ intent_release(new_dentry, NULL);
dput(new_dentry);
exit4:
-+ intent_release(old_dentry, &it); // FIXME: release same intent twice!!!
++ intent_release(old_dentry, &it);
dput(old_dentry);
exit3:
double_up(&new_dir->d_inode->i_sem, &old_dir->d_inode->i_sem);
---- linux-2.4.18-12-uml-pristine/fs/open.c Mon Sep 9 14:41:56 2002
-+++ linux-2.4.18-12-uml/fs/open.c Mon Sep 9 16:11:20 2002
+@@ -1965,7 +2097,8 @@
+ }
+
+ static inline int
+-__vfs_follow_link(struct nameidata *nd, const char *link)
++__vfs_follow_link(struct nameidata *nd, const char *link,
++ struct lookup_intent *it)
+ {
+ int res = 0;
+ char *name;
+@@ -1978,7 +2111,7 @@
+ /* weird __emul_prefix() stuff did it */
+ goto out;
+ }
+- res = link_path_walk(link, nd);
++ res = link_path_walk_it(link, nd, it);
+ out:
+ if (current->link_count || res || nd->last_type!=LAST_NORM)
+ return res;
+@@ -2000,7 +2133,13 @@
+
+ int vfs_follow_link(struct nameidata *nd, const char *link)
+ {
+- return __vfs_follow_link(nd, link);
++ return __vfs_follow_link(nd, link, NULL);
++}
++
++int vfs_follow_link_it(struct nameidata *nd, const char *link,
++ struct lookup_intent *it)
++{
++ return __vfs_follow_link(nd, link, it);
+ }
+
+ /* get the link contents into pagecache */
+@@ -2042,7 +2181,7 @@
+ {
+ struct page *page = NULL;
+ char *s = page_getlink(dentry, &page);
+- int res = __vfs_follow_link(nd, s);
++ int res = __vfs_follow_link(nd, s, NULL);
+ if (page) {
+ kunmap(page);
+ page_cache_release(page);
+--- linux-2.4.18-17.8.0-uml-pristine/fs/open.c 2002-10-19 11:43:53.000000000 -0600
++++ linux-2.4.18-17.8.0-uml/fs/open.c 2002-10-19 11:44:51.000000000 -0600
@@ -19,6 +19,9 @@
#include <asm/uaccess.h>
if (error)
goto out;
inode = nd.dentry->d_inode;
-@@ -168,6 +173,7 @@
+@@ -168,6 +172,7 @@
put_write_access(inode);
dput_and_out:
path_release(&nd);
out:
return error;
-@@ -259,8 +265,9 @@
+@@ -259,8 +264,9 @@
struct nameidata nd;
struct inode * inode;
struct iattr newattrs;
if (error)
goto out;
inode = nd.dentry->d_inode;
-@@ -286,6 +294,7 @@
+@@ -286,6 +292,7 @@
}
error = notify_change(nd.dentry, &newattrs);
dput_and_out:
path_release(&nd);
out:
return error;
-@@ -303,8 +312,9 @@
+@@ -303,8 +310,9 @@
struct nameidata nd;
struct inode * inode;
struct iattr newattrs;
if (error)
goto out;
-@@ -331,6 +342,7 @@
+@@ -331,6 +339,7 @@
}
error = notify_change(nd.dentry, &newattrs);
dput_and_out:
path_release(&nd);
out:
return error;
-@@ -347,6 +359,7 @@
+@@ -347,6 +356,7 @@
int old_fsuid, old_fsgid;
kernel_cap_t old_cap;
int res;
if (mode & ~S_IRWXO) /* where's F_OK, X_OK, W_OK, R_OK? */
return -EINVAL;
-@@ -364,13 +377,14 @@
+@@ -364,13 +374,14 @@
else
current->cap_effective = current->cap_permitted;
path_release(&nd);
}
-@@ -385,8 +399,11 @@
+@@ -385,8 +396,11 @@
{
int error;
struct nameidata nd;
if (error)
goto out;
-@@ -397,6 +415,7 @@
+@@ -397,6 +411,7 @@
set_fs_pwd(current->fs, nd.mnt, nd.dentry);
dput_and_out:
path_release(&nd);
out:
return error;
-@@ -436,9 +455,10 @@
+@@ -436,9 +451,10 @@
{
int error;
struct nameidata nd;
if (error)
goto out;
-@@ -454,6 +475,7 @@
+@@ -454,6 +470,7 @@
set_fs_altroot();
error = 0;
dput_and_out:
path_release(&nd);
out:
return error;
-@@ -498,8 +520,9 @@
+@@ -498,8 +515,9 @@
struct inode * inode;
int error;
struct iattr newattrs;
if (error)
goto out;
inode = nd.dentry->d_inode;
-@@ -519,6 +543,7 @@
+@@ -519,6 +537,7 @@
error = notify_change(nd.dentry, &newattrs);
dput_and_out:
path_release(&nd);
out:
return error;
-@@ -588,10 +613,12 @@
+@@ -588,10 +607,12 @@
{
struct nameidata nd;
int error;
path_release(&nd);
}
return error;
-@@ -601,10 +629,12 @@
+@@ -601,10 +622,12 @@
{
struct nameidata nd;
int error;
path_release(&nd);
}
return error;
-@@ -638,10 +669,16 @@
+@@ -638,10 +661,16 @@
* for the internal routines (ie open_namei()/follow_link() etc). 00 is
* used by symlinks.
*/
namei_flags = flags;
if ((namei_flags+1) & O_ACCMODE)
-@@ -649,18 +686,19 @@
+@@ -649,18 +678,19 @@
if (namei_flags & O_TRUNC)
namei_flags |= 2;
- error = open_namei(filename, namei_flags, mode, &nd);
- if (!error)
- return dentry_open(nd.dentry, nd.mnt, flags);
--
-- return ERR_PTR(error);
+ error = open_namei_it(filename, namei_flags, mode, &nd, &it);
+ if (error)
+ return ERR_PTR(error);
-+
+
+- return ERR_PTR(error);
+ return dentry_open_it(nd.dentry, nd.mnt, flags, &it);
}
{
struct file * f;
struct inode *inode;
-@@ -711,6 +749,7 @@
+@@ -711,6 +741,7 @@
do_readahead(f, 0, (48 * 1024) >> PAGE_SHIFT);
return f;
cleanup_all:
-@@ -725,11 +764,17 @@
+@@ -725,11 +756,17 @@
cleanup_file:
put_filp(f);
cleanup_dentry:
/*
* Find an empty file descriptor entry, and mark it busy.
*/
---- linux-2.4.18-12-uml-pristine/fs/stat.c Mon Sep 9 14:41:56 2002
-+++ linux-2.4.18-12-uml/fs/stat.c Mon Sep 9 16:08:12 2002
+--- linux-2.4.18-17.8.0-uml-pristine/fs/stat.c 2002-10-19 11:43:53.000000000 -0600
++++ linux-2.4.18-17.8.0-uml/fs/stat.c 2002-10-19 11:44:51.000000000 -0600
@@ -13,6 +13,7 @@
#include <asm/uaccess.h>
path_release(&nd);
}
return error;
---- linux-2.4.18-12-uml-pristine/mm/slab.c Mon Sep 9 14:41:53 2002
-+++ linux-2.4.18-12-uml/mm/slab.c Mon Sep 9 16:08:12 2002
+--- linux-2.4.18-17.8.0-uml-pristine/mm/slab.c 2002-10-19 11:43:54.000000000 -0600
++++ linux-2.4.18-17.8.0-uml/mm/slab.c 2002-10-19 11:44:51.000000000 -0600
@@ -1208,6 +1208,59 @@
* Called with the cache-lock held.
*/
git://git.whamcloud.com / fs / lustre-release.git / blobdiff