1 Index: linux-2.6.4-51.0/fs/exec.c
2 ===================================================================
3 --- linux-2.6.4-51.0.orig/fs/exec.c 2004-04-05 12:41:59.000000000 -0400
4 +++ linux-2.6.4-51.0/fs/exec.c 2004-04-05 17:36:42.000000000 -0400
9 + intent_init(&nd.intent, IT_OPEN);
11 - nd.intent.open.flags = FMODE_READ;
12 + error = user_path_walk_it(library, &nd);
14 + nd.intent.it_flags = O_RDONLY;
15 error = __user_walk(library, LOOKUP_FOLLOW|LOOKUP_OPEN, &nd);
22 - file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
23 + file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &nd.intent);
24 error = PTR_ERR(file);
31 - nd.intent.open.flags = FMODE_READ;
32 - err = path_lookup(name, LOOKUP_FOLLOW|LOOKUP_OPEN, &nd);
33 + intent_init(&nd.intent, IT_OPEN);
34 + nd.intent.it_flags = O_RDONLY;
35 + err = path_lookup(name, LOOKUP_FOLLOW, &nd);
43 - file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
44 + file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &nd.intent);
46 err = deny_write_access(file);
48 Index: linux-2.6.4-51.0/fs/namei.c
49 ===================================================================
50 --- linux-2.6.4-51.0.orig/fs/namei.c 2004-04-05 12:41:59.000000000 -0400
51 +++ linux-2.6.4-51.0/fs/namei.c 2004-04-05 17:36:42.000000000 -0400
56 +void intent_release(struct lookup_intent *it)
60 + if (it->it_magic != INTENT_MAGIC)
62 + if (it->it_op_release)
63 + it->it_op_release(it);
66 void path_release(struct nameidata *nd)
68 + intent_release(&nd->intent);
74 struct dentry * result;
75 struct inode *dir = parent->d_inode;
82 * First re-do the cached lookup just in case it was created
84 if (result->d_op && result->d_op->d_revalidate) {
85 if (!result->d_op->d_revalidate(result, nd) && !d_invalidate(result)) {
87 - result = ERR_PTR(-ENOENT);
89 + result = ERR_PTR(-ESTALE);
90 + if (!IS_ERR(result))
96 return PTR_ERR(dentry);
99 +static int revalidate_special(struct nameidata *nd)
101 + struct dentry *dentry = nd->dentry;
102 + int err, counter = 0;
104 + if (!dentry->d_op || !dentry->d_op->d_revalidate)
107 + if (!dentry->d_op->d_revalidate(dentry, nd)) {
108 + struct dentry *new;
109 + if ((err = permission(dentry->d_parent->d_inode, MAY_EXEC,nd)))
111 + new = real_lookup(dentry->d_parent, &dentry->d_name, nd);
112 + d_invalidate(dentry);
114 + nd->dentry = dentry = new;
117 + goto revalidate_again;
118 + printk("excessive revalidate_it loops\n");
129 if (inode->i_op->follow_link) {
131 + nd->flags |= LOOKUP_LINK_NOTLAST;
132 err = do_follow_link(next.dentry, nd);
133 + nd->flags &= ~LOOKUP_LINK_NOTLAST;
137 @@ -702,14 +746,29 @@
138 inode = nd->dentry->d_inode;
141 + nd->flags |= LOOKUP_LAST;
142 + err = revalidate_special(nd);
143 + nd->flags &= ~LOOKUP_LAST;
150 + if (!nd->dentry->d_inode)
156 if (nd->dentry->d_op && nd->dentry->d_op->d_hash) {
157 err = nd->dentry->d_op->d_hash(nd->dentry, &this);
161 + nd->flags |= LOOKUP_LAST;
162 err = do_lookup(nd, &this, &next);
163 + nd->flags &= ~LOOKUP_LAST;
166 follow_mount(&next.mnt, &next.dentry);
171 -struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
172 +struct dentry * lookup_one_len_it(const char * name, struct dentry * base, int len, struct nameidata *nd)
176 @@ -955,11 +1014,16 @@
178 this.hash = end_name_hash(hash);
180 - return lookup_hash(&this, base);
181 + return __lookup_hash(&this, base, nd);
183 return ERR_PTR(-EACCES);
186 +struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
188 + return lookup_one_len_it(name, base, len, NULL);
195 * that namei follows links, while lnamei does not.
198 -int fastcall __user_walk(const char __user *name, unsigned flags, struct nameidata *nd)
199 +int fastcall __user_walk_it(const char __user *name, unsigned flags, struct nameidata *nd)
201 char *tmp = getname(name);
202 int err = PTR_ERR(tmp);
203 @@ -983,6 +1047,12 @@
207 +int __user_walk(const char __user *name, unsigned flags, struct nameidata *nd)
209 + intent_init(&nd->intent, IT_LOOKUP);
210 + return __user_walk_it(name, flags, nd);
214 * It's inline, so penalty for filesystems that don't use sticky bit is
216 @@ -1255,8 +1325,8 @@
217 acc_mode |= MAY_APPEND;
219 /* Fill in the open() intent data */
220 - nd->intent.open.flags = flag;
221 - nd->intent.open.create_mode = mode;
222 + nd->intent.it_flags = flag;
223 + nd->intent.it_create_mode = mode;
226 * The simplest case - just a plain lookup.
227 @@ -1271,6 +1341,7 @@
229 * Create - we need to know the parent.
231 + nd->intent.it_op |= IT_CREAT;
232 error = path_lookup(pathname, LOOKUP_PARENT|LOOKUP_OPEN|LOOKUP_CREATE, nd);
235 @@ -1287,7 +1358,9 @@
237 nd->flags &= ~LOOKUP_PARENT;
238 down(&dir->d_inode->i_sem);
239 + nd->flags |= LOOKUP_LAST;
240 dentry = __lookup_hash(&nd->last, nd->dentry, nd);
241 + nd->flags &= ~LOOKUP_LAST;
244 error = PTR_ERR(dentry);
245 @@ -1392,7 +1465,9 @@
248 down(&dir->d_inode->i_sem);
249 + nd->flags |= LOOKUP_LAST;
250 dentry = __lookup_hash(&nd->last, nd->dentry, nd);
251 + nd->flags &= ~LOOKUP_LAST;
252 putname(nd->last.name);
255 @@ -2154,7 +2229,9 @@
256 __vfs_follow_link(struct nameidata *nd, const char *link)
259 + struct lookup_intent it = nd->intent;
265 @@ -2164,6 +2241,10 @@
266 /* weird __emul_prefix() stuff did it */
270 + intent_init(&nd->intent, it.it_op);
271 + nd->intent.it_flags = it.it_flags;
272 + nd->intent.it_create_mode = it.it_create_mode;
273 res = link_path_walk(link, nd);
275 if (current->link_count || res || nd->last_type!=LAST_NORM)
276 Index: linux-2.6.4-51.0/fs/namespace.c
277 ===================================================================
278 --- linux-2.6.4-51.0.orig/fs/namespace.c 2004-04-05 12:41:59.000000000 -0400
279 +++ linux-2.6.4-51.0/fs/namespace.c 2004-04-07 13:28:23.000000000 -0400
282 static void detach_mnt(struct vfsmount *mnt, struct nameidata *old_nd)
284 + memset(old_nd, 0, sizeof(*old_nd));
285 old_nd->dentry = mnt->mnt_mountpoint;
286 old_nd->mnt = mnt->mnt_parent;
287 mnt->mnt_parent = mnt;
292 + intent_init(&nd.intent, IT_LOOKUP);
294 if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
295 flags &= ~MS_MGC_MSK;
296 Index: linux-2.6.4-51.0/fs/open.c
297 ===================================================================
298 --- linux-2.6.4-51.0.orig/fs/open.c 2004-04-05 12:41:59.000000000 -0400
299 +++ linux-2.6.4-51.0/fs/open.c 2004-04-05 17:36:42.000000000 -0400
302 struct inode * inode;
305 + intent_init(&nd.intent, IT_GETATTR);
307 if (length < 0) /* sorry, but loff_t says... */
310 int old_fsuid, old_fsgid;
311 kernel_cap_t old_cap;
313 + intent_init(&nd.intent, IT_GETATTR);
315 if (mode & ~S_IRWXO) /* where's F_OK, X_OK, W_OK, R_OK? */
318 if(!res && (mode & S_IWOTH) && IS_RDONLY(nd.dentry->d_inode)
319 && !special_file(nd.dentry->d_inode->i_mode))
329 + intent_init(&nd.intent, IT_GETATTR);
331 error = __user_walk(filename, LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &nd);
337 + intent_init(&nd.intent, IT_GETATTR);
339 error = __user_walk(filename, LOOKUP_FOLLOW | LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd);
343 if (IS_RDONLY(inode))
348 if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
351 * for the internal routines (ie open_namei()/follow_link() etc). 00 is
354 -struct file *filp_open(const char * filename, int flags, int mode)
356 - int namei_flags, error;
357 - struct nameidata nd;
359 - namei_flags = flags;
360 - if ((namei_flags+1) & O_ACCMODE)
362 - if (namei_flags & O_TRUNC)
365 - error = open_namei(filename, namei_flags, mode, &nd);
367 - return dentry_open(nd.dentry, nd.mnt, flags);
369 - return ERR_PTR(error);
372 -EXPORT_SYMBOL(filp_open);
374 -struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
375 +struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt, int flags,
376 + struct lookup_intent *it)
383 f->f_mode = (flags+1) & O_ACCMODE;
385 inode = dentry->d_inode;
386 if (f->f_mode & FMODE_WRITE) {
387 error = get_write_access(inode);
389 error = f->f_op->open(inode,f);
392 + intent_release(it);
394 f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);
400 + intent_release(it);
403 return ERR_PTR(error);
406 EXPORT_SYMBOL(dentry_open);
408 +struct file *filp_open(const char * filename, int flags, int mode)
410 + int namei_flags, error;
411 + struct file * temp_filp;
412 + struct nameidata nd;
413 + intent_init(&nd.intent, IT_OPEN);
415 + namei_flags = flags;
416 + if ((namei_flags+1) & O_ACCMODE)
418 + if (namei_flags & O_TRUNC)
421 + error = open_namei(filename, namei_flags, mode, &nd);
423 + temp_filp = dentry_open_it(nd.dentry, nd.mnt, flags, &nd.intent);
426 + return ERR_PTR(error);
430 +struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
432 + struct lookup_intent it;
433 + intent_init(&it, IT_LOOKUP);
435 + return dentry_open_it(dentry, mnt, flags, &it);
439 * Find an empty file descriptor entry, and mark it busy.
441 Index: linux-2.6.4-51.0/fs/stat.c
442 ===================================================================
443 --- linux-2.6.4-51.0.orig/fs/stat.c 2004-04-05 12:41:59.000000000 -0400
444 +++ linux-2.6.4-51.0/fs/stat.c 2004-04-05 17:36:42.000000000 -0400
447 EXPORT_SYMBOL(generic_fillattr);
449 -int vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
450 +int vfs_getattr_it(struct vfsmount *mnt, struct dentry *dentry, struct lookup_intent *it, struct kstat *stat)
452 struct inode *inode = dentry->d_inode;
458 + if (inode->i_op->getattr_it)
459 + return inode->i_op->getattr_it(mnt, dentry, it, stat);
460 if (inode->i_op->getattr)
461 return inode->i_op->getattr(mnt, dentry, stat);
465 EXPORT_SYMBOL(vfs_getattr);
467 +int vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
469 + return vfs_getattr_it(mnt, dentry, NULL, stat);
472 int vfs_stat(char __user *name, struct kstat *stat)
476 + intent_init(&nd.intent, IT_GETATTR);
478 - error = user_path_walk(name, &nd);
479 + error = user_path_walk_it(name, &nd);
481 - error = vfs_getattr(nd.mnt, nd.dentry, stat);
482 + error = vfs_getattr_it(nd.mnt, nd.dentry, &nd.intent, stat);
490 + intent_init(&nd.intent, IT_GETATTR);
492 - error = user_path_walk_link(name, &nd);
493 + error = user_path_walk_link_it(name, &nd);
495 - error = vfs_getattr(nd.mnt, nd.dentry, stat);
496 + error = vfs_getattr_it(nd.mnt, nd.dentry, &nd.intent, stat);
502 struct file *f = fget(fd);
504 + struct nameidata nd;
505 + intent_init(&nd.intent, IT_GETATTR);
508 - error = vfs_getattr(f->f_vfsmnt, f->f_dentry, stat);
509 + error = vfs_getattr_it(f->f_vfsmnt, f->f_dentry, &nd.intent, stat);
510 + intent_release(&nd.intent);
514 Index: linux-2.6.4-51.0/fs/nfs/dir.c
515 ===================================================================
516 --- linux-2.6.4-51.0.orig/fs/nfs/dir.c 2004-04-05 12:41:59.000000000 -0400
517 +++ linux-2.6.4-51.0/fs/nfs/dir.c 2004-04-07 13:27:47.000000000 -0400
520 if (!nd || (nd->flags & LOOKUP_CONTINUE) || !(nd->flags & LOOKUP_CREATE))
522 - return (nd->intent.open.flags & O_EXCL) != 0;
523 + return (nd->intent.it_flags & O_EXCL) != 0;
526 static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
527 @@ -1026,7 +1026,7 @@
528 attr.ia_valid = ATTR_MODE;
530 if (nd && (nd->flags & LOOKUP_CREATE))
531 - open_flags = nd->intent.open.flags;
532 + open_flags = nd->intent.it_flags;
535 * The 0 argument passed into the create function should one day
536 Index: linux-2.6.4-51.0/fs/inode.c
537 ===================================================================
538 --- linux-2.6.4-51.0.orig/fs/inode.c 2004-04-05 12:41:59.000000000 -0400
539 +++ linux-2.6.4-51.0/fs/inode.c 2004-04-05 17:36:43.000000000 -0400
541 inodes_stat.nr_unused--;
544 +EXPORT_SYMBOL(__iget);
546 * clear_inode - clear an inode
547 * @inode: inode to clear
548 Index: linux-2.6.4-51.0/fs/super.c
549 ===================================================================
550 --- linux-2.6.4-51.0.orig/fs/super.c 2004-04-05 12:41:59.000000000 -0400
551 +++ linux-2.6.4-51.0/fs/super.c 2004-04-05 17:36:43.000000000 -0400
553 return (struct vfsmount *)sb;
556 +EXPORT_SYMBOL(do_kern_mount);
558 struct vfsmount *kern_mount(struct file_system_type *type)
560 return do_kern_mount(type->name, 0, type->name, NULL);
561 Index: linux-2.6.4-51.0/include/linux/dcache.h
562 ===================================================================
563 --- linux-2.6.4-51.0.orig/include/linux/dcache.h 2004-04-05 12:42:07.000000000 -0400
564 +++ linux-2.6.4-51.0/include/linux/dcache.h 2004-04-05 17:36:43.000000000 -0400
568 #include <asm/atomic.h>
569 +#include <linux/string.h>
570 #include <linux/list.h>
571 #include <linux/spinlock.h>
572 #include <linux/cache.h>
577 +#include <linux/namei.h>
579 struct dentry_stat_t {
582 Index: linux-2.6.4-51.0/include/linux/fs.h
583 ===================================================================
584 --- linux-2.6.4-51.0.orig/include/linux/fs.h 2004-04-05 12:42:07.000000000 -0400
585 +++ linux-2.6.4-51.0/include/linux/fs.h 2004-04-05 17:36:43.000000000 -0400
587 #define ATTR_ATTR_FLAG 1024
588 #define ATTR_KILL_SUID 2048
589 #define ATTR_KILL_SGID 4096
590 +#define ATTR_RAW 8192 /* file system, not vfs will massage attrs */
591 +#define ATTR_FROM_OPEN 16384 /* called from open path, ie O_TRUNC */
594 * This is the Inode Attributes structure, used for notify_change(). It
596 struct block_device *i_bdev;
599 + void *i_filterdata;
601 unsigned long i_dnotify_mask; /* Directory notify events */
602 struct dnotify_struct *i_dnotify; /* for directory notifications */
604 spinlock_t f_ep_lock;
605 #endif /* #ifdef CONFIG_EPOLL */
606 struct address_space *f_mapping;
607 + struct lookup_intent *f_it;
609 extern spinlock_t files_lock;
610 #define file_list_lock() spin_lock(&files_lock);
612 void (*truncate) (struct inode *);
613 int (*permission) (struct inode *, int, struct nameidata *);
614 int (*setattr) (struct dentry *, struct iattr *);
615 + int (*setattr_raw) (struct inode *, struct iattr *);
616 int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *);
617 + int (*getattr_it) (struct vfsmount *, struct dentry *, struct lookup_intent *, struct kstat *);
618 int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);
619 ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
620 ssize_t (*listxattr) (struct dentry *, char *, size_t);
621 @@ -1101,6 +1107,7 @@
622 extern int unregister_filesystem(struct file_system_type *);
623 extern struct vfsmount *kern_mount(struct file_system_type *);
624 extern int may_umount(struct vfsmount *);
625 +struct vfsmount *do_kern_mount(const char *type, int flags, const char *name, void *data);
626 extern long do_mount(char *, char *, char *, unsigned long, void *);
628 extern int vfs_statfs(struct super_block *, struct kstatfs *);
629 @@ -1165,6 +1172,7 @@
630 extern int do_truncate(struct dentry *, loff_t start);
631 extern struct file *filp_open(const char *, int, int);
632 extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
633 +extern struct file * dentry_open_it(struct dentry *, struct vfsmount *, int, struct lookup_intent *);
634 extern int filp_close(struct file *, fl_owner_t id);
635 extern char * getname(const char __user *);
637 Index: linux-2.6.4-51.0/include/linux/namei.h
638 ===================================================================
639 --- linux-2.6.4-51.0.orig/include/linux/namei.h 2004-04-05 12:42:07.000000000 -0400
640 +++ linux-2.6.4-51.0/include/linux/namei.h 2004-04-05 17:36:43.000000000 -0400
642 #define _LINUX_NAMEI_H
644 #include <linux/linkage.h>
645 +#include <linux/string.h>
650 -struct open_intent {
653 +/* intent opcodes */
655 +#define IT_CREAT (1<<1)
656 +#define IT_READDIR (1<<2)
657 +#define IT_GETATTR (1<<3)
658 +#define IT_LOOKUP (1<<4)
659 +#define IT_UNLINK (1<<5)
660 +#define IT_TRUNC (1<<6)
661 +#define IT_GETXATTR (1<<7)
663 +struct lustre_intent_data {
664 + int it_disposition;
666 + __u64 it_lock_handle;
671 +#define INTENT_MAGIC 0x19620323
672 +struct lookup_intent {
674 + void (*it_op_release)(struct lookup_intent *);
677 + int it_create_mode;
679 + struct lustre_intent_data lustre;
683 +static inline void intent_init(struct lookup_intent *it, int op)
685 + memset(it, 0, sizeof(*it));
686 + it->it_magic = INTENT_MAGIC;
691 struct dentry *dentry;
692 struct vfsmount *mnt;
699 - struct open_intent open;
701 + struct lookup_intent intent;
706 #define LOOKUP_CONTINUE 4
707 #define LOOKUP_PARENT 16
708 #define LOOKUP_NOALT 32
709 +#define LOOKUP_LAST (1<<6)
710 +#define LOOKUP_LINK_NOTLAST (1<<7)
716 #define LOOKUP_ACCESS (0x0400)
718 extern int FASTCALL(__user_walk(const char __user *, unsigned, struct nameidata *));
719 +extern int FASTCALL(__user_walk_it(const char __user *name, unsigned flags, struct nameidata *nd));
720 +#define user_path_walk_it(name,nd) \
721 + __user_walk_it(name, LOOKUP_FOLLOW, nd)
722 +#define user_path_walk_link_it(name,nd) \
723 + __user_walk_it(name, 0, nd)
724 +extern void intent_release(struct lookup_intent *);
725 #define user_path_walk(name,nd) \
726 __user_walk(name, LOOKUP_FOLLOW, nd)
727 #define user_path_walk_link(name,nd) \
730 extern struct dentry * lookup_one_len(const char *, struct dentry *, int);
731 extern struct dentry * lookup_hash(struct qstr *, struct dentry *);
733 extern int follow_down(struct vfsmount **, struct dentry **);
734 extern int follow_up(struct vfsmount **, struct dentry **);
736 Index: linux-2.6.4-51.0/kernel/exit.c
737 ===================================================================
738 --- linux-2.6.4-51.0.orig/kernel/exit.c 2004-04-05 12:42:08.000000000 -0400
739 +++ linux-2.6.4-51.0/kernel/exit.c 2004-04-05 17:36:43.000000000 -0400
741 write_unlock_irq(&tasklist_lock);
744 +EXPORT_SYMBOL(reparent_to_init);
746 void __set_special_pids(pid_t session, pid_t pgrp)
748 struct task_struct *curr = current;
753 +EXPORT_SYMBOL(exit_files);
755 static inline void __put_fs_struct(struct fs_struct *fs)
757 /* No need to hold fs->lock if we are killing it */