1 Index: linux-2.6.5-12.1/fs/exec.c
2 ===================================================================
3 --- linux-2.6.5-12.1.orig/fs/exec.c 2004-05-10 12:21:56.000000000 -0400
4 +++ linux-2.6.5-12.1/fs/exec.c 2004-06-03 18:31:28.000000000 -0400
9 - nd.intent.open.flags = FMODE_READ;
10 + intent_init(&nd.intent, IT_OPEN);
12 - FSHOOK_BEGIN_USER_WALK(open,
13 + nd.intent.it_flags = FMODE_READ;
14 + FSHOOK_BEGIN_USER_WALK_IT(open,
17 LOOKUP_FOLLOW|LOOKUP_OPEN,
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);
29 FSHOOK_BEGIN(open, err, .filename = name, .flags = O_RDONLY)
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 = FMODE_READ;
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.5-12.1/fs/namei.c
49 ===================================================================
50 --- linux-2.6.5-12.1.orig/fs/namei.c 2004-05-10 12:21:56.000000000 -0400
51 +++ linux-2.6.5-12.1/fs/namei.c 2004-06-03 18:42:17.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);
113 + return PTR_ERR(new);
114 + d_invalidate(dentry);
116 + nd->dentry = dentry = new;
119 + goto revalidate_again;
120 + printk("excessive revalidate_it loops\n");
131 if (inode->i_op->follow_link) {
133 + nd->flags |= LOOKUP_LINK_NOTLAST;
134 err = do_follow_link(next.dentry, nd);
135 + nd->flags &= ~LOOKUP_LINK_NOTLAST;
139 @@ -703,14 +749,24 @@
140 inode = nd->dentry->d_inode;
143 + nd->flags |= LOOKUP_LAST;
144 + err = revalidate_special(nd);
145 + nd->flags &= ~LOOKUP_LAST;
146 + if (!nd->dentry->d_inode)
153 if (nd->dentry->d_op && nd->dentry->d_op->d_hash) {
154 err = nd->dentry->d_op->d_hash(nd->dentry, &this);
158 + nd->flags |= LOOKUP_LAST;
159 err = do_lookup(nd, &this, &next);
160 + nd->flags &= ~LOOKUP_LAST;
163 follow_mount(&next.mnt, &next.dentry);
168 -struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
169 +struct dentry * lookup_one_len_it(const char * name, struct dentry * base, int len, struct nameidata *nd)
173 @@ -956,11 +1012,16 @@
175 this.hash = end_name_hash(hash);
177 - return lookup_hash(&this, base);
178 + return __lookup_hash(&this, base, nd);
180 return ERR_PTR(-EACCES);
183 +struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
185 + return lookup_one_len_it(name, base, len, NULL);
192 * that namei follows links, while lnamei does not.
195 -int fastcall __user_walk(const char __user *name, unsigned flags, struct nameidata *nd, const char **pname)
196 +int fastcall __user_walk_it(const char __user *name, unsigned flags,
197 + struct nameidata *nd, const char **pname)
199 char *tmp = getname(name);
200 int err = PTR_ERR(tmp);
201 @@ -987,6 +1049,13 @@
205 +int fastcall __user_walk(const char __user *name, unsigned flags,
206 + struct nameidata *nd, const char **pname)
208 + intent_init(&nd->intent, IT_LOOKUP);
209 + return __user_walk_it(name, flags, nd, pname);
213 * It's inline, so penalty for filesystems that don't use sticky bit is
215 @@ -1259,8 +1328,8 @@
216 acc_mode |= MAY_APPEND;
218 /* Fill in the open() intent data */
219 - nd->intent.open.flags = flag;
220 - nd->intent.open.create_mode = mode;
221 + nd->intent.it_flags = flag;
222 + nd->intent.it_create_mode = mode;
225 * The simplest case - just a plain lookup.
226 @@ -1275,6 +1344,7 @@
228 * Create - we need to know the parent.
230 + nd->intent.it_op |= IT_CREAT;
231 error = path_lookup(pathname, LOOKUP_PARENT|LOOKUP_OPEN|LOOKUP_CREATE, nd);
234 @@ -1291,7 +1361,9 @@
236 nd->flags &= ~LOOKUP_PARENT;
237 down(&dir->d_inode->i_sem);
238 + nd->flags |= LOOKUP_LAST;
239 dentry = __lookup_hash(&nd->last, nd->dentry, nd);
240 + nd->flags &= ~LOOKUP_LAST;
243 error = PTR_ERR(dentry);
244 @@ -1396,7 +1468,9 @@
247 down(&dir->d_inode->i_sem);
248 + nd->flags |= LOOKUP_LAST;
249 dentry = __lookup_hash(&nd->last, nd->dentry, nd);
250 + nd->flags &= ~LOOKUP_LAST;
251 putname(nd->last.name);
254 @@ -2196,7 +2270,9 @@
255 __vfs_follow_link(struct nameidata *nd, const char *link)
258 + struct lookup_intent it = nd->intent;
264 @@ -2206,6 +2282,10 @@
265 /* weird __emul_prefix() stuff did it */
269 + intent_init(&nd->intent, it.it_op);
270 + nd->intent.it_flags = it.it_flags;
271 + nd->intent.it_create_mode = it.it_create_mode;
272 res = link_path_walk(link, nd);
274 if (current->link_count || res || nd->last_type!=LAST_NORM)
275 Index: linux-2.6.5-12.1/fs/namespace.c
276 ===================================================================
277 --- linux-2.6.5-12.1.orig/fs/namespace.c 2004-05-10 12:21:56.000000000 -0400
278 +++ linux-2.6.5-12.1/fs/namespace.c 2004-06-03 18:31:28.000000000 -0400
281 static void detach_mnt(struct vfsmount *mnt, struct nameidata *old_nd)
283 + memset(old_nd, 0, sizeof(*old_nd));
284 old_nd->dentry = mnt->mnt_mountpoint;
285 old_nd->mnt = mnt->mnt_parent;
286 mnt->mnt_parent = mnt;
289 if (!old_name || !*old_name)
292 + intent_init(&old_nd.intent, IT_LOOKUP);
293 err = path_lookup(old_name, LOOKUP_FOLLOW, &old_nd);
298 if (!old_name || !*old_name)
300 + intent_init(&old_nd.intent, IT_LOOKUP);
301 err = path_lookup(old_name, LOOKUP_FOLLOW, &old_nd);
308 + intent_init(&nd.intent, IT_LOOKUP);
310 if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
311 flags &= ~MS_MGC_MSK;
312 Index: linux-2.6.5-12.1/fs/open.c
313 ===================================================================
314 --- linux-2.6.5-12.1.orig/fs/open.c 2004-05-10 12:21:56.000000000 -0400
315 +++ linux-2.6.5-12.1/fs/open.c 2004-06-03 18:31:28.000000000 -0400
316 @@ -227,12 +227,12 @@
318 struct inode * inode;
321 + intent_init(&nd.intent, IT_GETATTR);
323 if (length < 0) /* sorry, but loff_t says... */
326 - FSHOOK_BEGIN_USER_PATH_WALK(truncate, error, path, nd, filename, .length = length)
327 + FSHOOK_BEGIN_USER_PATH_WALK_IT(truncate, error, path, nd, filename, .length = length)
329 inode = nd.dentry->d_inode;
332 int old_fsuid, old_fsgid;
333 kernel_cap_t old_cap;
335 + intent_init(&nd.intent, IT_GETATTR);
337 if (mode & ~S_IRWXO) /* where's F_OK, X_OK, W_OK, R_OK? */
341 current->cap_effective = current->cap_permitted;
343 - FSHOOK_BEGIN_USER_WALK(access,
344 + FSHOOK_BEGIN_USER_WALK_IT(access,
347 LOOKUP_FOLLOW|LOOKUP_ACCESS,
349 if(!res && (mode & S_IWOTH) && IS_RDONLY(nd.dentry->d_inode)
350 && !special_file(nd.dentry->d_inode->i_mode))
355 FSHOOK_END_USER_WALK(access, res, path)
356 @@ -545,11 +547,13 @@
358 asmlinkage long sys_fchdir(unsigned int fd)
360 + struct nameidata nd;
362 struct dentry *dentry;
364 struct vfsmount *mnt;
366 + intent_init(&nd.intent, IT_GETATTR);
368 FSHOOK_BEGIN(fchdir, error, .fd = fd)
374 + intent_init(&nd.intent, IT_GETATTR);
376 - FSHOOK_BEGIN_USER_WALK(chroot,
377 + FSHOOK_BEGIN_USER_WALK_IT(chroot,
380 LOOKUP_FOLLOW | LOOKUP_DIRECTORY | LOOKUP_NOALT,
383 if (IS_RDONLY(inode))
388 if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
391 * for the internal routines (ie open_namei()/follow_link() etc). 00 is
394 -struct file *filp_open(const char * filename, int flags, int mode)
396 - int namei_flags, error;
397 - struct nameidata nd;
399 - namei_flags = flags;
400 - if ((namei_flags+1) & O_ACCMODE)
402 - if (namei_flags & O_TRUNC)
405 - error = open_namei(filename, namei_flags, mode, &nd);
407 - return dentry_open(nd.dentry, nd.mnt, flags);
409 - return ERR_PTR(error);
412 -EXPORT_SYMBOL(filp_open);
414 -struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
415 +struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt, int flags,
416 + struct lookup_intent *it)
423 f->f_mode = (flags+1) & O_ACCMODE;
425 inode = dentry->d_inode;
426 if (f->f_mode & FMODE_WRITE) {
427 error = get_write_access(inode);
429 error = f->f_op->open(inode,f);
432 + intent_release(it);
434 f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);
440 + intent_release(it);
443 return ERR_PTR(error);
446 EXPORT_SYMBOL(dentry_open);
448 +struct file *filp_open(const char * filename, int flags, int mode)
450 + int namei_flags, error;
451 + struct file * temp_filp;
452 + struct nameidata nd;
453 + intent_init(&nd.intent, IT_OPEN);
455 + namei_flags = flags;
456 + if ((namei_flags+1) & O_ACCMODE)
458 + if (namei_flags & O_TRUNC)
461 + error = open_namei(filename, namei_flags, mode, &nd);
463 + temp_filp = dentry_open_it(nd.dentry, nd.mnt, flags, &nd.intent);
466 + return ERR_PTR(error);
470 +struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
472 + struct lookup_intent it;
473 + intent_init(&it, IT_LOOKUP);
475 + return dentry_open_it(dentry, mnt, flags, &it);
479 * Find an empty file descriptor entry, and mark it busy.
481 Index: linux-2.6.5-12.1/fs/stat.c
482 ===================================================================
483 --- linux-2.6.5-12.1.orig/fs/stat.c 2004-05-10 12:21:56.000000000 -0400
484 +++ linux-2.6.5-12.1/fs/stat.c 2004-06-03 18:31:28.000000000 -0400
487 EXPORT_SYMBOL(generic_fillattr);
489 -int vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
490 +int vfs_getattr_it(struct vfsmount *mnt, struct dentry *dentry, struct lookup_intent *it, struct kstat *stat)
492 struct inode *inode = dentry->d_inode;
498 + if (inode->i_op->getattr_it)
499 + return inode->i_op->getattr_it(mnt, dentry, it, stat);
500 if (inode->i_op->getattr)
501 return inode->i_op->getattr(mnt, dentry, stat);
505 EXPORT_SYMBOL(vfs_getattr);
507 +int vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
509 + return vfs_getattr_it(mnt, dentry, NULL, stat);
512 int vfs_stat(char __user *name, struct kstat *stat)
516 + intent_init(&nd.intent, IT_GETATTR);
518 - FSHOOK_BEGIN_USER_PATH_WALK(stat, error, name, nd, path, .link = false)
519 + FSHOOK_BEGIN_USER_PATH_WALK_IT(stat, error, name, nd, path, .link = false)
521 - error = vfs_getattr(nd.mnt, nd.dentry, stat);
522 + error = vfs_getattr_it(nd.mnt, nd.dentry, &nd.intent, stat);
525 FSHOOK_END_USER_WALK(stat, error, path)
530 + intent_init(&nd.intent, IT_GETATTR);
532 - FSHOOK_BEGIN_USER_PATH_WALK_LINK(stat, error, name, nd, path, .link = true)
533 + FSHOOK_BEGIN_USER_PATH_WALK_LINK_IT(stat, error, name, nd, path, .link = true)
535 - error = vfs_getattr(nd.mnt, nd.dentry, stat);
536 + error = vfs_getattr_it(nd.mnt, nd.dentry, &nd.intent, stat);
539 FSHOOK_END_USER_WALK(stat, error, path)
541 int vfs_fstat(unsigned int fd, struct kstat *stat)
544 + struct nameidata nd;
545 + intent_init(&nd.intent, IT_GETATTR);
547 FSHOOK_BEGIN(fstat, error, .fd = fd)
553 - error = vfs_getattr(f->f_vfsmnt, f->f_dentry, stat);
554 + error = vfs_getattr_it(f->f_vfsmnt, f->f_dentry, &nd.intent, stat);
555 + intent_release(&nd.intent);
559 Index: linux-2.6.5-12.1/fs/nfs/dir.c
560 ===================================================================
561 --- linux-2.6.5-12.1.orig/fs/nfs/dir.c 2004-05-10 12:21:53.000000000 -0400
562 +++ linux-2.6.5-12.1/fs/nfs/dir.c 2004-06-03 18:31:28.000000000 -0400
565 if (!nd || (nd->flags & LOOKUP_CONTINUE) || !(nd->flags & LOOKUP_CREATE))
567 - return (nd->intent.open.flags & O_EXCL) != 0;
568 + return (nd->intent.it_flags & O_EXCL) != 0;
571 static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
572 @@ -1026,7 +1026,7 @@
573 attr.ia_valid = ATTR_MODE;
575 if (nd && (nd->flags & LOOKUP_CREATE))
576 - open_flags = nd->intent.open.flags;
577 + open_flags = nd->intent.it_flags;
580 * The 0 argument passed into the create function should one day
581 Index: linux-2.6.5-12.1/fs/inode.c
582 ===================================================================
583 --- linux-2.6.5-12.1.orig/fs/inode.c 2004-05-10 12:21:56.000000000 -0400
584 +++ linux-2.6.5-12.1/fs/inode.c 2004-06-03 18:31:28.000000000 -0400
586 inodes_stat.nr_unused--;
589 +EXPORT_SYMBOL(__iget);
591 * clear_inode - clear an inode
592 * @inode: inode to clear
593 Index: linux-2.6.5-12.1/fs/super.c
594 ===================================================================
595 --- linux-2.6.5-12.1.orig/fs/super.c 2004-05-10 12:21:56.000000000 -0400
596 +++ linux-2.6.5-12.1/fs/super.c 2004-06-03 18:31:28.000000000 -0400
598 return (struct vfsmount *)sb;
601 +EXPORT_SYMBOL(do_kern_mount);
603 struct vfsmount *kern_mount(struct file_system_type *type)
605 return do_kern_mount(type->name, 0, type->name, NULL);
606 Index: linux-2.6.5-12.1/fs/block_dev.c
607 ===================================================================
608 --- linux-2.6.5-12.1.orig/fs/block_dev.c 2004-05-10 12:21:55.000000000 -0400
609 +++ linux-2.6.5-12.1/fs/block_dev.c 2004-06-03 18:31:28.000000000 -0400
612 return ERR_PTR(-EINVAL);
614 + intent_init(&nd.intent, IT_LOOKUP);
615 error = path_lookup(path, LOOKUP_FOLLOW, &nd);
617 return ERR_PTR(error);
618 Index: linux-2.6.5-12.1/include/linux/dcache.h
619 ===================================================================
620 --- linux-2.6.5-12.1.orig/include/linux/dcache.h 2004-04-03 22:38:24.000000000 -0500
621 +++ linux-2.6.5-12.1/include/linux/dcache.h 2004-06-03 18:31:28.000000000 -0400
625 #include <asm/atomic.h>
626 +#include <linux/string.h>
627 #include <linux/list.h>
628 #include <linux/spinlock.h>
629 #include <linux/cache.h>
634 +#include <linux/namei.h>
636 struct dentry_stat_t {
639 Index: linux-2.6.5-12.1/include/linux/fs.h
640 ===================================================================
641 --- linux-2.6.5-12.1.orig/include/linux/fs.h 2004-05-10 12:21:56.000000000 -0400
642 +++ linux-2.6.5-12.1/include/linux/fs.h 2004-06-03 18:31:28.000000000 -0400
644 #define ATTR_ATTR_FLAG 1024
645 #define ATTR_KILL_SUID 2048
646 #define ATTR_KILL_SGID 4096
647 +#define ATTR_RAW 8192 /* file system, not vfs will massage attrs */
648 +#define ATTR_FROM_OPEN 16384 /* called from open path, ie O_TRUNC */
651 * This is the Inode Attributes structure, used for notify_change(). It
653 struct block_device *i_bdev;
656 + void *i_filterdata;
658 unsigned long i_dnotify_mask; /* Directory notify events */
659 struct dnotify_struct *i_dnotify; /* for directory notifications */
661 spinlock_t f_ep_lock;
662 #endif /* #ifdef CONFIG_EPOLL */
663 struct address_space *f_mapping;
664 + struct lookup_intent *f_it;
666 extern spinlock_t files_lock;
667 #define file_list_lock() spin_lock(&files_lock);
669 void (*truncate) (struct inode *);
670 int (*permission) (struct inode *, int, struct nameidata *);
671 int (*setattr) (struct dentry *, struct iattr *);
672 + int (*setattr_raw) (struct inode *, struct iattr *);
673 int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *);
674 + int (*getattr_it) (struct vfsmount *, struct dentry *, struct lookup_intent *, struct kstat *);
675 int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);
676 ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
677 ssize_t (*listxattr) (struct dentry *, char *, size_t);
678 @@ -1114,6 +1120,7 @@
679 extern int unregister_filesystem(struct file_system_type *);
680 extern struct vfsmount *kern_mount(struct file_system_type *);
681 extern int may_umount(struct vfsmount *);
682 +struct vfsmount *do_kern_mount(const char *type, int flags, const char *name, void *data);
683 extern long do_mount(char *, char *, char *, unsigned long, void *);
685 extern int vfs_statfs(struct super_block *, struct kstatfs *);
686 @@ -1178,6 +1185,7 @@
687 extern int do_truncate(struct dentry *, loff_t start);
688 extern struct file *filp_open(const char *, int, int);
689 extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
690 +extern struct file * dentry_open_it(struct dentry *, struct vfsmount *, int, struct lookup_intent *);
691 extern int filp_close(struct file *, fl_owner_t id);
692 extern char * getname(const char __user *);
694 Index: linux-2.6.5-12.1/include/linux/namei.h
695 ===================================================================
696 --- linux-2.6.5-12.1.orig/include/linux/namei.h 2004-05-10 12:21:56.000000000 -0400
697 +++ linux-2.6.5-12.1/include/linux/namei.h 2004-06-03 18:31:28.000000000 -0400
699 #define _LINUX_NAMEI_H
701 #include <linux/linkage.h>
702 +#include <linux/string.h>
707 -struct open_intent {
710 +/* intent opcodes */
712 +#define IT_CREAT (1<<1)
713 +#define IT_READDIR (1<<2)
714 +#define IT_GETATTR (1<<3)
715 +#define IT_LOOKUP (1<<4)
716 +#define IT_UNLINK (1<<5)
717 +#define IT_TRUNC (1<<6)
718 +#define IT_GETXATTR (1<<7)
720 +struct lustre_intent_data {
721 + int it_disposition;
723 + __u64 it_lock_handle;
728 +#define INTENT_MAGIC 0x19620323
729 +struct lookup_intent {
731 + void (*it_op_release)(struct lookup_intent *);
734 + int it_create_mode;
736 + struct lustre_intent_data lustre;
740 +static inline void intent_init(struct lookup_intent *it, int op)
742 + memset(it, 0, sizeof(*it));
743 + it->it_magic = INTENT_MAGIC;
748 struct dentry *dentry;
749 struct vfsmount *mnt;
756 - struct open_intent open;
758 + struct lookup_intent intent;
763 #define LOOKUP_CONTINUE 4
764 #define LOOKUP_PARENT 16
765 #define LOOKUP_NOALT 32
766 +#define LOOKUP_LAST (1<<6)
767 +#define LOOKUP_LINK_NOTLAST (1<<7)
773 #define LOOKUP_ACCESS (0x0400)
775 extern int FASTCALL(__user_walk(const char __user *, unsigned, struct nameidata *, const char **));
776 +extern int FASTCALL(__user_walk_it(const char __user *, unsigned, struct nameidata *, const char **));
777 +#define user_path_walk_it(name,nd) \
778 + __user_walk_it(name, LOOKUP_FOLLOW, nd, 0)
779 +#define user_path_walk_link_it(name,nd) \
780 + __user_walk_it(name, 0, nd, 0)
781 +extern void intent_release(struct lookup_intent *);
782 #define user_path_walk(name,nd) \
783 __user_walk(name, LOOKUP_FOLLOW, nd, 0)
784 #define user_path_walk_link(name,nd) \
787 extern struct dentry * lookup_one_len(const char *, struct dentry *, int);
788 extern struct dentry * lookup_hash(struct qstr *, struct dentry *);
790 extern int follow_down(struct vfsmount **, struct dentry **);
791 extern int follow_up(struct vfsmount **, struct dentry **);
793 Index: linux-2.6.5-12.1/include/linux/fshooks.h
794 ===================================================================
795 --- linux-2.6.5-12.1.orig/include/linux/fshooks.h 2004-05-10 12:21:56.000000000 -0400
796 +++ linux-2.6.5-12.1/include/linux/fshooks.h 2004-06-03 18:31:28.000000000 -0400
799 #define FSHOOK_BEGIN_USER_WALK(type, err, path, flags, nd, field, args...) \
800 FSHOOK_BEGIN_USER_WALK_COMMON(type, err, __user_walk(path, flags, &nd, &info.field), nd, args)
801 +#define FSHOOK_BEGIN_USER_WALK_IT(type, err, path, flags, nd, field, args...) \
802 + FSHOOK_BEGIN_USER_WALK_COMMON(type, err, __user_walk_it(path, flags, &nd, &info.field), nd, args)
804 #define FSHOOK_BEGIN_USER_PATH_WALK(type, err, path, nd, field, args...) \
805 FSHOOK_BEGIN_USER_WALK_COMMON(type, err, __user_walk(path, LOOKUP_FOLLOW, &nd, &info.field), nd, args)
806 +#define FSHOOK_BEGIN_USER_PATH_WALK_IT(type, err, path, nd, field, args...) \
807 + FSHOOK_BEGIN_USER_WALK_COMMON(type, err, __user_walk_it(path, LOOKUP_FOLLOW, &nd, &info.field), nd, args)
809 #define FSHOOK_BEGIN_USER_PATH_WALK_LINK(type, err, path, nd, field, args...) \
810 FSHOOK_BEGIN_USER_WALK_COMMON(type, err, __user_walk(path, 0, &nd, &info.field), nd, args)
811 +#define FSHOOK_BEGIN_USER_PATH_WALK_LINK_IT(type, err, path, nd, field, args...) \
812 + FSHOOK_BEGIN_USER_WALK_COMMON(type, err, __user_walk_it(path, 0, &nd, &info.field), nd, args)
814 #define FSHOOK_END_USER_WALK(type, err, field) \
815 (void)(&info != (struct fshook_##type##_info *)-1L); \
816 @@ -126,12 +132,18 @@
818 #define FSHOOK_BEGIN_USER_WALK(type, err, path, flags, nd, field, args...) \
819 if (!(err = __user_walk(path, flags, &nd, 0))) {
820 +#define FSHOOK_BEGIN_USER_WALK_IT(type, err, path, flags, nd, field, args...) \
821 + if (!(err = __user_walk_it(path, flags, &nd, 0))) {
823 #define FSHOOK_BEGIN_USER_PATH_WALK(type, err, path, nd, field, args...) \
824 if (!(err = user_path_walk(path, &nd))) {
825 +#define FSHOOK_BEGIN_USER_PATH_WALK_IT(type, err, path, nd, field, args...) \
826 + if (!(err = user_path_walk_it(path, &nd))) {
828 #define FSHOOK_BEGIN_USER_PATH_WALK_LINK(type, err, path, nd, field, args...) \
829 if (!(err = user_path_walk_link(path, &nd))) {
830 +#define FSHOOK_BEGIN_USER_PATH_WALK_LINK_IT(type, err, path, nd, field, args...) \
831 + if (!(err = user_path_walk_link_it(path, &nd))) {
833 #define FSHOOK_END_USER_WALK(type, err, field) ((void)0);}
835 Index: linux-2.6.5-12.1/kernel/exit.c
836 ===================================================================
837 --- linux-2.6.5-12.1.orig/kernel/exit.c 2004-05-10 12:21:56.000000000 -0400
838 +++ linux-2.6.5-12.1/kernel/exit.c 2004-06-03 18:31:28.000000000 -0400
840 write_unlock_irq(&tasklist_lock);
843 +EXPORT_SYMBOL(reparent_to_init);
845 void __set_special_pids(pid_t session, pid_t pgrp)
847 struct task_struct *curr = current;
852 +EXPORT_SYMBOL(exit_files);
854 static inline void __put_fs_struct(struct fs_struct *fs)
856 /* No need to hold fs->lock if we are killing it */