3 fs/namei.c | 295 +++++++++++++++++++++++++++++++++++++++-------
4 fs/namespace.c | 28 +++-
5 fs/open.c | 172 +++++++++++++++++++-------
6 fs/stat.c | 52 +++++---
7 include/linux/dcache.h | 60 +++++++++
8 include/linux/fs.h | 32 ++++
9 include/linux/fs_struct.h | 4
13 12 files changed, 558 insertions(+), 128 deletions(-)
15 Index: linux-2.4.21-x86_64/fs/dcache.c
16 ===================================================================
17 --- linux-2.4.21-x86_64.orig/fs/dcache.c 2003-10-28 10:33:59.000000000 -0800
18 +++ linux-2.4.21-x86_64/fs/dcache.c 2004-04-12 19:57:36.000000000 -0700
20 spin_unlock(&dcache_lock);
24 + /* network invalidation by Lustre */
25 + if (dentry->d_flags & DCACHE_LUSTRE_INVALID) {
26 + spin_unlock(&dcache_lock);
31 * Check whether to do a partial shrink_dcache
32 * to get rid of unused child entries.
34 * Adds a dentry to the hash according to its name.
37 -void d_rehash(struct dentry * entry)
38 +void __d_rehash(struct dentry * entry, int lock)
40 struct list_head *list = d_hash(entry->d_parent, entry->d_name.hash);
41 if (!list_empty(&entry->d_hash)) BUG();
42 - spin_lock(&dcache_lock);
43 + if (lock) spin_lock(&dcache_lock);
44 list_add(&entry->d_hash, list);
45 - spin_unlock(&dcache_lock);
46 + if (lock) spin_unlock(&dcache_lock);
48 +EXPORT_SYMBOL(__d_rehash);
50 +void d_rehash(struct dentry * entry)
52 + __d_rehash(entry, 1);
55 #define do_switch(x,y) do { \
56 Index: linux-2.4.21-x86_64/fs/exec.c
57 ===================================================================
58 --- linux-2.4.21-x86_64.orig/fs/exec.c 2003-10-28 10:34:17.000000000 -0800
59 +++ linux-2.4.21-x86_64/fs/exec.c 2004-04-12 19:57:36.000000000 -0700
64 + struct lookup_intent it = { .it_op = IT_OPEN,
65 + .it_flags = FMODE_READ|FMODE_EXEC };
67 - error = user_path_walk(library, &nd);
68 + error = user_path_walk_it(library, &nd, &it);
76 - file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
77 + file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &it);
78 + intent_release(&it);
79 error = PTR_ERR(file);
86 + struct lookup_intent it = { .it_op = IT_OPEN,
87 + .it_flags = FMODE_READ|FMODE_EXEC };
89 - err = path_lookup(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd);
90 + err = path_lookup_it(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd, &it);
93 inode = nd.dentry->d_inode;
98 - file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
99 + file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &it);
100 + intent_release(&it);
102 err = deny_write_access(file);
108 + intent_release(&it);
112 @@ -1150,7 +1157,7 @@
114 if (!file->f_op->write)
116 - if (do_truncate(file->f_dentry, 0) != 0)
117 + if (do_truncate(file->f_dentry, 0, 0) != 0)
120 retval = binfmt->core_dump(signr, regs, file);
121 Index: linux-2.4.21-x86_64/fs/namei.c
122 ===================================================================
123 --- linux-2.4.21-x86_64.orig/fs/namei.c 2003-10-28 10:34:18.000000000 -0800
124 +++ linux-2.4.21-x86_64/fs/namei.c 2004-04-12 19:58:44.000000000 -0700
126 * XEmacs seems to be relying on it...
129 +void intent_release(struct lookup_intent *it)
131 + if (it && it->it_op_release)
132 + it->it_op_release(it);
136 /* In order to reduce some races, while at the same time doing additional
137 * checking and hopefully speeding things up, we copy filenames to the
138 * kernel data space before using them..
139 @@ -260,10 +267,19 @@
140 * Internal lookup() using the new generic dcache.
143 -static struct dentry * cached_lookup(struct dentry * parent, struct qstr * name, int flags)
144 +static struct dentry *cached_lookup(struct dentry *parent, struct qstr *name,
145 + int flags, struct lookup_intent *it)
147 struct dentry * dentry = d_lookup(parent, name);
149 + if (dentry && dentry->d_op && dentry->d_op->d_revalidate_it) {
150 + if (!dentry->d_op->d_revalidate_it(dentry, flags, it) &&
151 + !d_invalidate(dentry)) {
157 if (dentry && dentry->d_op && dentry->d_op->d_revalidate) {
158 if (!dentry->d_op->d_revalidate(dentry, flags) && !d_invalidate(dentry)) {
160 @@ -281,11 +297,15 @@
161 * make sure that nobody added the entry to the dcache in the meantime..
164 -static struct dentry * real_lookup(struct dentry * parent, struct qstr * name, int flags)
165 +static struct dentry *real_lookup(struct dentry *parent, struct qstr *name,
166 + int flags, struct lookup_intent *it)
168 struct dentry * result;
169 struct inode *dir = parent->d_inode;
176 * First re-do the cached lookup just in case it was created
178 result = ERR_PTR(-ENOMEM);
181 + if (dir->i_op->lookup_it)
182 + result = dir->i_op->lookup_it(dir, dentry, it, flags);
184 result = dir->i_op->lookup(dir, dentry);
189 result = ERR_PTR(-ENOENT);
191 + } else if (result->d_op && result->d_op->d_revalidate_it) {
192 + if (!result->d_op->d_revalidate_it(result, flags, it) &&
193 + !d_invalidate(result)) {
196 + result = ERR_PTR(-ESTALE);
197 + if (!IS_ERR(result))
204 * Without that kind of total limit, nasty chains of consecutive
205 * symlinks can cause almost arbitrarily long lookups.
207 -static inline int do_follow_link(struct dentry *dentry, struct nameidata *nd)
208 +static inline int do_follow_link(struct dentry *dentry, struct nameidata *nd,
209 + struct lookup_intent *it)
212 if (current->link_count >= 8)
213 @@ -346,10 +379,12 @@
214 current->link_count++;
215 current->total_link_count++;
216 UPDATE_ATIME(dentry->d_inode);
218 err = dentry->d_inode->i_op->follow_link(dentry, nd);
219 current->link_count--;
222 + intent_release(it);
228 * We expect 'base' to be positive and a directory.
230 -static inline int __link_path_walk(const char * name, struct nameidata *nd)
231 +static inline int __link_path_walk_it(const char * name, struct nameidata *nd,
232 + struct lookup_intent *it)
234 struct dentry *dentry;
236 @@ -524,12 +560,12 @@
239 /* This does the actual lookups.. */
240 - dentry = cached_lookup(nd->dentry, &this, LOOKUP_CONTINUE);
241 + dentry = cached_lookup(nd->dentry, &this, LOOKUP_CONTINUE, NULL);
243 err = -EWOULDBLOCKIO;
246 - dentry = real_lookup(nd->dentry, &this, LOOKUP_CONTINUE);
247 + dentry = real_lookup(nd->dentry, &this, LOOKUP_CONTINUE, NULL);
248 err = PTR_ERR(dentry);
254 if (inode->i_op->follow_link) {
255 - err = do_follow_link(dentry, nd);
256 + err = do_follow_link(dentry, nd, NULL);
264 - if (!inode->i_op->lookup)
265 + if (!inode->i_op->lookup && !inode->i_op->lookup_it)
268 /* here ends the main loop */
269 @@ -590,12 +626,12 @@
273 - dentry = cached_lookup(nd->dentry, &this, 0);
274 + dentry = cached_lookup(nd->dentry, &this, 0, it);
276 err = -EWOULDBLOCKIO;
279 - dentry = real_lookup(nd->dentry, &this, 0);
280 + dentry = real_lookup(nd->dentry, &this, 0, it);
281 err = PTR_ERR(dentry);
285 inode = dentry->d_inode;
286 if ((lookup_flags & LOOKUP_FOLLOW)
287 && inode && inode->i_op && inode->i_op->follow_link) {
288 - err = do_follow_link(dentry, nd);
289 + err = do_follow_link(dentry, nd, it);
295 if (lookup_flags & LOOKUP_DIRECTORY) {
297 - if (!inode->i_op || !inode->i_op->lookup)
298 + if (!inode->i_op ||
299 + (!inode->i_op->lookup && !inode->i_op->lookup_it))
303 @@ -637,12 +672,42 @@
304 nd->last_type = LAST_DOT;
305 else if (this.len == 2 && this.name[1] == '.')
306 nd->last_type = LAST_DOTDOT;
311 * We bypassed the ordinary revalidation routines.
312 * Check the cached dentry for staleness.
315 + if (dentry && dentry->d_op && dentry->d_op->d_revalidate_it) {
317 + if (!dentry->d_op->d_revalidate_it(dentry, 0, it)) {
318 + struct dentry *new;
319 + err = permission(dentry->d_parent->d_inode,
323 + new = real_lookup(dentry->d_parent,
324 + &dentry->d_name, 0, it);
326 + err = PTR_ERR(new);
329 + d_invalidate(dentry);
333 + if (!nd->dentry->d_inode)
335 + if (lookup_flags & LOOKUP_DIRECTORY) {
337 + if (!nd->dentry->d_inode->i_op ||
338 + (!nd->dentry->d_inode->i_op->lookup &&
339 + !nd->dentry->d_inode->i_op->lookup_it))
343 if (dentry && dentry->d_op && dentry->d_op->d_revalidate) {
345 if (!dentry->d_op->d_revalidate(dentry, lookup_flags & LOOKUP_PARENT)) {
351 + intent_release(it);
355 @@ -663,13 +723,13 @@
357 int link_path_walk(const char * name, struct nameidata *nd)
359 - return __link_path_walk(name,nd);
360 + return __link_path_walk_it(name, nd, NULL);
363 static inline int __path_walk(const char * name, struct nameidata *nd)
365 current->total_link_count = 0;
366 - return __link_path_walk(name, nd);
367 + return __link_path_walk_it(name, nd, NULL);
370 int path_walk(const char * name, struct nameidata *nd)
372 return __path_walk(name, nd);
375 +int path_walk_it(const char * name, struct nameidata *nd, struct lookup_intent *it)
377 + current->total_link_count = 0;
378 + return __link_path_walk_it(name, nd, it);
382 /* returns 1 if everything is done */
383 static int __emul_lookup_dentry(const char *name, struct nameidata *nd)
388 +int path_lookup_it(const char *path, unsigned flags, struct nameidata *nd,
389 + struct lookup_intent *it)
392 + if (path_init(path, flags, nd))
393 + error = path_walk_it(path, nd, it);
399 int path_lookup(const char *path, unsigned flags, struct nameidata *nd)
404 nd->last_type = LAST_ROOT; /* if there are only slashes... */
408 return walk_init_root(name,nd);
409 read_lock(¤t->fs->lock);
411 * needs parent already locked. Doesn't follow mounts.
414 -struct dentry * lookup_hash(struct qstr *name, struct dentry * base)
415 +struct dentry * lookup_hash_it(struct qstr *name, struct dentry * base,
416 + struct lookup_intent *it)
418 struct dentry * dentry;
420 @@ -810,13 +889,16 @@
424 - dentry = cached_lookup(base, name, 0);
425 + dentry = cached_lookup(base, name, 0, it);
427 struct dentry *new = d_alloc(base, name);
428 dentry = ERR_PTR(-ENOMEM);
432 + if (inode->i_op->lookup_it)
433 + dentry = inode->i_op->lookup_it(inode, new, it, 0);
435 dentry = inode->i_op->lookup(inode, new);
442 +struct dentry * lookup_hash(struct qstr *name, struct dentry * base)
444 + return lookup_hash_it(name, base, NULL);
449 struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
453 this.hash = end_name_hash(hash);
455 - return lookup_hash(&this, base);
456 + return lookup_hash_it(&this, base, NULL);
458 return ERR_PTR(-EACCES);
464 +int __user_walk_it(const char *name, unsigned flags, struct nameidata *nd,
465 + struct lookup_intent *it)
470 + tmp = getname(name);
471 + err = PTR_ERR(tmp);
472 + if (!IS_ERR(tmp)) {
474 + if (path_init(tmp, flags, nd))
475 + err = path_walk_it(tmp, nd, it);
482 * It's inline, so penalty for filesystems that don't use sticky bit is
488 -int vfs_create(struct inode *dir, struct dentry *dentry, int mode)
489 +static int vfs_create_it(struct inode *dir, struct dentry *dentry, int mode,
490 + struct lookup_intent *it)
494 @@ -990,12 +1096,15 @@
497 error = -EACCES; /* shouldn't it be ENOSYS? */
498 - if (!dir->i_op || !dir->i_op->create)
499 + if (!dir->i_op || (!dir->i_op->create && !dir->i_op->create_it))
504 - error = dir->i_op->create(dir, dentry, mode);
505 + if (dir->i_op->create_it)
506 + error = dir->i_op->create_it(dir, dentry, mode, it);
508 + error = dir->i_op->create(dir, dentry, mode);
512 @@ -1004,6 +1113,11 @@
516 +int vfs_create(struct inode *dir, struct dentry *dentry, int mode)
518 + return vfs_create_it(dir, dentry, mode, NULL);
524 @@ -1018,7 +1132,8 @@
525 * for symlinks (where the permissions are checked later).
528 -int open_namei(const char * pathname, int flag, int mode, struct nameidata *nd)
529 +int open_namei_it(const char *pathname, int flag, int mode,
530 + struct nameidata *nd, struct lookup_intent *it)
532 int acc_mode, error = 0;
534 @@ -1028,11 +1143,14 @@
536 acc_mode = ACC_MODE(flag);
539 + it->it_flags = flag;
542 * The simplest case - just a plain lookup.
544 if (!(flag & O_CREAT)) {
545 - error = path_lookup(pathname, lookup_flags(flag), nd);
546 + error = path_lookup_it(pathname, lookup_flags(flag), nd, it);
550 @@ -1042,6 +1160,10 @@
552 * Create - we need to know the parent.
555 + it->it_create_mode = mode;
556 + it->it_op |= IT_CREAT;
558 error = path_lookup(pathname, LOOKUP_PARENT, nd);
561 @@ -1057,7 +1179,7 @@
564 down(&dir->d_inode->i_sem);
565 - dentry = lookup_hash(&nd->last, nd->dentry);
566 + dentry = lookup_hash_it(&nd->last, nd->dentry, it);
569 error = PTR_ERR(dentry);
570 @@ -1066,11 +1188,12 @@
574 + it->it_create_mode = mode;
575 /* Negative dentry, just create the file */
576 if (!dentry->d_inode) {
577 if (!IS_POSIXACL(dir->d_inode))
578 mode &= ~current->fs->umask;
579 - error = vfs_create(dir->d_inode, dentry, mode);
580 + error = vfs_create_it(dir->d_inode, dentry, mode, it);
581 up(&dir->d_inode->i_sem);
582 #ifndef DENTRY_WASTE_RAM
584 @@ -1178,7 +1301,7 @@
588 - error = do_truncate(dentry, 0);
589 + error = do_truncate(dentry, 0, 1);
591 put_write_access(inode);
593 @@ -1190,8 +1313,10 @@
597 + intent_release(it);
600 + intent_release(it);
604 @@ -1210,7 +1335,10 @@
605 * are done. Procfs-like symlinks just set LAST_BIND.
607 UPDATE_ATIME(dentry->d_inode);
609 error = dentry->d_inode->i_op->follow_link(dentry, nd);
611 + intent_release(it);
615 @@ -1232,13 +1360,20 @@
618 down(&dir->d_inode->i_sem);
619 - dentry = lookup_hash(&nd->last, nd->dentry);
620 + dentry = lookup_hash_it(&nd->last, nd->dentry, it);
621 putname(nd->last.name);
625 +int open_namei(const char *pathname, int flag, int mode, struct nameidata *nd)
627 + return open_namei_it(pathname, flag, mode, nd, NULL);
632 -struct dentry *lookup_create(struct nameidata *nd, int is_dir)
633 +struct dentry *lookup_create(struct nameidata *nd, int is_dir,
634 + struct lookup_intent *it)
636 struct dentry *dentry;
638 @@ -1246,7 +1381,7 @@
639 dentry = ERR_PTR(-EEXIST);
640 if (nd->last_type != LAST_NORM)
642 - dentry = lookup_hash(&nd->last, nd->dentry);
643 + dentry = lookup_hash_it(&nd->last, nd->dentry, it);
646 if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode)
647 @@ -1302,7 +1437,20 @@
648 error = path_lookup(tmp, LOOKUP_PARENT, &nd);
651 - dentry = lookup_create(&nd, 0);
653 + if (nd.last_type != LAST_NORM) {
657 + if (nd.dentry->d_inode->i_op->mknod_raw) {
658 + struct inode_operations *op = nd.dentry->d_inode->i_op;
659 + error = op->mknod_raw(&nd, mode, dev);
660 + /* the file system wants to use normal vfs path now */
661 + if (error != -EOPNOTSUPP)
665 + dentry = lookup_create(&nd, 0, NULL);
666 error = PTR_ERR(dentry);
668 if (!IS_POSIXACL(nd.dentry->d_inode))
669 @@ -1324,6 +1472,7 @@
672 up(&nd.dentry->d_inode->i_sem);
677 @@ -1371,7 +1520,18 @@
678 error = path_lookup(tmp, LOOKUP_PARENT, &nd);
681 - dentry = lookup_create(&nd, 1);
682 + if (nd.last_type != LAST_NORM) {
686 + if (nd.dentry->d_inode->i_op->mkdir_raw) {
687 + struct inode_operations *op = nd.dentry->d_inode->i_op;
688 + error = op->mkdir_raw(&nd, mode);
689 + /* the file system wants to use normal vfs path now */
690 + if (error != -EOPNOTSUPP)
693 + dentry = lookup_create(&nd, 1, NULL);
694 error = PTR_ERR(dentry);
695 if (!IS_ERR(dentry)) {
696 if (!IS_POSIXACL(nd.dentry->d_inode))
697 @@ -1380,6 +1540,7 @@
700 up(&nd.dentry->d_inode->i_sem);
705 @@ -1480,8 +1641,16 @@
709 + if (nd.dentry->d_inode->i_op->rmdir_raw) {
710 + struct inode_operations *op = nd.dentry->d_inode->i_op;
712 + error = op->rmdir_raw(&nd);
713 + /* the file system wants to use normal vfs path now */
714 + if (error != -EOPNOTSUPP)
717 down(&nd.dentry->d_inode->i_sem);
718 - dentry = lookup_hash(&nd.last, nd.dentry);
719 + dentry = lookup_hash_it(&nd.last, nd.dentry, NULL);
720 error = PTR_ERR(dentry);
721 if (!IS_ERR(dentry)) {
722 error = vfs_rmdir(nd.dentry->d_inode, dentry);
723 @@ -1539,8 +1708,15 @@
725 if (nd.last_type != LAST_NORM)
727 + if (nd.dentry->d_inode->i_op->unlink_raw) {
728 + struct inode_operations *op = nd.dentry->d_inode->i_op;
729 + error = op->unlink_raw(&nd);
730 + /* the file system wants to use normal vfs path now */
731 + if (error != -EOPNOTSUPP)
734 down(&nd.dentry->d_inode->i_sem);
735 - dentry = lookup_hash(&nd.last, nd.dentry);
736 + dentry = lookup_hash_it(&nd.last, nd.dentry, NULL);
737 error = PTR_ERR(dentry);
738 if (!IS_ERR(dentry)) {
739 /* Why not before? Because we want correct error value */
740 @@ -1607,15 +1783,27 @@
741 error = path_lookup(to, LOOKUP_PARENT, &nd);
744 - dentry = lookup_create(&nd, 0);
745 + if (nd.last_type != LAST_NORM) {
749 + if (nd.dentry->d_inode->i_op->symlink_raw) {
750 + struct inode_operations *op = nd.dentry->d_inode->i_op;
751 + error = op->symlink_raw(&nd, from);
752 + /* the file system wants to use normal vfs path now */
753 + if (error != -EOPNOTSUPP)
756 + dentry = lookup_create(&nd, 0, NULL);
757 error = PTR_ERR(dentry);
758 if (!IS_ERR(dentry)) {
759 error = vfs_symlink(nd.dentry->d_inode, dentry, from);
762 up(&nd.dentry->d_inode->i_sem);
770 @@ -1691,7 +1879,18 @@
772 if (old_nd.mnt != nd.mnt)
774 - new_dentry = lookup_create(&nd, 0);
775 + if (nd.last_type != LAST_NORM) {
779 + if (nd.dentry->d_inode->i_op->link_raw) {
780 + struct inode_operations *op = nd.dentry->d_inode->i_op;
781 + error = op->link_raw(&old_nd, &nd);
782 + /* the file system wants to use normal vfs path now */
783 + if (error != -EOPNOTSUPP)
786 + new_dentry = lookup_create(&nd, 0, NULL);
787 error = PTR_ERR(new_dentry);
788 if (!IS_ERR(new_dentry)) {
789 error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry);
790 @@ -1735,7 +1934,7 @@
793 int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry,
794 - struct inode *new_dir, struct dentry *new_dentry)
795 + struct inode *new_dir, struct dentry *new_dentry)
798 struct inode *target;
799 @@ -1814,7 +2013,7 @@
802 int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
803 - struct inode *new_dir, struct dentry *new_dentry)
804 + struct inode *new_dir, struct dentry *new_dentry)
808 @@ -1902,9 +2101,18 @@
809 if (newnd.last_type != LAST_NORM)
812 + if (old_dir->d_inode->i_op->rename_raw) {
814 + error = old_dir->d_inode->i_op->rename_raw(&oldnd, &newnd);
816 + /* the file system wants to use normal vfs path now */
817 + if (error != -EOPNOTSUPP)
821 double_lock(new_dir, old_dir);
823 - old_dentry = lookup_hash(&oldnd.last, old_dir);
824 + old_dentry = lookup_hash_it(&oldnd.last, old_dir, NULL);
825 error = PTR_ERR(old_dentry);
826 if (IS_ERR(old_dentry))
828 @@ -1920,16 +2128,16 @@
829 if (newnd.last.name[newnd.last.len])
832 - new_dentry = lookup_hash(&newnd.last, new_dir);
833 + new_dentry = lookup_hash_it(&newnd.last, new_dir, NULL);
834 error = PTR_ERR(new_dentry);
835 if (IS_ERR(new_dentry))
840 error = vfs_rename(old_dir->d_inode, old_dentry,
841 new_dir->d_inode, new_dentry);
847 @@ -1980,20 +2188,26 @@
851 -__vfs_follow_link(struct nameidata *nd, const char *link)
852 +__vfs_follow_link(struct nameidata *nd, const char *link,
853 + struct lookup_intent *it)
862 + else if (it != nd->intent)
863 + printk("it != nd->intent: tell phil@clusterfs.com\n");
867 if (!walk_init_root(link, nd))
868 /* weird __emul_prefix() stuff did it */
871 - res = __link_path_walk(link, nd);
872 + res = __link_path_walk_it(link, nd, it);
874 if (current->link_count || res || nd->last_type!=LAST_NORM)
876 @@ -2017,7 +2231,13 @@
878 int vfs_follow_link(struct nameidata *nd, const char *link)
880 - return __vfs_follow_link(nd, link);
881 + return __vfs_follow_link(nd, link, NULL);
884 +int vfs_follow_link_it(struct nameidata *nd, const char *link,
885 + struct lookup_intent *it)
887 + return __vfs_follow_link(nd, link, it);
890 /* get the link contents into pagecache */
891 @@ -2059,7 +2279,7 @@
893 struct page *page = NULL;
894 char *s = page_getlink(dentry, &page);
895 - int res = __vfs_follow_link(nd, s);
896 + int res = __vfs_follow_link(nd, s, NULL);
899 page_cache_release(page);
900 Index: linux-2.4.21-x86_64/fs/namespace.c
901 ===================================================================
902 --- linux-2.4.21-x86_64.orig/fs/namespace.c 2003-10-28 10:34:12.000000000 -0800
903 +++ linux-2.4.21-x86_64/fs/namespace.c 2004-04-12 19:57:36.000000000 -0700
906 old_nd->dentry = mnt->mnt_mountpoint;
907 old_nd->mnt = mnt->mnt_parent;
908 + UNPIN(old_nd->dentry, old_nd->mnt, 1);
909 mnt->mnt_parent = mnt;
910 mnt->mnt_mountpoint = mnt->mnt_root;
911 list_del_init(&mnt->mnt_child);
914 mnt->mnt_parent = mntget(nd->mnt);
915 mnt->mnt_mountpoint = dget(nd->dentry);
916 + PIN(nd->dentry, nd->mnt, 1);
917 list_add(&mnt->mnt_hash, mount_hashtable+hash(nd->mnt, nd->dentry));
918 list_add(&mnt->mnt_child, &nd->mnt->mnt_mounts);
919 nd->dentry->d_mounted++;
920 @@ -488,14 +490,17 @@
922 struct nameidata old_nd;
923 struct vfsmount *mnt = NULL;
924 + struct lookup_intent it = { .it_op = IT_GETATTR };
925 int err = mount_is_safe(nd);
928 if (!old_name || !*old_name)
930 - err = path_lookup(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd);
932 + err = path_lookup_it(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd, &it);
934 + intent_release(&it);
938 down_write(¤t->namespace->sem);
943 up_write(¤t->namespace->sem);
944 + intent_release(&it);
945 path_release(&old_nd);
949 unsigned long flags, void *data_page)
952 + struct lookup_intent it = { .it_op = IT_GETATTR };
956 @@ -725,10 +732,11 @@
957 flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV);
959 /* ... and get the mountpoint */
960 - retval = path_lookup(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd);
962 + retval = path_lookup_it(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd, &it);
964 + intent_release(&it);
968 if (flags & MS_REMOUNT)
969 retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
973 retval = do_add_mount(&nd, type_page, flags, mnt_flags,
974 dev_name, data_page);
976 + intent_release(&it);
982 struct vfsmount *tmp;
983 struct nameidata new_nd, old_nd, parent_nd, root_parent, user_nd;
984 + struct lookup_intent new_it = { .it_op = IT_GETATTR };
985 + struct lookup_intent old_it = { .it_op = IT_GETATTR };
988 if (!capable(CAP_SYS_ADMIN))
989 @@ -911,14 +923,14 @@
993 - error = __user_walk(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd);
994 + error = __user_walk_it(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd, &new_it);
998 if (!check_mnt(new_nd.mnt))
1001 - error = __user_walk(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd);
1002 + error = __user_walk_it(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd, &old_it);
1006 @@ -973,8 +985,10 @@
1007 up(&old_nd.dentry->d_inode->i_zombie);
1008 up_write(¤t->namespace->sem);
1009 path_release(&user_nd);
1010 + intent_release(&old_it);
1011 path_release(&old_nd);
1013 + intent_release(&new_it);
1014 path_release(&new_nd);
1017 Index: linux-2.4.21-x86_64/fs/open.c
1018 ===================================================================
1019 --- linux-2.4.21-x86_64.orig/fs/open.c 2003-10-28 10:33:59.000000000 -0800
1020 +++ linux-2.4.21-x86_64/fs/open.c 2004-04-12 19:57:36.000000000 -0700
1022 #include <asm/uaccess.h>
1024 #define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))
1025 +extern int path_walk_it(const char *name, struct nameidata *nd,
1026 + struct lookup_intent *it);
1028 int vfs_statfs(struct super_block *sb, struct statfs *buf)
1031 write_unlock(&files->file_lock);
1034 -int do_truncate(struct dentry *dentry, loff_t length)
1035 +int do_truncate(struct dentry *dentry, loff_t length, int called_from_open)
1037 struct inode *inode = dentry->d_inode;
1038 + struct inode_operations *op = dentry->d_inode->i_op;
1040 struct iattr newattrs;
1042 @@ -109,7 +112,13 @@
1043 down(&inode->i_sem);
1044 newattrs.ia_size = length;
1045 newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
1046 - error = notify_change(dentry, &newattrs);
1047 + if (called_from_open)
1048 + newattrs.ia_valid |= ATTR_FROM_OPEN;
1049 + if (op->setattr_raw) {
1050 + newattrs.ia_valid |= ATTR_RAW;
1051 + error = op->setattr_raw(inode, &newattrs);
1053 + error = notify_change(dentry, &newattrs);
1055 up_write(&inode->i_alloc_sem);
1057 @@ -120,12 +129,13 @@
1058 struct nameidata nd;
1059 struct inode * inode;
1061 + struct lookup_intent it = { .it_op = IT_GETATTR };
1064 if (length < 0) /* sorry, but loff_t says... */
1067 - error = user_path_walk(path, &nd);
1068 + error = user_path_walk_it(path, &nd, &it);
1071 inode = nd.dentry->d_inode;
1072 @@ -165,11 +175,13 @@
1073 error = locks_verify_truncate(inode, NULL, length);
1076 - error = do_truncate(nd.dentry, length);
1077 + intent_release(&it);
1078 + error = do_truncate(nd.dentry, length, 0);
1080 put_write_access(inode);
1083 + intent_release(&it);
1089 error = locks_verify_truncate(inode, file, length);
1091 - error = do_truncate(dentry, length);
1092 + error = do_truncate(dentry, length, 0);
1096 @@ -262,11 +274,13 @@
1097 struct inode * inode;
1098 struct iattr newattrs;
1100 - error = user_path_walk(filename, &nd);
1101 + error = user_path_walk_it(filename, &nd, NULL);
1104 inode = nd.dentry->d_inode;
1106 + /* this is safe without a Lustre lock because it only depends
1107 + on the super block */
1109 if (IS_RDONLY(inode))
1111 @@ -281,11 +295,25 @@
1114 newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET;
1118 + if (inode->i_op->setattr_raw) {
1119 + struct inode_operations *op = nd.dentry->d_inode->i_op;
1121 + newattrs.ia_valid |= ATTR_RAW;
1122 + error = op->setattr_raw(inode, &newattrs);
1123 + /* the file system wants to use normal vfs path now */
1124 + if (error != -EOPNOTSUPP)
1125 + goto dput_and_out;
1130 if (current->fsuid != inode->i_uid &&
1131 (error = permission(inode,MAY_WRITE)) != 0)
1135 error = notify_change(nd.dentry, &newattrs);
1138 @@ -306,12 +334,14 @@
1139 struct inode * inode;
1140 struct iattr newattrs;
1142 - error = user_path_walk(filename, &nd);
1143 + error = user_path_walk_it(filename, &nd, NULL);
1147 inode = nd.dentry->d_inode;
1149 + /* this is safe without a Lustre lock because it only depends
1150 + on the super block */
1152 if (IS_RDONLY(inode))
1154 @@ -326,7 +356,20 @@
1155 newattrs.ia_atime = times[0].tv_sec;
1156 newattrs.ia_mtime = times[1].tv_sec;
1157 newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET;
1161 + if (inode->i_op->setattr_raw) {
1162 + struct inode_operations *op = nd.dentry->d_inode->i_op;
1164 + newattrs.ia_valid |= ATTR_RAW;
1165 + error = op->setattr_raw(inode, &newattrs);
1166 + /* the file system wants to use normal vfs path now */
1167 + if (error != -EOPNOTSUPP)
1168 + goto dput_and_out;
1173 if (current->fsuid != inode->i_uid &&
1174 (error = permission(inode,MAY_WRITE)) != 0)
1177 int old_fsuid, old_fsgid;
1178 kernel_cap_t old_cap;
1180 + struct lookup_intent it = { .it_op = IT_GETATTR };
1182 if (mode & ~S_IRWXO) /* where's F_OK, X_OK, W_OK, R_OK? */
1184 @@ -366,13 +410,14 @@
1186 current->cap_effective = current->cap_permitted;
1188 - res = user_path_walk(filename, &nd);
1189 + res = user_path_walk_it(filename, &nd, &it);
1191 res = permission(nd.dentry->d_inode, mode);
1192 /* SuS v2 requires we report a read only fs too */
1193 if(!res && (mode & S_IWOTH) && IS_RDONLY(nd.dentry->d_inode)
1194 && !special_file(nd.dentry->d_inode->i_mode))
1196 + intent_release(&it);
1203 struct nameidata nd;
1204 + struct lookup_intent it = { .it_op = IT_GETATTR };
1206 - error = __user_walk(filename,LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY,&nd);
1207 + error = __user_walk_it(filename,LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY,&nd, &it);
1212 set_fs_pwd(current->fs, nd.mnt, nd.dentry);
1215 + intent_release(&it);
1219 @@ -438,9 +485,10 @@
1222 struct nameidata nd;
1223 + struct lookup_intent it = { .it_op = IT_GETATTR };
1225 - error = __user_walk(filename, LOOKUP_POSITIVE | LOOKUP_FOLLOW |
1226 - LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd);
1227 + error = __user_walk_it(filename, LOOKUP_POSITIVE | LOOKUP_FOLLOW |
1228 + LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd, &it);
1232 @@ -456,39 +504,56 @@
1236 + intent_release(&it);
1242 -asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
1243 +int chmod_common(struct dentry *dentry, mode_t mode)
1245 - struct inode * inode;
1246 - struct dentry * dentry;
1247 - struct file * file;
1249 + struct inode *inode = dentry->d_inode;
1250 struct iattr newattrs;
1255 + if (IS_RDONLY(inode))
1258 - dentry = file->f_dentry;
1259 - inode = dentry->d_inode;
1260 + if (inode->i_op->setattr_raw) {
1261 + newattrs.ia_mode = mode;
1262 + newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
1263 + newattrs.ia_valid |= ATTR_RAW;
1264 + err = inode->i_op->setattr_raw(inode, &newattrs);
1265 + /* the file system wants to use normal vfs path now */
1266 + if (err != -EOPNOTSUPP)
1271 - if (IS_RDONLY(inode))
1274 if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
1278 if (mode == (mode_t) -1)
1279 mode = inode->i_mode;
1280 newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
1281 newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
1282 err = notify_change(dentry, &newattrs);
1289 +asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
1291 + struct file * file;
1298 + err = chmod_common(file->f_dentry, mode);
1303 @@ -497,30 +562,14 @@
1304 asmlinkage long sys_chmod(const char * filename, mode_t mode)
1306 struct nameidata nd;
1307 - struct inode * inode;
1309 - struct iattr newattrs;
1311 error = user_path_walk(filename, &nd);
1314 - inode = nd.dentry->d_inode;
1317 - if (IS_RDONLY(inode))
1318 - goto dput_and_out;
1321 - if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
1322 - goto dput_and_out;
1323 + error = chmod_common(nd.dentry, mode);
1325 - if (mode == (mode_t) -1)
1326 - mode = inode->i_mode;
1327 - newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
1328 - newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
1329 - error = notify_change(nd.dentry, &newattrs);
1335 @@ -540,6 +589,20 @@
1337 if (IS_RDONLY(inode))
1340 + if (inode->i_op->setattr_raw) {
1341 + struct inode_operations *op = dentry->d_inode->i_op;
1343 + newattrs.ia_uid = user;
1344 + newattrs.ia_gid = group;
1345 + newattrs.ia_valid = ATTR_UID | ATTR_GID | ATTR_CTIME;
1346 + newattrs.ia_valid |= ATTR_RAW;
1347 + error = op->setattr_raw(inode, &newattrs);
1348 + /* the file system wants to use normal vfs path now */
1349 + if (error != -EOPNOTSUPP)
1354 if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
1358 int namei_flags, error;
1359 struct nameidata nd;
1360 + struct lookup_intent it = { .it_op = IT_OPEN };
1362 namei_flags = flags;
1363 if ((namei_flags+1) & O_ACCMODE)
1364 @@ -651,14 +715,15 @@
1365 if (namei_flags & O_TRUNC)
1368 - error = open_namei(filename, namei_flags, mode, &nd);
1370 - return dentry_open(nd.dentry, nd.mnt, flags);
1371 + error = open_namei_it(filename, namei_flags, mode, &nd, &it);
1373 + return ERR_PTR(error);
1375 - return ERR_PTR(error);
1376 + return dentry_open_it(nd.dentry, nd.mnt, flags, &it);
1379 -struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
1380 +struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt,
1381 + int flags, struct lookup_intent *it)
1384 struct inode *inode;
1386 file_move(f, &inode->i_sb->s_files);
1388 if (f->f_op && f->f_op->open) {
1390 error = f->f_op->open(inode,f);
1396 !inode->i_mapping->a_ops->direct_IO))
1399 + intent_release(it);
1403 @@ -710,11 +778,17 @@
1407 + intent_release(it);
1410 return ERR_PTR(error);
1413 +struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
1415 + return dentry_open_it(dentry, mnt, flags, NULL);
1419 * Find an empty file descriptor entry, and mark it busy.
1421 Index: linux-2.4.21-x86_64/fs/stat.c
1422 ===================================================================
1423 --- linux-2.4.21-x86_64.orig/fs/stat.c 2003-10-28 10:33:58.000000000 -0800
1424 +++ linux-2.4.21-x86_64/fs/stat.c 2004-04-12 19:58:44.000000000 -0700
1426 * Revalidate the inode. This is required for proper NFS attribute caching.
1428 static __inline__ int
1429 -do_revalidate(struct dentry *dentry)
1430 +do_revalidate(struct dentry *dentry, struct lookup_intent *it)
1432 struct inode * inode = dentry->d_inode;
1433 - if (inode->i_op && inode->i_op->revalidate)
1434 + if (inode->i_op && inode->i_op->revalidate_it)
1435 + return inode->i_op->revalidate_it(dentry, it);
1436 + else if (inode->i_op && inode->i_op->revalidate)
1437 return inode->i_op->revalidate(dentry);
1440 @@ -141,13 +143,15 @@
1441 asmlinkage long sys_stat(char * filename, struct __old_kernel_stat * statbuf)
1443 struct nameidata nd;
1444 + struct lookup_intent it = { .it_op = IT_GETATTR };
1447 - error = user_path_walk(filename, &nd);
1448 + error = user_path_walk_it(filename, &nd, &it);
1450 - error = do_revalidate(nd.dentry);
1451 + error = do_revalidate(nd.dentry, &it);
1453 error = cp_old_stat(nd.dentry->d_inode, statbuf);
1454 + intent_release(&it);
1458 @@ -157,13 +161,15 @@
1459 asmlinkage long sys_newstat(char * filename, struct stat * statbuf)
1461 struct nameidata nd;
1462 + struct lookup_intent it = { .it_op = IT_GETATTR };
1465 - error = user_path_walk(filename, &nd);
1466 + error = user_path_walk_it(filename, &nd, &it);
1468 - error = do_revalidate(nd.dentry);
1469 + error = do_revalidate(nd.dentry, &it);
1471 error = cp_new_stat(nd.dentry->d_inode, statbuf);
1472 + intent_release(&it);
1476 @@ -178,13 +184,15 @@
1477 asmlinkage long sys_lstat(char * filename, struct __old_kernel_stat * statbuf)
1479 struct nameidata nd;
1480 + struct lookup_intent it = { .it_op = IT_GETATTR };
1483 - error = user_path_walk_link(filename, &nd);
1484 + error = user_path_walk_link_it(filename, &nd, &it);
1486 - error = do_revalidate(nd.dentry);
1487 + error = do_revalidate(nd.dentry, &it);
1489 error = cp_old_stat(nd.dentry->d_inode, statbuf);
1490 + intent_release(&it);
1494 @@ -195,13 +203,15 @@
1495 asmlinkage long sys_newlstat(char * filename, struct stat * statbuf)
1497 struct nameidata nd;
1498 + struct lookup_intent it = { .it_op = IT_GETATTR };
1501 - error = user_path_walk_link(filename, &nd);
1502 + error = user_path_walk_link_it(filename, &nd, &it);
1504 - error = do_revalidate(nd.dentry);
1505 + error = do_revalidate(nd.dentry, &it);
1507 error = cp_new_stat(nd.dentry->d_inode, statbuf);
1508 + intent_release(&it);
1514 struct dentry * dentry = f->f_dentry;
1516 - err = do_revalidate(dentry);
1517 + err = do_revalidate(dentry, NULL);
1519 err = cp_old_stat(dentry->d_inode, statbuf);
1523 struct dentry * dentry = f->f_dentry;
1525 - err = do_revalidate(dentry);
1526 + err = do_revalidate(dentry, NULL);
1528 err = cp_new_stat(dentry->d_inode, statbuf);
1533 if (inode->i_op && inode->i_op->readlink &&
1534 - !(error = do_revalidate(nd.dentry))) {
1535 + !(error = do_revalidate(nd.dentry, NULL))) {
1536 UPDATE_ATIME(inode);
1537 error = inode->i_op->readlink(nd.dentry, buf, bufsiz);
1539 @@ -339,12 +349,14 @@
1541 struct nameidata nd;
1543 + struct lookup_intent it = { .it_op = IT_GETATTR };
1545 - error = user_path_walk(filename, &nd);
1546 + error = user_path_walk_it(filename, &nd, &it);
1548 - error = do_revalidate(nd.dentry);
1549 + error = do_revalidate(nd.dentry, &it);
1551 error = cp_new_stat64(nd.dentry->d_inode, statbuf);
1552 + intent_release(&it);
1556 @@ -354,12 +366,14 @@
1558 struct nameidata nd;
1560 + struct lookup_intent it = { .it_op = IT_GETATTR };
1562 - error = user_path_walk_link(filename, &nd);
1563 + error = user_path_walk_link_it(filename, &nd, &it);
1565 - error = do_revalidate(nd.dentry);
1566 + error = do_revalidate(nd.dentry, &it);
1568 error = cp_new_stat64(nd.dentry->d_inode, statbuf);
1569 + intent_release(&it);
1575 struct dentry * dentry = f->f_dentry;
1577 - err = do_revalidate(dentry);
1578 + err = do_revalidate(dentry, NULL);
1580 err = cp_new_stat64(dentry->d_inode, statbuf);
1582 Index: linux-2.4.21-x86_64/include/linux/dcache.h
1583 ===================================================================
1584 --- linux-2.4.21-x86_64.orig/include/linux/dcache.h 2003-11-10 16:44:28.000000000 -0800
1585 +++ linux-2.4.21-x86_64/include/linux/dcache.h 2004-04-12 19:57:36.000000000 -0700
1587 #include <linux/gdb.h>
1588 #include <linux/mount.h>
1589 #include <linux/kernel.h>
1590 +#include <linux/string.h>
1592 +#define IT_OPEN 0x0001
1593 +#define IT_CREAT 0x0002
1594 +#define IT_READDIR 0x0004
1595 +#define IT_GETATTR 0x0008
1596 +#define IT_LOOKUP 0x0010
1597 +#define IT_UNLINK 0x0020
1598 +#define IT_GETXATTR 0x0040
1599 +#define IT_EXEC 0x0080
1600 +#define IT_PIN 0x0100
1602 +#define IT_FL_LOCKED 0x0001
1603 +#define IT_FL_FOLLOWED 0x0002 /* set by vfs_follow_link */
1605 +#define INTENT_MAGIC 0x19620323
1608 +struct lustre_intent_data {
1609 + int it_disposition;
1611 + __u64 it_lock_handle;
1616 +struct lookup_intent {
1618 + void (*it_op_release)(struct lookup_intent *);
1621 + int it_create_mode;
1623 + struct lustre_intent_data lustre;
1627 +static inline void intent_init(struct lookup_intent *it, int op, int flags)
1629 + memset(it, 0, sizeof(*it));
1630 + it->it_magic = INTENT_MAGIC;
1632 + it->it_flags = flags;
1637 * linux/include/linux/dcache.h
1639 int (*d_delete)(struct dentry *);
1640 void (*d_release)(struct dentry *);
1641 void (*d_iput)(struct dentry *, struct inode *);
1642 + int (*d_revalidate_it)(struct dentry *, int, struct lookup_intent *);
1643 + void (*d_pin)(struct dentry *, struct vfsmount * , int);
1644 + void (*d_unpin)(struct dentry *, struct vfsmount *, int);
1647 +#define PIN(de,mnt,flag) if (de && de->d_op && de->d_op->d_pin) \
1648 + de->d_op->d_pin(de, mnt, flag);
1649 +#define UNPIN(de,mnt,flag) if (de && de->d_op && de->d_op->d_unpin) \
1650 + de->d_op->d_unpin(de, mnt, flag);
1653 +/* defined in fs/namei.c */
1654 +extern void intent_release(struct lookup_intent *it);
1655 +/* defined in fs/dcache.c */
1656 +extern void __d_rehash(struct dentry * entry, int lock);
1658 /* the dentry parameter passed to d_hash and d_compare is the parent
1659 * directory of the entries to be compared. It is used in case these
1660 * functions need any directory specific information for determining
1662 * s_nfsd_free_path semaphore will be down
1664 #define DCACHE_REFERENCED 0x0008 /* Recently used, don't discard. */
1665 +#define DCACHE_LUSTRE_INVALID 0x0010 /* Lustre invalidated */
1667 extern spinlock_t dcache_lock;
1669 Index: linux-2.4.21-x86_64/include/linux/fs.h
1670 ===================================================================
1671 --- linux-2.4.21-x86_64.orig/include/linux/fs.h 2004-04-12 19:57:33.000000000 -0700
1672 +++ linux-2.4.21-x86_64/include/linux/fs.h 2004-04-12 19:57:36.000000000 -0700
1675 #define FMODE_READ 1
1676 #define FMODE_WRITE 2
1677 +#define FMODE_EXEC 4
1682 #define ATTR_MTIME_SET 256
1683 #define ATTR_FORCE 512 /* Not a change, but a change it */
1684 #define ATTR_ATTR_FLAG 1024
1685 +#define ATTR_RAW 0x0800 /* file system, not vfs will massage attrs */
1686 +#define ATTR_FROM_OPEN 0x1000 /* called from open path, ie O_TRUNC */
1687 +#define ATTR_CTIME_SET 0x2000
1690 * This is the Inode Attributes structure, used for notify_change(). It
1692 struct pipe_inode_info *i_pipe;
1693 struct block_device *i_bdev;
1694 struct char_device *i_cdev;
1695 + void *i_filterdata;
1697 unsigned long i_dnotify_mask; /* Directory notify events */
1698 struct dnotify_struct *i_dnotify; /* for directory notifications */
1701 /* needed for tty driver, and maybe others */
1703 + struct lookup_intent *f_it;
1704 struct list_head f_ep_links;
1705 spinlock_t f_ep_lock;
1711 + struct lookup_intent *intent;
1716 extern int __vfs_rmdir(struct inode *, struct dentry *);
1717 extern int vfs_rmdir(struct inode *, struct dentry *);
1718 extern int vfs_unlink(struct inode *, struct dentry *);
1719 -extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *);
1720 +int vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
1721 + struct inode *new_dir, struct dentry *new_dentry);
1725 @@ -992,21 +1000,32 @@
1727 struct inode_operations {
1728 int (*create) (struct inode *,struct dentry *,int);
1729 + int (*create_it) (struct inode *,struct dentry *,int, struct lookup_intent *);
1730 struct dentry * (*lookup) (struct inode *,struct dentry *);
1731 + struct dentry * (*lookup_it) (struct inode *,struct dentry *, struct lookup_intent *, int flags);
1732 int (*link) (struct dentry *,struct inode *,struct dentry *);
1733 + int (*link_raw) (struct nameidata *,struct nameidata *);
1734 int (*unlink) (struct inode *,struct dentry *);
1735 + int (*unlink_raw) (struct nameidata *);
1736 int (*symlink) (struct inode *,struct dentry *,const char *);
1737 + int (*symlink_raw) (struct nameidata *,const char *);
1738 int (*mkdir) (struct inode *,struct dentry *,int);
1739 + int (*mkdir_raw) (struct nameidata *,int);
1740 int (*rmdir) (struct inode *,struct dentry *);
1741 + int (*rmdir_raw) (struct nameidata *);
1742 int (*mknod) (struct inode *,struct dentry *,int,int);
1743 + int (*mknod_raw) (struct nameidata *,int,dev_t);
1744 int (*rename) (struct inode *, struct dentry *,
1745 struct inode *, struct dentry *);
1746 + int (*rename_raw) (struct nameidata *, struct nameidata *);
1747 int (*readlink) (struct dentry *, char *,int);
1748 int (*follow_link) (struct dentry *, struct nameidata *);
1749 void (*truncate) (struct inode *);
1750 int (*permission) (struct inode *, int);
1751 int (*revalidate) (struct dentry *);
1752 + int (*revalidate_it) (struct dentry *, struct lookup_intent *);
1753 int (*setattr) (struct dentry *, struct iattr *);
1754 + int (*setattr_raw) (struct inode *, struct iattr *);
1755 int (*getattr) (struct dentry *, struct iattr *);
1756 int (*setxattr) (struct dentry *, const char *, const void *, size_t, int);
1757 ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
1758 @@ -1205,10 +1224,14 @@
1760 asmlinkage long sys_open(const char *, int, int);
1761 asmlinkage long sys_close(unsigned int); /* yes, it's really unsigned */
1762 -extern int do_truncate(struct dentry *, loff_t start);
1763 +extern int do_truncate(struct dentry *, loff_t start, int called_from_open);
1765 extern struct file *filp_open(const char *, int, int);
1766 extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
1767 +extern int open_namei_it(const char *filename, int namei_flags, int mode,
1768 + struct nameidata *nd, struct lookup_intent *it);
1769 +extern struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt,
1770 + int flags, struct lookup_intent *it);
1771 extern int filp_close(struct file *, fl_owner_t id);
1772 extern char * getname(const char *);
1774 @@ -1504,6 +1527,7 @@
1775 extern loff_t default_llseek(struct file *file, loff_t offset, int origin);
1777 extern int FASTCALL(__user_walk(const char *, unsigned, struct nameidata *));
1778 +extern int FASTCALL(__user_walk_it(const char *, unsigned, struct nameidata *, struct lookup_intent *it));
1779 extern int FASTCALL(path_init(const char *, unsigned, struct nameidata *));
1780 extern int FASTCALL(path_walk(const char *, struct nameidata *));
1781 extern int FASTCALL(path_lookup(const char *, unsigned, struct nameidata *));
1782 @@ -1516,6 +1540,8 @@
1783 extern struct dentry * lookup_hash(struct qstr *, struct dentry *);
1784 #define user_path_walk(name,nd) __user_walk(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, nd)
1785 #define user_path_walk_link(name,nd) __user_walk(name, LOOKUP_POSITIVE, nd)
1786 +#define user_path_walk_it(name,nd,it) __user_walk_it(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, nd, it)
1787 +#define user_path_walk_link_it(name,nd,it) __user_walk_it(name, LOOKUP_POSITIVE, nd, it)
1789 extern void inode_init_once(struct inode *);
1790 extern void _inode_init_once(struct inode *);
1791 @@ -1667,6 +1693,8 @@
1793 extern int vfs_readlink(struct dentry *, char *, int, const char *);
1794 extern int vfs_follow_link(struct nameidata *, const char *);
1795 +extern int vfs_follow_link_it(struct nameidata *, const char *,
1796 + struct lookup_intent *it);
1797 extern int page_readlink(struct dentry *, char *, int);
1798 extern int page_follow_link(struct dentry *, struct nameidata *);
1799 extern struct inode_operations page_symlink_inode_operations;
1800 Index: linux-2.4.21-x86_64/include/linux/fs_struct.h
1801 ===================================================================
1802 --- linux-2.4.21-x86_64.orig/include/linux/fs_struct.h 2001-07-13 15:10:44.000000000 -0700
1803 +++ linux-2.4.21-x86_64/include/linux/fs_struct.h 2004-04-12 19:57:36.000000000 -0700
1805 write_lock(&fs->lock);
1806 old_root = fs->root;
1807 old_rootmnt = fs->rootmnt;
1808 + PIN(dentry, mnt, 1);
1809 fs->rootmnt = mntget(mnt);
1810 fs->root = dget(dentry);
1811 write_unlock(&fs->lock);
1813 + UNPIN(old_root, old_rootmnt, 1);
1815 mntput(old_rootmnt);
1818 write_lock(&fs->lock);
1820 old_pwdmnt = fs->pwdmnt;
1821 + PIN(dentry, mnt, 0);
1822 fs->pwdmnt = mntget(mnt);
1823 fs->pwd = dget(dentry);
1824 write_unlock(&fs->lock);
1826 + UNPIN(old_pwd, old_pwdmnt, 0);
1830 Index: linux-2.4.21-x86_64/kernel/exit.c
1831 ===================================================================
1832 --- linux-2.4.21-x86_64.orig/kernel/exit.c 2003-10-28 10:34:13.000000000 -0800
1833 +++ linux-2.4.21-x86_64/kernel/exit.c 2004-04-12 19:57:36.000000000 -0700
1834 @@ -288,11 +288,14 @@
1836 /* No need to hold fs->lock if we are killing it */
1837 if (atomic_dec_and_test(&fs->count)) {
1838 + UNPIN(fs->pwd, fs->pwdmnt, 0);
1839 + UNPIN(fs->root, fs->rootmnt, 1);
1841 mntput(fs->rootmnt);
1845 + UNPIN(fs->altroot, fs->altrootmnt, 1);
1847 mntput(fs->altrootmnt);
1849 Index: linux-2.4.21-x86_64/kernel/fork.c
1850 ===================================================================
1851 --- linux-2.4.21-x86_64.orig/kernel/fork.c 2003-10-28 10:34:17.000000000 -0800
1852 +++ linux-2.4.21-x86_64/kernel/fork.c 2004-04-12 19:57:36.000000000 -0700
1853 @@ -461,10 +461,13 @@
1854 fs->umask = old->umask;
1855 read_lock(&old->lock);
1856 fs->rootmnt = mntget(old->rootmnt);
1857 + PIN(old->pwd, old->pwdmnt, 0);
1858 + PIN(old->root, old->rootmnt, 1);
1859 fs->root = dget(old->root);
1860 fs->pwdmnt = mntget(old->pwdmnt);
1861 fs->pwd = dget(old->pwd);
1863 + PIN(old->altroot, old->altrootmnt, 1);
1864 fs->altrootmnt = mntget(old->altrootmnt);
1865 fs->altroot = dget(old->altroot);
1867 Index: linux-2.4.21-x86_64/kernel/ksyms.c
1868 ===================================================================
1869 --- linux-2.4.21-x86_64.orig/kernel/ksyms.c 2004-04-12 19:57:33.000000000 -0700
1870 +++ linux-2.4.21-x86_64/kernel/ksyms.c 2004-04-12 19:57:36.000000000 -0700
1872 EXPORT_SYMBOL(set_page_dirty);
1873 EXPORT_SYMBOL(vfs_readlink);
1874 EXPORT_SYMBOL(vfs_follow_link);
1875 +EXPORT_SYMBOL(vfs_follow_link_it);
1876 EXPORT_SYMBOL(page_readlink);
1877 EXPORT_SYMBOL(page_follow_link);
1878 EXPORT_SYMBOL(page_symlink_inode_operations);