3 fs/namei.c | 330 +++++++++++++++++++++++++++++++++++++++-------
4 fs/namespace.c | 28 ++-
5 fs/open.c | 172 +++++++++++++++++------
8 include/linux/dcache.h | 60 ++++++++
9 include/linux/fs.h | 32 ++++
10 include/linux/fs_struct.h | 4
14 13 files changed, 591 insertions(+), 133 deletions(-)
16 Index: linux/fs/dcache.c
17 ===================================================================
18 --- linux.orig/fs/dcache.c Thu Nov 28 18:53:15 2002
19 +++ linux/fs/dcache.c Wed Mar 17 13:11:25 2004
21 spin_unlock(&dcache_lock);
25 + /* network invalidation by Lustre */
26 + if (dentry->d_flags & DCACHE_LUSTRE_INVALID) {
27 + spin_unlock(&dcache_lock);
32 * Check whether to do a partial shrink_dcache
33 * to get rid of unused child entries.
35 * Adds a dentry to the hash according to its name.
38 -void d_rehash(struct dentry * entry)
39 +void __d_rehash(struct dentry * entry, int lock)
41 struct list_head *list = d_hash(entry->d_parent, entry->d_name.hash);
42 if (!list_empty(&entry->d_hash)) BUG();
43 - spin_lock(&dcache_lock);
44 + if (lock) spin_lock(&dcache_lock);
45 list_add(&entry->d_hash, list);
46 - spin_unlock(&dcache_lock);
47 + if (lock) spin_unlock(&dcache_lock);
49 +EXPORT_SYMBOL(__d_rehash);
51 +void d_rehash(struct dentry * entry)
53 + __d_rehash(entry, 1);
56 #define do_switch(x,y) do { \
57 Index: linux/fs/exec.c
58 ===================================================================
59 --- linux.orig/fs/exec.c Wed Mar 17 13:00:38 2004
60 +++ linux/fs/exec.c Wed Mar 17 13:11:25 2004
65 + struct lookup_intent it = { .it_op = IT_OPEN,
66 + .it_flags = FMODE_READ|FMODE_EXEC };
68 - error = user_path_walk(library, &nd);
69 + error = user_path_walk_it(library, &nd, &it);
77 - file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
78 + file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &it);
79 + intent_release(&it);
80 error = PTR_ERR(file);
87 + struct lookup_intent it = { .it_op = IT_OPEN,
88 + .it_flags = FMODE_READ|FMODE_EXEC };
90 - err = path_lookup(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd);
91 + err = path_lookup_it(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd, &it);
94 inode = nd.dentry->d_inode;
99 - file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
100 + file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &it);
101 + intent_release(&it);
103 err = deny_write_access(file);
109 + intent_release(&it);
113 @@ -1120,7 +1127,7 @@
115 if (!file->f_op->write)
117 - if (do_truncate(file->f_dentry, 0) != 0)
118 + if (do_truncate(file->f_dentry, 0, 0) != 0)
121 retval = binfmt->core_dump(signr, regs, file);
122 Index: linux/fs/namei.c
123 ===================================================================
124 --- linux.orig/fs/namei.c Wed Mar 17 13:00:37 2004
125 +++ linux/fs/namei.c Wed Mar 17 13:12:31 2004
127 * XEmacs seems to be relying on it...
130 +void intent_release(struct lookup_intent *it)
132 + if (it && it->it_op_release)
133 + it->it_op_release(it);
137 /* In order to reduce some races, while at the same time doing additional
138 * checking and hopefully speeding things up, we copy filenames to the
139 * kernel data space before using them..
140 @@ -260,10 +267,19 @@
141 * Internal lookup() using the new generic dcache.
144 -static struct dentry * cached_lookup(struct dentry * parent, struct qstr * name, int flags)
145 +static struct dentry *cached_lookup(struct dentry *parent, struct qstr *name,
146 + int flags, struct lookup_intent *it)
148 struct dentry * dentry = d_lookup(parent, name);
150 + if (dentry && dentry->d_op && dentry->d_op->d_revalidate_it) {
151 + if (!dentry->d_op->d_revalidate_it(dentry, flags, NULL, it) &&
152 + !d_invalidate(dentry)) {
158 if (dentry && dentry->d_op && dentry->d_op->d_revalidate) {
159 if (!dentry->d_op->d_revalidate(dentry, flags) && !d_invalidate(dentry)) {
161 @@ -281,11 +297,15 @@
162 * make sure that nobody added the entry to the dcache in the meantime..
165 -static struct dentry * real_lookup(struct dentry * parent, struct qstr * name, int flags)
166 +static struct dentry *real_lookup(struct dentry *parent, struct qstr *name,
167 + int flags, struct lookup_intent *it)
169 struct dentry * result;
170 struct inode *dir = parent->d_inode;
177 * First re-do the cached lookup just in case it was created
179 result = ERR_PTR(-ENOMEM);
182 + if (dir->i_op->lookup_it)
183 + result = dir->i_op->lookup_it(dir, dentry, NULL, it, flags);
185 result = dir->i_op->lookup(dir, dentry);
190 result = ERR_PTR(-ENOENT);
192 + } else if (result->d_op && result->d_op->d_revalidate_it) {
193 + if (!result->d_op->d_revalidate_it(result, flags, NULL, it) &&
194 + !d_invalidate(result)) {
197 + result = ERR_PTR(-ESTALE);
198 + if (!IS_ERR(result))
205 * Without that kind of total limit, nasty chains of consecutive
206 * symlinks can cause almost arbitrarily long lookups.
208 -static inline int do_follow_link(struct dentry *dentry, struct nameidata *nd)
209 +static inline int do_follow_link(struct dentry *dentry, struct nameidata *nd,
210 + struct lookup_intent *it)
213 if (current->link_count >= 5)
214 @@ -346,10 +379,18 @@
215 current->link_count++;
216 current->total_link_count++;
217 UPDATE_ATIME(dentry->d_inode);
219 err = dentry->d_inode->i_op->follow_link(dentry, nd);
220 + if (!err && it != NULL && !(it->d.lustre.it_int_flags & IT_FL_FOLLOWED)) {
221 + /* vfs_follow_link was never called */
222 + intent_release(it);
226 current->link_count--;
229 + intent_release(it);
233 @@ -379,15 +420,26 @@
234 return __follow_up(mnt, dentry);
237 -static inline int __follow_down(struct vfsmount **mnt, struct dentry **dentry)
238 +static inline int __follow_down(struct vfsmount **mnt, struct dentry **dentry,
239 + struct lookup_intent *it)
241 struct vfsmount *mounted;
243 spin_lock(&dcache_lock);
244 mounted = lookup_mnt(*mnt, *dentry);
246 + int opc = 0, mode = 0;
247 *mnt = mntget(mounted);
248 spin_unlock(&dcache_lock);
251 + mode = it->it_create_mode;
253 + intent_release(it);
256 + it->it_create_mode = mode;
259 mntput(mounted->mnt_parent);
260 *dentry = dget(mounted->mnt_root);
263 int follow_down(struct vfsmount **mnt, struct dentry **dentry)
265 - return __follow_down(mnt,dentry);
266 + return __follow_down(mnt,dentry,NULL);
269 static inline void follow_dotdot(struct nameidata *nd)
274 - while (d_mountpoint(nd->dentry) && __follow_down(&nd->mnt, &nd->dentry))
275 + while (d_mountpoint(nd->dentry) && __follow_down(&nd->mnt, &nd->dentry, NULL))
281 * We expect 'base' to be positive and a directory.
283 -int link_path_walk(const char * name, struct nameidata *nd)
284 +int link_path_walk_it(const char *name, struct nameidata *nd,
285 + struct lookup_intent *it)
287 struct dentry *dentry;
289 @@ -520,15 +573,15 @@
292 /* This does the actual lookups.. */
293 - dentry = cached_lookup(nd->dentry, &this, LOOKUP_CONTINUE);
294 + dentry = cached_lookup(nd->dentry, &this, LOOKUP_CONTINUE, NULL);
296 - dentry = real_lookup(nd->dentry, &this, LOOKUP_CONTINUE);
297 + dentry = real_lookup(nd->dentry, &this, LOOKUP_CONTINUE, NULL);
298 err = PTR_ERR(dentry);
302 /* Check mountpoints.. */
303 - while (d_mountpoint(dentry) && __follow_down(&nd->mnt, &dentry))
304 + while (d_mountpoint(dentry) && __follow_down(&nd->mnt, &dentry, NULL))
311 if (inode->i_op->follow_link) {
312 - err = do_follow_link(dentry, nd);
313 + err = do_follow_link(dentry, nd, NULL);
321 - if (!inode->i_op->lookup)
322 + if (!inode->i_op->lookup && !inode->i_op->lookup_it)
325 /* here ends the main loop */
326 @@ -583,19 +636,19 @@
330 - dentry = cached_lookup(nd->dentry, &this, 0);
331 + dentry = cached_lookup(nd->dentry, &this, 0, it);
333 - dentry = real_lookup(nd->dentry, &this, 0);
334 + dentry = real_lookup(nd->dentry, &this, 0, it);
335 err = PTR_ERR(dentry);
339 - while (d_mountpoint(dentry) && __follow_down(&nd->mnt, &dentry))
340 + while (d_mountpoint(dentry) && __follow_down(&nd->mnt, &dentry, it))
342 inode = dentry->d_inode;
343 if ((lookup_flags & LOOKUP_FOLLOW)
344 && inode && inode->i_op && inode->i_op->follow_link) {
345 - err = do_follow_link(dentry, nd);
346 + err = do_follow_link(dentry, nd, it);
352 if (lookup_flags & LOOKUP_DIRECTORY) {
354 - if (!inode->i_op || !inode->i_op->lookup)
355 + if (!inode->i_op ||
356 + (!inode->i_op->lookup && !inode->i_op->lookup_it))
361 * Check the cached dentry for staleness.
364 + if (dentry && dentry->d_op && dentry->d_op->d_revalidate_it) {
366 + if (!dentry->d_op->d_revalidate_it(dentry, 0, NULL, it)) {
367 + struct dentry *new;
368 + err = permission(dentry->d_parent->d_inode,
372 + new = real_lookup(dentry->d_parent,
373 + &dentry->d_name, 0, it);
375 + err = PTR_ERR(new);
378 + d_invalidate(dentry);
382 + if (!nd->dentry->d_inode)
385 if (dentry && dentry->d_op && dentry->d_op->d_revalidate) {
387 if (!dentry->d_op->d_revalidate(dentry, 0)) {
388 @@ -646,15 +721,28 @@
393 + intent_release(it);
399 +int link_path_walk(const char * name, struct nameidata *nd)
401 + return link_path_walk_it(name, nd, NULL);
404 +int path_walk_it(const char * name, struct nameidata *nd, struct lookup_intent *it)
406 + current->total_link_count = 0;
407 + return link_path_walk_it(name, nd, it);
410 int path_walk(const char * name, struct nameidata *nd)
412 current->total_link_count = 0;
413 - return link_path_walk(name, nd);
414 + return link_path_walk_it(name, nd, NULL);
422 +int path_lookup_it(const char *path, unsigned flags, struct nameidata *nd,
423 + struct lookup_intent *it)
426 + if (path_init(path, flags, nd))
427 + error = path_walk_it(path, nd, it);
433 int path_lookup(const char *path, unsigned flags, struct nameidata *nd)
438 nd->last_type = LAST_ROOT; /* if there are only slashes... */
442 return walk_init_root(name,nd);
443 read_lock(¤t->fs->lock);
445 * needs parent already locked. Doesn't follow mounts.
448 -struct dentry * lookup_hash(struct qstr *name, struct dentry * base)
449 +struct dentry * lookup_hash_it(struct qstr *name, struct dentry * base,
450 + struct lookup_intent *it)
452 struct dentry * dentry;
454 @@ -790,13 +891,16 @@
458 - dentry = cached_lookup(base, name, 0);
459 + dentry = cached_lookup(base, name, 0, it);
461 struct dentry *new = d_alloc(base, name);
462 dentry = ERR_PTR(-ENOMEM);
466 + if (inode->i_op->lookup_it)
467 + dentry = inode->i_op->lookup_it(inode, new, NULL, it, 0);
469 dentry = inode->i_op->lookup(inode, new);
476 +struct dentry * lookup_hash(struct qstr *name, struct dentry * base)
478 + return lookup_hash_it(name, base, NULL);
483 struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
487 this.hash = end_name_hash(hash);
489 - return lookup_hash(&this, base);
490 + return lookup_hash_it(&this, base, NULL);
492 return ERR_PTR(-EACCES);
498 +int __user_walk_it(const char *name, unsigned flags, struct nameidata *nd,
499 + struct lookup_intent *it)
504 + tmp = getname(name);
505 + err = PTR_ERR(tmp);
506 + if (!IS_ERR(tmp)) {
508 + if (path_init(tmp, flags, nd))
509 + err = path_walk_it(tmp, nd, it);
516 * It's inline, so penalty for filesystems that don't use sticky bit is
522 -int vfs_create(struct inode *dir, struct dentry *dentry, int mode)
523 +static int vfs_create_it(struct inode *dir, struct dentry *dentry, int mode,
524 + struct lookup_intent *it)
528 @@ -968,12 +1096,15 @@
531 error = -EACCES; /* shouldn't it be ENOSYS? */
532 - if (!dir->i_op || !dir->i_op->create)
533 + if (!dir->i_op || (!dir->i_op->create && !dir->i_op->create_it))
538 - error = dir->i_op->create(dir, dentry, mode);
539 + if (dir->i_op->create_it)
540 + error = dir->i_op->create_it(dir, dentry, mode, it);
542 + error = dir->i_op->create(dir, dentry, mode);
546 @@ -982,6 +1113,11 @@
550 +int vfs_create(struct inode *dir, struct dentry *dentry, int mode)
552 + return vfs_create_it(dir, dentry, mode, NULL);
559 * for symlinks (where the permissions are checked later).
562 -int open_namei(const char * pathname, int flag, int mode, struct nameidata *nd)
563 +int open_namei_it(const char *pathname, int flag, int mode,
564 + struct nameidata *nd, struct lookup_intent *it)
566 int acc_mode, error = 0;
568 @@ -1006,11 +1143,14 @@
570 acc_mode = ACC_MODE(flag);
573 + it->it_flags = flag;
576 * The simplest case - just a plain lookup.
578 if (!(flag & O_CREAT)) {
579 - error = path_lookup(pathname, lookup_flags(flag), nd);
580 + error = path_lookup_it(pathname, lookup_flags(flag), nd, it);
584 @@ -1020,6 +1160,10 @@
586 * Create - we need to know the parent.
589 + it->it_create_mode = mode;
590 + it->it_op |= IT_CREAT;
592 error = path_lookup(pathname, LOOKUP_PARENT, nd);
595 @@ -1035,7 +1179,7 @@
598 down(&dir->d_inode->i_sem);
599 - dentry = lookup_hash(&nd->last, nd->dentry);
600 + dentry = lookup_hash_it(&nd->last, nd->dentry, it);
603 error = PTR_ERR(dentry);
604 @@ -1044,11 +1188,12 @@
608 + it->it_create_mode = mode;
609 /* Negative dentry, just create the file */
610 if (!dentry->d_inode) {
611 if (!IS_POSIXACL(dir->d_inode))
612 mode &= ~current->fs->umask;
613 - error = vfs_create(dir->d_inode, dentry, mode);
614 + error = vfs_create_it(dir->d_inode, dentry, mode, it);
615 up(&dir->d_inode->i_sem);
618 @@ -1073,7 +1218,7 @@
620 if (flag & O_NOFOLLOW)
622 - while (__follow_down(&nd->mnt,&dentry) && d_mountpoint(dentry));
623 + while (__follow_down(&nd->mnt,&dentry,it) && d_mountpoint(dentry));
626 if (!dentry->d_inode)
627 @@ -1152,7 +1297,7 @@
631 - error = do_truncate(dentry, 0);
632 + error = do_truncate(dentry, 0, 1);
634 put_write_access(inode);
636 @@ -1164,8 +1309,10 @@
640 + intent_release(it);
643 + intent_release(it);
647 @@ -1184,7 +1331,16 @@
648 * are done. Procfs-like symlinks just set LAST_BIND.
650 UPDATE_ATIME(dentry->d_inode);
652 error = dentry->d_inode->i_op->follow_link(dentry, nd);
654 + intent_release(it);
655 + } else if (it != NULL && !(it->d.lustre.it_int_flags & IT_FL_FOLLOWED)) {
656 + /* vfs_follow_link was never called */
657 + intent_release(it);
664 @@ -1206,13 +1362,20 @@
667 down(&dir->d_inode->i_sem);
668 - dentry = lookup_hash(&nd->last, nd->dentry);
669 + dentry = lookup_hash_it(&nd->last, nd->dentry, it);
670 putname(nd->last.name);
674 +int open_namei(const char *pathname, int flag, int mode, struct nameidata *nd)
676 + return open_namei_it(pathname, flag, mode, nd, NULL);
681 -static struct dentry *lookup_create(struct nameidata *nd, int is_dir)
682 +struct dentry *lookup_create(struct nameidata *nd, int is_dir,
683 + struct lookup_intent *it)
685 struct dentry *dentry;
687 @@ -1220,7 +1383,7 @@
688 dentry = ERR_PTR(-EEXIST);
689 if (nd->last_type != LAST_NORM)
691 - dentry = lookup_hash(&nd->last, nd->dentry);
692 + dentry = lookup_hash_it(&nd->last, nd->dentry, it);
695 if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode)
696 @@ -1276,7 +1439,20 @@
697 error = path_lookup(tmp, LOOKUP_PARENT, &nd);
700 - dentry = lookup_create(&nd, 0);
702 + if (nd.last_type != LAST_NORM) {
706 + if (nd.dentry->d_inode->i_op->mknod_raw) {
707 + struct inode_operations *op = nd.dentry->d_inode->i_op;
708 + error = op->mknod_raw(&nd, mode, dev);
709 + /* the file system wants to use normal vfs path now */
710 + if (error != -EOPNOTSUPP)
714 + dentry = lookup_create(&nd, 0, NULL);
715 error = PTR_ERR(dentry);
717 if (!IS_POSIXACL(nd.dentry->d_inode))
718 @@ -1298,6 +1474,7 @@
721 up(&nd.dentry->d_inode->i_sem);
726 @@ -1345,7 +1522,18 @@
727 error = path_lookup(tmp, LOOKUP_PARENT, &nd);
730 - dentry = lookup_create(&nd, 1);
731 + if (nd.last_type != LAST_NORM) {
735 + if (nd.dentry->d_inode->i_op->mkdir_raw) {
736 + struct inode_operations *op = nd.dentry->d_inode->i_op;
737 + error = op->mkdir_raw(&nd, mode);
738 + /* the file system wants to use normal vfs path now */
739 + if (error != -EOPNOTSUPP)
742 + dentry = lookup_create(&nd, 1, NULL);
743 error = PTR_ERR(dentry);
744 if (!IS_ERR(dentry)) {
745 if (!IS_POSIXACL(nd.dentry->d_inode))
746 @@ -1354,6 +1542,7 @@
749 up(&nd.dentry->d_inode->i_sem);
754 @@ -1454,8 +1643,16 @@
758 + if (nd.dentry->d_inode->i_op->rmdir_raw) {
759 + struct inode_operations *op = nd.dentry->d_inode->i_op;
761 + error = op->rmdir_raw(&nd);
762 + /* the file system wants to use normal vfs path now */
763 + if (error != -EOPNOTSUPP)
766 down(&nd.dentry->d_inode->i_sem);
767 - dentry = lookup_hash(&nd.last, nd.dentry);
768 + dentry = lookup_hash_it(&nd.last, nd.dentry, NULL);
769 error = PTR_ERR(dentry);
770 if (!IS_ERR(dentry)) {
771 error = vfs_rmdir(nd.dentry->d_inode, dentry);
772 @@ -1513,8 +1710,15 @@
774 if (nd.last_type != LAST_NORM)
776 + if (nd.dentry->d_inode->i_op->unlink_raw) {
777 + struct inode_operations *op = nd.dentry->d_inode->i_op;
778 + error = op->unlink_raw(&nd);
779 + /* the file system wants to use normal vfs path now */
780 + if (error != -EOPNOTSUPP)
783 down(&nd.dentry->d_inode->i_sem);
784 - dentry = lookup_hash(&nd.last, nd.dentry);
785 + dentry = lookup_hash_it(&nd.last, nd.dentry, NULL);
786 error = PTR_ERR(dentry);
787 if (!IS_ERR(dentry)) {
788 /* Why not before? Because we want correct error value */
789 @@ -1581,15 +1785,27 @@
790 error = path_lookup(to, LOOKUP_PARENT, &nd);
793 - dentry = lookup_create(&nd, 0);
794 + if (nd.last_type != LAST_NORM) {
798 + if (nd.dentry->d_inode->i_op->symlink_raw) {
799 + struct inode_operations *op = nd.dentry->d_inode->i_op;
800 + error = op->symlink_raw(&nd, from);
801 + /* the file system wants to use normal vfs path now */
802 + if (error != -EOPNOTSUPP)
805 + dentry = lookup_create(&nd, 0, NULL);
806 error = PTR_ERR(dentry);
807 if (!IS_ERR(dentry)) {
808 error = vfs_symlink(nd.dentry->d_inode, dentry, from);
811 up(&nd.dentry->d_inode->i_sem);
819 @@ -1665,7 +1881,18 @@
821 if (old_nd.mnt != nd.mnt)
823 - new_dentry = lookup_create(&nd, 0);
824 + if (nd.last_type != LAST_NORM) {
828 + if (nd.dentry->d_inode->i_op->link_raw) {
829 + struct inode_operations *op = nd.dentry->d_inode->i_op;
830 + error = op->link_raw(&old_nd, &nd);
831 + /* the file system wants to use normal vfs path now */
832 + if (error != -EOPNOTSUPP)
835 + new_dentry = lookup_create(&nd, 0, NULL);
836 error = PTR_ERR(new_dentry);
837 if (!IS_ERR(new_dentry)) {
838 error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry);
839 @@ -1709,7 +1936,7 @@
842 int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry,
843 - struct inode *new_dir, struct dentry *new_dentry)
844 + struct inode *new_dir, struct dentry *new_dentry)
847 struct inode *target;
848 @@ -1788,7 +2015,7 @@
851 int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
852 - struct inode *new_dir, struct dentry *new_dentry)
853 + struct inode *new_dir, struct dentry *new_dentry)
857 @@ -1876,9 +2103,18 @@
858 if (newnd.last_type != LAST_NORM)
861 + if (old_dir->d_inode->i_op->rename_raw) {
863 + error = old_dir->d_inode->i_op->rename_raw(&oldnd, &newnd);
865 + /* the file system wants to use normal vfs path now */
866 + if (error != -EOPNOTSUPP)
870 double_lock(new_dir, old_dir);
872 - old_dentry = lookup_hash(&oldnd.last, old_dir);
873 + old_dentry = lookup_hash_it(&oldnd.last, old_dir, NULL);
874 error = PTR_ERR(old_dentry);
875 if (IS_ERR(old_dentry))
877 @@ -1894,16 +2130,16 @@
878 if (newnd.last.name[newnd.last.len])
881 - new_dentry = lookup_hash(&newnd.last, new_dir);
882 + new_dentry = lookup_hash_it(&newnd.last, new_dir, NULL);
883 error = PTR_ERR(new_dentry);
884 if (IS_ERR(new_dentry))
889 error = vfs_rename(old_dir->d_inode, old_dentry,
890 new_dir->d_inode, new_dentry);
896 @@ -1954,20 +2190,28 @@
900 -__vfs_follow_link(struct nameidata *nd, const char *link)
901 +__vfs_follow_link(struct nameidata *nd, const char *link,
902 + struct lookup_intent *it)
911 + else if (it != nd->intent)
912 + printk("it != nd->intent: tell phil@clusterfs.com\n");
914 + it->d.lustre.it_int_flags |= IT_FL_FOLLOWED;
918 if (!walk_init_root(link, nd))
919 /* weird __emul_prefix() stuff did it */
922 - res = link_path_walk(link, nd);
923 + res = link_path_walk_it(link, nd, it);
925 if (current->link_count || res || nd->last_type!=LAST_NORM)
927 @@ -1989,7 +2233,13 @@
929 int vfs_follow_link(struct nameidata *nd, const char *link)
931 - return __vfs_follow_link(nd, link);
932 + return __vfs_follow_link(nd, link, NULL);
935 +int vfs_follow_link_it(struct nameidata *nd, const char *link,
936 + struct lookup_intent *it)
938 + return __vfs_follow_link(nd, link, it);
941 /* get the link contents into pagecache */
942 @@ -2031,7 +2281,7 @@
944 struct page *page = NULL;
945 char *s = page_getlink(dentry, &page);
946 - int res = __vfs_follow_link(nd, s);
947 + int res = __vfs_follow_link(nd, s, NULL);
950 page_cache_release(page);
951 Index: linux/fs/namespace.c
952 ===================================================================
953 --- linux.orig/fs/namespace.c Thu Nov 28 18:53:15 2002
954 +++ linux/fs/namespace.c Wed Mar 17 13:11:25 2004
957 old_nd->dentry = mnt->mnt_mountpoint;
958 old_nd->mnt = mnt->mnt_parent;
959 + UNPIN(old_nd->dentry, old_nd->mnt, 1);
960 mnt->mnt_parent = mnt;
961 mnt->mnt_mountpoint = mnt->mnt_root;
962 list_del_init(&mnt->mnt_child);
965 mnt->mnt_parent = mntget(nd->mnt);
966 mnt->mnt_mountpoint = dget(nd->dentry);
967 + PIN(nd->dentry, nd->mnt, 1);
968 list_add(&mnt->mnt_hash, mount_hashtable+hash(nd->mnt, nd->dentry));
969 list_add(&mnt->mnt_child, &nd->mnt->mnt_mounts);
970 nd->dentry->d_mounted++;
975 -static int do_umount(struct vfsmount *mnt, int flags)
976 +int do_umount(struct vfsmount *mnt, int flags)
978 struct super_block * sb = mnt->mnt_sb;
980 @@ -485,14 +487,17 @@
982 struct nameidata old_nd;
983 struct vfsmount *mnt = NULL;
984 + struct lookup_intent it = { .it_op = IT_GETATTR };
985 int err = mount_is_safe(nd);
988 if (!old_name || !*old_name)
990 - err = path_lookup(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd);
992 + err = path_lookup_it(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd, &it);
994 + intent_release(&it);
998 down_write(¤t->namespace->sem);
1003 up_write(¤t->namespace->sem);
1004 + intent_release(&it);
1005 path_release(&old_nd);
1009 unsigned long flags, void *data_page)
1011 struct nameidata nd;
1012 + struct lookup_intent it = { .it_op = IT_GETATTR };
1016 @@ -722,10 +729,11 @@
1017 flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV);
1019 /* ... and get the mountpoint */
1020 - retval = path_lookup(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd);
1022 + retval = path_lookup_it(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd, &it);
1024 + intent_release(&it);
1028 if (flags & MS_REMOUNT)
1029 retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
1033 retval = do_add_mount(&nd, type_page, flags, mnt_flags,
1034 dev_name, data_page);
1036 + intent_release(&it);
1042 struct vfsmount *tmp;
1043 struct nameidata new_nd, old_nd, parent_nd, root_parent, user_nd;
1044 + struct lookup_intent new_it = { .it_op = IT_GETATTR };
1045 + struct lookup_intent old_it = { .it_op = IT_GETATTR };
1048 if (!capable(CAP_SYS_ADMIN))
1049 @@ -908,14 +920,14 @@
1053 - error = __user_walk(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd);
1054 + error = __user_walk_it(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd, &new_it);
1058 if (!check_mnt(new_nd.mnt))
1061 - error = __user_walk(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd);
1062 + error = __user_walk_it(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd, &old_it);
1066 @@ -970,8 +982,10 @@
1067 up(&old_nd.dentry->d_inode->i_zombie);
1068 up_write(¤t->namespace->sem);
1069 path_release(&user_nd);
1070 + intent_release(&old_it);
1071 path_release(&old_nd);
1073 + intent_release(&new_it);
1074 path_release(&new_nd);
1077 Index: linux/fs/open.c
1078 ===================================================================
1079 --- linux.orig/fs/open.c Thu Nov 28 18:53:15 2002
1080 +++ linux/fs/open.c Wed Mar 17 13:11:25 2004
1082 #include <asm/uaccess.h>
1084 #define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))
1085 +extern int path_walk_it(const char *name, struct nameidata *nd,
1086 + struct lookup_intent *it);
1088 int vfs_statfs(struct super_block *sb, struct statfs *buf)
1091 write_unlock(&files->file_lock);
1094 -int do_truncate(struct dentry *dentry, loff_t length)
1095 +int do_truncate(struct dentry *dentry, loff_t length, int called_from_open)
1097 struct inode *inode = dentry->d_inode;
1098 + struct inode_operations *op = dentry->d_inode->i_op;
1100 struct iattr newattrs;
1102 @@ -108,7 +111,13 @@
1103 down(&inode->i_sem);
1104 newattrs.ia_size = length;
1105 newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
1106 - error = notify_change(dentry, &newattrs);
1107 + if (called_from_open)
1108 + newattrs.ia_valid |= ATTR_FROM_OPEN;
1109 + if (op->setattr_raw) {
1110 + newattrs.ia_valid |= ATTR_RAW;
1111 + error = op->setattr_raw(inode, &newattrs);
1113 + error = notify_change(dentry, &newattrs);
1117 @@ -118,12 +127,13 @@
1118 struct nameidata nd;
1119 struct inode * inode;
1121 + struct lookup_intent it = { .it_op = IT_GETATTR };
1124 if (length < 0) /* sorry, but loff_t says... */
1127 - error = user_path_walk(path, &nd);
1128 + error = user_path_walk_it(path, &nd, &it);
1131 inode = nd.dentry->d_inode;
1132 @@ -163,11 +173,13 @@
1133 error = locks_verify_truncate(inode, NULL, length);
1136 - error = do_truncate(nd.dentry, length);
1137 + intent_release(&it);
1138 + error = do_truncate(nd.dentry, length, 0);
1140 put_write_access(inode);
1143 + intent_release(&it);
1149 error = locks_verify_truncate(inode, file, length);
1151 - error = do_truncate(dentry, length);
1152 + error = do_truncate(dentry, length, 0);
1156 @@ -260,11 +272,13 @@
1157 struct inode * inode;
1158 struct iattr newattrs;
1160 - error = user_path_walk(filename, &nd);
1161 + error = user_path_walk_it(filename, &nd, NULL);
1164 inode = nd.dentry->d_inode;
1166 + /* this is safe without a Lustre lock because it only depends
1167 + on the super block */
1169 if (IS_RDONLY(inode))
1171 @@ -279,11 +293,25 @@
1174 newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET;
1178 + if (inode->i_op->setattr_raw) {
1179 + struct inode_operations *op = nd.dentry->d_inode->i_op;
1181 + newattrs.ia_valid |= ATTR_RAW;
1182 + error = op->setattr_raw(inode, &newattrs);
1183 + /* the file system wants to use normal vfs path now */
1184 + if (error != -EOPNOTSUPP)
1185 + goto dput_and_out;
1190 if (current->fsuid != inode->i_uid &&
1191 (error = permission(inode,MAY_WRITE)) != 0)
1195 error = notify_change(nd.dentry, &newattrs);
1198 @@ -304,12 +332,14 @@
1199 struct inode * inode;
1200 struct iattr newattrs;
1202 - error = user_path_walk(filename, &nd);
1203 + error = user_path_walk_it(filename, &nd, NULL);
1207 inode = nd.dentry->d_inode;
1209 + /* this is safe without a Lustre lock because it only depends
1210 + on the super block */
1212 if (IS_RDONLY(inode))
1214 @@ -324,7 +354,20 @@
1215 newattrs.ia_atime = times[0].tv_sec;
1216 newattrs.ia_mtime = times[1].tv_sec;
1217 newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET;
1221 + if (inode->i_op->setattr_raw) {
1222 + struct inode_operations *op = nd.dentry->d_inode->i_op;
1224 + newattrs.ia_valid |= ATTR_RAW;
1225 + error = op->setattr_raw(inode, &newattrs);
1226 + /* the file system wants to use normal vfs path now */
1227 + if (error != -EOPNOTSUPP)
1228 + goto dput_and_out;
1233 if (current->fsuid != inode->i_uid &&
1234 (error = permission(inode,MAY_WRITE)) != 0)
1237 int old_fsuid, old_fsgid;
1238 kernel_cap_t old_cap;
1240 + struct lookup_intent it = { .it_op = IT_GETATTR };
1242 if (mode & ~S_IRWXO) /* where's F_OK, X_OK, W_OK, R_OK? */
1244 @@ -364,13 +408,14 @@
1246 current->cap_effective = current->cap_permitted;
1248 - res = user_path_walk(filename, &nd);
1249 + res = user_path_walk_it(filename, &nd, &it);
1251 res = permission(nd.dentry->d_inode, mode);
1252 /* SuS v2 requires we report a read only fs too */
1253 if(!res && (mode & S_IWOTH) && IS_RDONLY(nd.dentry->d_inode)
1254 && !special_file(nd.dentry->d_inode->i_mode))
1256 + intent_release(&it);
1263 struct nameidata nd;
1264 + struct lookup_intent it = { .it_op = IT_GETATTR };
1266 - error = __user_walk(filename,LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY,&nd);
1267 + error = __user_walk_it(filename,LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY,&nd, &it);
1272 set_fs_pwd(current->fs, nd.mnt, nd.dentry);
1275 + intent_release(&it);
1279 @@ -436,9 +483,10 @@
1282 struct nameidata nd;
1283 + struct lookup_intent it = { .it_op = IT_GETATTR };
1285 - error = __user_walk(filename, LOOKUP_POSITIVE | LOOKUP_FOLLOW |
1286 - LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd);
1287 + error = __user_walk_it(filename, LOOKUP_POSITIVE | LOOKUP_FOLLOW |
1288 + LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd, &it);
1292 @@ -454,39 +502,56 @@
1296 + intent_release(&it);
1302 -asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
1303 +int chmod_common(struct dentry *dentry, mode_t mode)
1305 - struct inode * inode;
1306 - struct dentry * dentry;
1307 - struct file * file;
1309 + struct inode *inode = dentry->d_inode;
1310 struct iattr newattrs;
1315 + if (IS_RDONLY(inode))
1318 - dentry = file->f_dentry;
1319 - inode = dentry->d_inode;
1320 + if (inode->i_op->setattr_raw) {
1321 + newattrs.ia_mode = mode;
1322 + newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
1323 + newattrs.ia_valid |= ATTR_RAW;
1324 + err = inode->i_op->setattr_raw(inode, &newattrs);
1325 + /* the file system wants to use normal vfs path now */
1326 + if (err != -EOPNOTSUPP)
1331 - if (IS_RDONLY(inode))
1334 if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
1338 if (mode == (mode_t) -1)
1339 mode = inode->i_mode;
1340 newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
1341 newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
1342 err = notify_change(dentry, &newattrs);
1349 +asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
1351 + struct file * file;
1358 + err = chmod_common(file->f_dentry, mode);
1363 @@ -495,30 +560,14 @@
1364 asmlinkage long sys_chmod(const char * filename, mode_t mode)
1366 struct nameidata nd;
1367 - struct inode * inode;
1369 - struct iattr newattrs;
1371 error = user_path_walk(filename, &nd);
1374 - inode = nd.dentry->d_inode;
1377 - if (IS_RDONLY(inode))
1378 - goto dput_and_out;
1381 - if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
1382 - goto dput_and_out;
1383 + error = chmod_common(nd.dentry, mode);
1385 - if (mode == (mode_t) -1)
1386 - mode = inode->i_mode;
1387 - newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
1388 - newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
1389 - error = notify_change(nd.dentry, &newattrs);
1395 @@ -538,6 +587,20 @@
1397 if (IS_RDONLY(inode))
1400 + if (inode->i_op->setattr_raw) {
1401 + struct inode_operations *op = dentry->d_inode->i_op;
1403 + newattrs.ia_uid = user;
1404 + newattrs.ia_gid = group;
1405 + newattrs.ia_valid = ATTR_UID | ATTR_GID | ATTR_CTIME;
1406 + newattrs.ia_valid |= ATTR_RAW;
1407 + error = op->setattr_raw(inode, &newattrs);
1408 + /* the file system wants to use normal vfs path now */
1409 + if (error != -EOPNOTSUPP)
1414 if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
1418 int namei_flags, error;
1419 struct nameidata nd;
1420 + struct lookup_intent it = { .it_op = IT_OPEN };
1422 namei_flags = flags;
1423 if ((namei_flags+1) & O_ACCMODE)
1424 @@ -649,14 +713,15 @@
1425 if (namei_flags & O_TRUNC)
1428 - error = open_namei(filename, namei_flags, mode, &nd);
1430 - return dentry_open(nd.dentry, nd.mnt, flags);
1431 + error = open_namei_it(filename, namei_flags, mode, &nd, &it);
1433 + return ERR_PTR(error);
1435 - return ERR_PTR(error);
1436 + return dentry_open_it(nd.dentry, nd.mnt, flags, &it);
1439 -struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
1440 +struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt,
1441 + int flags, struct lookup_intent *it)
1444 struct inode *inode;
1445 @@ -693,12 +758,15 @@
1448 if (f->f_op && f->f_op->open) {
1450 error = f->f_op->open(inode,f);
1455 f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);
1457 + intent_release(it);
1461 @@ -713,11 +781,17 @@
1465 + intent_release(it);
1468 return ERR_PTR(error);
1471 +struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
1473 + return dentry_open_it(dentry, mnt, flags, NULL);
1477 * Find an empty file descriptor entry, and mark it busy.
1479 Index: linux/fs/proc/base.c
1480 ===================================================================
1481 --- linux.orig/fs/proc/base.c Wed Mar 17 13:00:35 2004
1482 +++ linux/fs/proc/base.c Wed Mar 17 13:11:25 2004
1485 error = inode->u.proc_i.op.proc_get_link(inode, &nd->dentry, &nd->mnt);
1486 nd->last_type = LAST_BIND;
1488 + if (nd->intent != NULL)
1489 + nd->intent->d.lustre.it_int_flags |= IT_FL_FOLLOWED;
1493 Index: linux/fs/stat.c
1494 ===================================================================
1495 --- linux.orig/fs/stat.c Thu Sep 13 19:04:43 2001
1496 +++ linux/fs/stat.c Wed Mar 17 13:12:31 2004
1498 * Revalidate the inode. This is required for proper NFS attribute caching.
1500 static __inline__ int
1501 -do_revalidate(struct dentry *dentry)
1502 +do_revalidate(struct dentry *dentry, struct lookup_intent *it)
1504 struct inode * inode = dentry->d_inode;
1505 - if (inode->i_op && inode->i_op->revalidate)
1506 + if (inode->i_op && inode->i_op->revalidate_it)
1507 + return inode->i_op->revalidate_it(dentry, it);
1508 + else if (inode->i_op && inode->i_op->revalidate)
1509 return inode->i_op->revalidate(dentry);
1512 @@ -135,13 +137,15 @@
1513 asmlinkage long sys_stat(char * filename, struct __old_kernel_stat * statbuf)
1515 struct nameidata nd;
1516 + struct lookup_intent it = { .it_op = IT_GETATTR };
1519 - error = user_path_walk(filename, &nd);
1520 + error = user_path_walk_it(filename, &nd, &it);
1522 - error = do_revalidate(nd.dentry);
1523 + error = do_revalidate(nd.dentry, &it);
1525 error = cp_old_stat(nd.dentry->d_inode, statbuf);
1526 + intent_release(&it);
1530 @@ -151,13 +155,15 @@
1531 asmlinkage long sys_newstat(char * filename, struct stat * statbuf)
1533 struct nameidata nd;
1534 + struct lookup_intent it = { .it_op = IT_GETATTR };
1537 - error = user_path_walk(filename, &nd);
1538 + error = user_path_walk_it(filename, &nd, &it);
1540 - error = do_revalidate(nd.dentry);
1541 + error = do_revalidate(nd.dentry, &it);
1543 error = cp_new_stat(nd.dentry->d_inode, statbuf);
1544 + intent_release(&it);
1548 @@ -172,13 +178,15 @@
1549 asmlinkage long sys_lstat(char * filename, struct __old_kernel_stat * statbuf)
1551 struct nameidata nd;
1552 + struct lookup_intent it = { .it_op = IT_GETATTR };
1555 - error = user_path_walk_link(filename, &nd);
1556 + error = user_path_walk_link_it(filename, &nd, &it);
1558 - error = do_revalidate(nd.dentry);
1559 + error = do_revalidate(nd.dentry, &it);
1561 error = cp_old_stat(nd.dentry->d_inode, statbuf);
1562 + intent_release(&it);
1566 @@ -189,13 +197,15 @@
1567 asmlinkage long sys_newlstat(char * filename, struct stat * statbuf)
1569 struct nameidata nd;
1570 + struct lookup_intent it = { .it_op = IT_GETATTR };
1573 - error = user_path_walk_link(filename, &nd);
1574 + error = user_path_walk_link_it(filename, &nd, &it);
1576 - error = do_revalidate(nd.dentry);
1577 + error = do_revalidate(nd.dentry, &it);
1579 error = cp_new_stat(nd.dentry->d_inode, statbuf);
1580 + intent_release(&it);
1586 struct dentry * dentry = f->f_dentry;
1588 - err = do_revalidate(dentry);
1589 + err = do_revalidate(dentry, NULL);
1591 err = cp_old_stat(dentry->d_inode, statbuf);
1595 struct dentry * dentry = f->f_dentry;
1597 - err = do_revalidate(dentry);
1598 + err = do_revalidate(dentry, NULL);
1600 err = cp_new_stat(dentry->d_inode, statbuf);
1605 if (inode->i_op && inode->i_op->readlink &&
1606 - !(error = do_revalidate(nd.dentry))) {
1607 + !(error = do_revalidate(nd.dentry, NULL))) {
1608 UPDATE_ATIME(inode);
1609 error = inode->i_op->readlink(nd.dentry, buf, bufsiz);
1611 @@ -333,12 +343,14 @@
1613 struct nameidata nd;
1615 + struct lookup_intent it = { .it_op = IT_GETATTR };
1617 - error = user_path_walk(filename, &nd);
1618 + error = user_path_walk_it(filename, &nd, &it);
1620 - error = do_revalidate(nd.dentry);
1621 + error = do_revalidate(nd.dentry, &it);
1623 error = cp_new_stat64(nd.dentry->d_inode, statbuf);
1624 + intent_release(&it);
1628 @@ -348,12 +360,14 @@
1630 struct nameidata nd;
1632 + struct lookup_intent it = { .it_op = IT_GETATTR };
1634 - error = user_path_walk_link(filename, &nd);
1635 + error = user_path_walk_link_it(filename, &nd, &it);
1637 - error = do_revalidate(nd.dentry);
1638 + error = do_revalidate(nd.dentry, &it);
1640 error = cp_new_stat64(nd.dentry->d_inode, statbuf);
1641 + intent_release(&it);
1647 struct dentry * dentry = f->f_dentry;
1649 - err = do_revalidate(dentry);
1650 + err = do_revalidate(dentry, NULL);
1652 err = cp_new_stat64(dentry->d_inode, statbuf);
1654 Index: linux/include/linux/dcache.h
1655 ===================================================================
1656 --- linux.orig/include/linux/dcache.h Thu Nov 28 18:53:15 2002
1657 +++ linux/include/linux/dcache.h Wed Mar 17 13:11:25 2004
1659 #include <asm/atomic.h>
1660 #include <linux/mount.h>
1661 #include <linux/kernel.h>
1662 +#include <linux/string.h>
1664 +#define IT_OPEN 0x0001
1665 +#define IT_CREAT 0x0002
1666 +#define IT_READDIR 0x0004
1667 +#define IT_GETATTR 0x0008
1668 +#define IT_LOOKUP 0x0010
1669 +#define IT_UNLINK 0x0020
1670 +#define IT_GETXATTR 0x0040
1671 +#define IT_EXEC 0x0080
1672 +#define IT_PIN 0x0100
1673 +#define IT_CHDIR 0x0200
1675 +#define IT_FL_LOCKED 0x0001
1676 +#define IT_FL_FOLLOWED 0x0002 /* set by vfs_follow_link */
1678 +#define INTENT_MAGIC 0x19620323
1681 +struct lustre_intent_data {
1682 + int it_disposition;
1684 + __u64 it_lock_handle;
1689 +struct lookup_intent {
1691 + void (*it_op_release)(struct lookup_intent *);
1694 + int it_create_mode;
1696 + struct lustre_intent_data lustre;
1700 +static inline void intent_init(struct lookup_intent *it, int op, int flags)
1702 + memset(it, 0, sizeof(*it));
1703 + it->it_magic = INTENT_MAGIC;
1705 + it->it_flags = flags;
1710 * linux/include/linux/dcache.h
1712 unsigned char d_iname[DNAME_INLINE_LEN]; /* small names */
1717 struct dentry_operations {
1718 int (*d_revalidate)(struct dentry *, int);
1719 int (*d_hash) (struct dentry *, struct qstr *);
1721 int (*d_delete)(struct dentry *);
1722 void (*d_release)(struct dentry *);
1723 void (*d_iput)(struct dentry *, struct inode *);
1724 + int (*d_revalidate_it)(struct dentry *, int, struct nameidata *, struct lookup_intent *);
1725 + void (*d_pin)(struct dentry *, struct vfsmount * , int);
1726 + void (*d_unpin)(struct dentry *, struct vfsmount *, int);
1729 +#define PIN(de,mnt,flag) if (de && de->d_op && de->d_op->d_pin) \
1730 + de->d_op->d_pin(de, mnt, flag);
1731 +#define UNPIN(de,mnt,flag) if (de && de->d_op && de->d_op->d_unpin) \
1732 + de->d_op->d_unpin(de, mnt, flag);
1735 +/* defined in fs/namei.c */
1736 +extern void intent_release(struct lookup_intent *it);
1737 +/* defined in fs/dcache.c */
1738 +extern void __d_rehash(struct dentry * entry, int lock);
1740 /* the dentry parameter passed to d_hash and d_compare is the parent
1741 * directory of the entries to be compared. It is used in case these
1742 * functions need any directory specific information for determining
1744 * s_nfsd_free_path semaphore will be down
1746 #define DCACHE_REFERENCED 0x0008 /* Recently used, don't discard. */
1747 +#define DCACHE_LUSTRE_INVALID 0x0010 /* Lustre invalidated */
1749 extern spinlock_t dcache_lock;
1751 Index: linux/include/linux/fs.h
1752 ===================================================================
1753 --- linux.orig/include/linux/fs.h Wed Mar 17 13:11:23 2004
1754 +++ linux/include/linux/fs.h Wed Mar 17 13:11:31 2004
1757 #define FMODE_READ 1
1758 #define FMODE_WRITE 2
1759 +#define FMODE_EXEC 4
1764 #define ATTR_MTIME_SET 256
1765 #define ATTR_FORCE 512 /* Not a change, but a change it */
1766 #define ATTR_ATTR_FLAG 1024
1767 +#define ATTR_RAW 0x0800 /* file system, not vfs will massage attrs */
1768 +#define ATTR_FROM_OPEN 0x1000 /* called from open path, ie O_TRUNC */
1769 +#define ATTR_CTIME_SET 0x2000
1772 * This is the Inode Attributes structure, used for notify_change(). It
1774 struct pipe_inode_info *i_pipe;
1775 struct block_device *i_bdev;
1776 struct char_device *i_cdev;
1777 + void *i_filterdata;
1779 unsigned long i_dnotify_mask; /* Directory notify events */
1780 struct dnotify_struct *i_dnotify; /* for directory notifications */
1783 /* needed for tty driver, and maybe others */
1785 + struct lookup_intent *f_it;
1787 /* preallocated helper kiobuf to speedup O_DIRECT */
1788 struct kiobuf *f_iobuf;
1793 + struct lookup_intent *intent;
1798 extern int vfs_link(struct dentry *, struct inode *, struct dentry *);
1799 extern int vfs_rmdir(struct inode *, struct dentry *);
1800 extern int vfs_unlink(struct inode *, struct dentry *);
1801 -extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *);
1802 +int vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
1803 + struct inode *new_dir, struct dentry *new_dentry);
1807 @@ -877,21 +885,32 @@
1809 struct inode_operations {
1810 int (*create) (struct inode *,struct dentry *,int);
1811 + int (*create_it) (struct inode *,struct dentry *,int, struct lookup_intent *);
1812 struct dentry * (*lookup) (struct inode *,struct dentry *);
1813 + struct dentry * (*lookup_it) (struct inode *,struct dentry *, struct nameidata *, struct lookup_intent *, int flags);
1814 int (*link) (struct dentry *,struct inode *,struct dentry *);
1815 + int (*link_raw) (struct nameidata *,struct nameidata *);
1816 int (*unlink) (struct inode *,struct dentry *);
1817 + int (*unlink_raw) (struct nameidata *);
1818 int (*symlink) (struct inode *,struct dentry *,const char *);
1819 + int (*symlink_raw) (struct nameidata *,const char *);
1820 int (*mkdir) (struct inode *,struct dentry *,int);
1821 + int (*mkdir_raw) (struct nameidata *,int);
1822 int (*rmdir) (struct inode *,struct dentry *);
1823 + int (*rmdir_raw) (struct nameidata *);
1824 int (*mknod) (struct inode *,struct dentry *,int,int);
1825 + int (*mknod_raw) (struct nameidata *,int,dev_t);
1826 int (*rename) (struct inode *, struct dentry *,
1827 struct inode *, struct dentry *);
1828 + int (*rename_raw) (struct nameidata *, struct nameidata *);
1829 int (*readlink) (struct dentry *, char *,int);
1830 int (*follow_link) (struct dentry *, struct nameidata *);
1831 void (*truncate) (struct inode *);
1832 int (*permission) (struct inode *, int);
1833 int (*revalidate) (struct dentry *);
1834 + int (*revalidate_it) (struct dentry *, struct lookup_intent *);
1835 int (*setattr) (struct dentry *, struct iattr *);
1836 + int (*setattr_raw) (struct inode *, struct iattr *);
1837 int (*getattr) (struct dentry *, struct iattr *);
1838 int (*setxattr) (struct dentry *, const char *, void *, size_t, int);
1839 ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
1841 int (*remount_fs) (struct super_block *, int *, char *);
1842 void (*clear_inode) (struct inode *);
1843 void (*umount_begin) (struct super_block *);
1844 + void (*umount_lustre) (struct super_block *);
1846 /* Following are for knfsd to interact with "interesting" filesystems
1847 * Currently just reiserfs, but possibly FAT and others later
1848 @@ -1088,10 +1107,16 @@
1850 asmlinkage long sys_open(const char *, int, int);
1851 asmlinkage long sys_close(unsigned int); /* yes, it's really unsigned */
1852 -extern int do_truncate(struct dentry *, loff_t start);
1853 +extern int do_truncate(struct dentry *, loff_t start, int called_from_open);
1854 +struct dentry *lookup_create(struct nameidata *nd, int is_dir,
1855 + struct lookup_intent *it);
1857 extern struct file *filp_open(const char *, int, int);
1858 extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
1859 +extern int open_namei_it(const char *filename, int namei_flags, int mode,
1860 + struct nameidata *nd, struct lookup_intent *it);
1861 +extern struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt,
1862 + int flags, struct lookup_intent *it);
1863 extern int filp_close(struct file *, fl_owner_t id);
1864 extern char * getname(const char *);
1866 @@ -1354,6 +1377,7 @@
1867 extern loff_t default_llseek(struct file *file, loff_t offset, int origin);
1869 extern int FASTCALL(__user_walk(const char *, unsigned, struct nameidata *));
1870 +extern int FASTCALL(__user_walk_it(const char *, unsigned, struct nameidata *, struct lookup_intent *it));
1871 extern int FASTCALL(path_init(const char *, unsigned, struct nameidata *));
1872 extern int FASTCALL(path_walk(const char *, struct nameidata *));
1873 extern int FASTCALL(path_lookup(const char *, unsigned, struct nameidata *));
1874 @@ -1365,6 +1389,8 @@
1875 extern struct dentry * lookup_hash(struct qstr *, struct dentry *);
1876 #define user_path_walk(name,nd) __user_walk(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, nd)
1877 #define user_path_walk_link(name,nd) __user_walk(name, LOOKUP_POSITIVE, nd)
1878 +#define user_path_walk_it(name,nd,it) __user_walk_it(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, nd, it)
1879 +#define user_path_walk_link_it(name,nd,it) __user_walk_it(name, LOOKUP_POSITIVE, nd, it)
1881 extern void inode_init_once(struct inode *);
1882 extern void _inode_init_once(struct inode *);
1883 @@ -1503,6 +1529,8 @@
1885 extern int vfs_readlink(struct dentry *, char *, int, const char *);
1886 extern int vfs_follow_link(struct nameidata *, const char *);
1887 +extern int vfs_follow_link_it(struct nameidata *, const char *,
1888 + struct lookup_intent *it);
1889 extern int page_readlink(struct dentry *, char *, int);
1890 extern int page_follow_link(struct dentry *, struct nameidata *);
1891 extern struct inode_operations page_symlink_inode_operations;
1892 Index: linux/include/linux/fs_struct.h
1893 ===================================================================
1894 --- linux.orig/include/linux/fs_struct.h Fri Jul 13 18:10:44 2001
1895 +++ linux/include/linux/fs_struct.h Wed Mar 17 13:11:25 2004
1897 write_lock(&fs->lock);
1898 old_root = fs->root;
1899 old_rootmnt = fs->rootmnt;
1900 + PIN(dentry, mnt, 1);
1901 fs->rootmnt = mntget(mnt);
1902 fs->root = dget(dentry);
1903 write_unlock(&fs->lock);
1905 + UNPIN(old_root, old_rootmnt, 1);
1907 mntput(old_rootmnt);
1910 write_lock(&fs->lock);
1912 old_pwdmnt = fs->pwdmnt;
1913 + PIN(dentry, mnt, 0);
1914 fs->pwdmnt = mntget(mnt);
1915 fs->pwd = dget(dentry);
1916 write_unlock(&fs->lock);
1918 + UNPIN(old_pwd, old_pwdmnt, 0);
1922 Index: linux/kernel/exit.c
1923 ===================================================================
1924 --- linux.orig/kernel/exit.c Wed Mar 17 13:00:38 2004
1925 +++ linux/kernel/exit.c Wed Mar 17 13:11:25 2004
1926 @@ -239,11 +239,14 @@
1928 /* No need to hold fs->lock if we are killing it */
1929 if (atomic_dec_and_test(&fs->count)) {
1930 + UNPIN(fs->pwd, fs->pwdmnt, 0);
1931 + UNPIN(fs->root, fs->rootmnt, 1);
1933 mntput(fs->rootmnt);
1937 + UNPIN(fs->altroot, fs->altrootmnt, 1);
1939 mntput(fs->altrootmnt);
1941 Index: linux/kernel/fork.c
1942 ===================================================================
1943 --- linux.orig/kernel/fork.c Wed Mar 17 13:00:38 2004
1944 +++ linux/kernel/fork.c Wed Mar 17 13:11:25 2004
1945 @@ -387,10 +387,13 @@
1946 fs->umask = old->umask;
1947 read_lock(&old->lock);
1948 fs->rootmnt = mntget(old->rootmnt);
1949 + PIN(old->pwd, old->pwdmnt, 0);
1950 + PIN(old->root, old->rootmnt, 1);
1951 fs->root = dget(old->root);
1952 fs->pwdmnt = mntget(old->pwdmnt);
1953 fs->pwd = dget(old->pwd);
1955 + PIN(old->altroot, old->altrootmnt, 1);
1956 fs->altrootmnt = mntget(old->altrootmnt);
1957 fs->altroot = dget(old->altroot);
1959 Index: linux/kernel/ksyms.c
1960 ===================================================================
1961 --- linux.orig/kernel/ksyms.c Wed Mar 17 13:11:23 2004
1962 +++ linux/kernel/ksyms.c Wed Mar 17 13:11:25 2004
1964 EXPORT_SYMBOL(set_page_dirty);
1965 EXPORT_SYMBOL(vfs_readlink);
1966 EXPORT_SYMBOL(vfs_follow_link);
1967 +EXPORT_SYMBOL(vfs_follow_link_it);
1968 +EXPORT_SYMBOL(do_umount);
1969 +EXPORT_SYMBOL(lookup_create);
1970 EXPORT_SYMBOL(page_readlink);
1971 EXPORT_SYMBOL(page_follow_link);
1972 EXPORT_SYMBOL(page_symlink_inode_operations);
1973 ===== include/linux/mount.h 1.7 vs edited =====
1974 --- linux.orig/include/linux/mount.h Tue Feb 5 09:49:35 2002
1975 +++ linux/include/linux/mount.h Tue May 4 19:23:48 2004
1978 char *mnt_devname; /* Name of device e.g. /dev/dsk/hda1 */
1979 struct list_head mnt_list;
1980 + struct list_head mnt_lustre_list; /* GNS mount list */
1981 + unsigned long mnt_last_used; /* for GNS auto-umount (jiffies) */
1984 static inline struct vfsmount *mntget(struct vfsmount *mnt)
1988 extern void __mntput(struct vfsmount *mnt);
1989 +extern int do_umount(struct vfsmount *mnt, int flags);
1991 static inline void mntput(struct vfsmount *mnt)