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|FMODE_EXEC;
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|FMODE_EXEC;
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;
105 + 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");
132 if (inode->i_op->follow_link) {
133 + int save_flags = nd->flags;
135 + nd->flags |= LOOKUP_LINK_NOTLAST;
136 err = do_follow_link(next.dentry, nd);
137 + if (!(save_flags & LOOKUP_LINK_NOTLAST))
138 + nd->flags &= ~LOOKUP_LINK_NOTLAST;
142 @@ -703,14 +749,34 @@
143 inode = nd->dentry->d_inode;
146 + nd->flags |= LOOKUP_LAST;
147 + err = revalidate_special(nd);
148 + nd->flags &= ~LOOKUP_LAST;
149 + if (!nd->dentry->d_inode)
155 + if (lookup_flags & LOOKUP_DIRECTORY) {
157 + if(!nd->dentry->d_inode->i_op ||
158 + !nd->dentry->d_inode->i_op->lookup) {
166 if (nd->dentry->d_op && nd->dentry->d_op->d_hash) {
167 err = nd->dentry->d_op->d_hash(nd->dentry, &this);
171 + nd->flags |= LOOKUP_LAST;
172 err = do_lookup(nd, &this, &next);
173 + nd->flags &= ~LOOKUP_LAST;
176 follow_mount(&next.mnt, &next.dentry);
181 -struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
182 +struct dentry * lookup_one_len_it(const char * name, struct dentry * base, int len, struct nameidata *nd)
186 @@ -956,11 +1012,16 @@
188 this.hash = end_name_hash(hash);
190 - return lookup_hash(&this, base);
191 + return __lookup_hash(&this, base, nd);
193 return ERR_PTR(-EACCES);
196 +struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
198 + return lookup_one_len_it(name, base, len, NULL);
205 * that namei follows links, while lnamei does not.
208 -int fastcall __user_walk(const char __user *name, unsigned flags, struct nameidata *nd, const char **pname)
209 +int fastcall __user_walk_it(const char __user *name, unsigned flags,
210 + struct nameidata *nd, const char **pname)
212 char *tmp = getname(name);
213 int err = PTR_ERR(tmp);
214 @@ -987,6 +1049,13 @@
218 +int fastcall __user_walk(const char __user *name, unsigned flags,
219 + struct nameidata *nd, const char **pname)
221 + intent_init(&nd->intent, IT_LOOKUP);
222 + return __user_walk_it(name, flags, nd, pname);
226 * It's inline, so penalty for filesystems that don't use sticky bit is
228 @@ -1259,8 +1328,8 @@
229 acc_mode |= MAY_APPEND;
231 /* Fill in the open() intent data */
232 - nd->intent.open.flags = flag;
233 - nd->intent.open.create_mode = mode;
234 + nd->intent.it_flags = flag;
235 + nd->intent.it_create_mode = mode;
238 * The simplest case - just a plain lookup.
239 @@ -1275,6 +1344,7 @@
241 * Create - we need to know the parent.
243 + nd->intent.it_op |= IT_CREAT;
244 error = path_lookup(pathname, LOOKUP_PARENT|LOOKUP_OPEN|LOOKUP_CREATE, nd);
247 @@ -1291,7 +1361,9 @@
249 nd->flags &= ~LOOKUP_PARENT;
250 down(&dir->d_inode->i_sem);
251 + nd->flags |= LOOKUP_LAST;
252 dentry = __lookup_hash(&nd->last, nd->dentry, nd);
253 + nd->flags &= ~LOOKUP_LAST;
256 error = PTR_ERR(dentry);
257 @@ -1396,7 +1468,9 @@
260 down(&dir->d_inode->i_sem);
261 + nd->flags |= LOOKUP_LAST;
262 dentry = __lookup_hash(&nd->last, nd->dentry, nd);
263 + nd->flags &= ~LOOKUP_LAST;
264 putname(nd->last.name);
267 @@ -2196,7 +2270,9 @@
268 __vfs_follow_link(struct nameidata *nd, const char *link)
271 + struct lookup_intent it = nd->intent;
277 @@ -2206,6 +2282,10 @@
278 /* weird __emul_prefix() stuff did it */
282 + intent_init(&nd->intent, it.it_op);
283 + nd->intent.it_flags = it.it_flags;
284 + nd->intent.it_create_mode = it.it_create_mode;
285 res = link_path_walk(link, nd);
287 if (current->link_count || res || nd->last_type!=LAST_NORM)
288 Index: linux-2.6.5-12.1/fs/namespace.c
289 ===================================================================
290 --- linux-2.6.5-12.1.orig/fs/namespace.c 2004-05-10 12:21:56.000000000 -0400
291 +++ linux-2.6.5-12.1/fs/namespace.c 2004-06-03 18:31:28.000000000 -0400
294 static void detach_mnt(struct vfsmount *mnt, struct nameidata *old_nd)
296 + memset(old_nd, 0, sizeof(*old_nd));
297 old_nd->dentry = mnt->mnt_mountpoint;
298 old_nd->mnt = mnt->mnt_parent;
299 mnt->mnt_parent = mnt;
302 if (!old_name || !*old_name)
305 + intent_init(&old_nd.intent, IT_LOOKUP);
306 err = path_lookup(old_name, LOOKUP_FOLLOW, &old_nd);
311 if (!old_name || !*old_name)
313 + intent_init(&old_nd.intent, IT_LOOKUP);
314 err = path_lookup(old_name, LOOKUP_FOLLOW, &old_nd);
321 + intent_init(&nd.intent, IT_LOOKUP);
323 if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
324 flags &= ~MS_MGC_MSK;
325 Index: linux-2.6.5-12.1/fs/open.c
326 ===================================================================
327 --- linux-2.6.5-12.1.orig/fs/open.c 2004-05-10 12:21:56.000000000 -0400
328 +++ linux-2.6.5-12.1/fs/open.c 2004-06-03 18:31:28.000000000 -0400
329 @@ -227,12 +227,12 @@
331 struct inode * inode;
334 + intent_init(&nd.intent, IT_GETATTR);
336 if (length < 0) /* sorry, but loff_t says... */
339 - FSHOOK_BEGIN_USER_PATH_WALK(truncate, error, path, nd, filename, .length = length)
340 + FSHOOK_BEGIN_USER_PATH_WALK_IT(truncate, error, path, nd, filename, .length = length)
342 inode = nd.dentry->d_inode;
345 int old_fsuid, old_fsgid;
346 kernel_cap_t old_cap;
348 + intent_init(&nd.intent, IT_GETATTR);
350 if (mode & ~S_IRWXO) /* where's F_OK, X_OK, W_OK, R_OK? */
354 current->cap_effective = current->cap_permitted;
356 - FSHOOK_BEGIN_USER_WALK(access,
357 + FSHOOK_BEGIN_USER_WALK_IT(access,
360 LOOKUP_FOLLOW|LOOKUP_ACCESS,
362 if(!res && (mode & S_IWOTH) && IS_RDONLY(nd.dentry->d_inode)
363 && !special_file(nd.dentry->d_inode->i_mode))
368 FSHOOK_END_USER_WALK(access, res, path)
369 @@ -545,11 +547,13 @@
371 asmlinkage long sys_fchdir(unsigned int fd)
373 + struct nameidata nd;
375 struct dentry *dentry;
377 struct vfsmount *mnt;
379 + intent_init(&nd.intent, IT_GETATTR);
381 FSHOOK_BEGIN(fchdir, error, .fd = fd)
387 + intent_init(&nd.intent, IT_GETATTR);
389 - FSHOOK_BEGIN_USER_WALK(chroot,
390 + FSHOOK_BEGIN_USER_WALK_IT(chroot,
393 LOOKUP_FOLLOW | LOOKUP_DIRECTORY | LOOKUP_NOALT,
396 if (IS_RDONLY(inode))
401 if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
404 * for the internal routines (ie open_namei()/follow_link() etc). 00 is
407 -struct file *filp_open(const char * filename, int flags, int mode)
409 - int namei_flags, error;
410 - struct nameidata nd;
412 - namei_flags = flags;
413 - if ((namei_flags+1) & O_ACCMODE)
415 - if (namei_flags & O_TRUNC)
418 - error = open_namei(filename, namei_flags, mode, &nd);
420 - return dentry_open(nd.dentry, nd.mnt, flags);
422 - return ERR_PTR(error);
425 -EXPORT_SYMBOL(filp_open);
427 -struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
428 +struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt, int flags,
429 + struct lookup_intent *it)
436 f->f_mode = (flags+1) & O_ACCMODE;
438 inode = dentry->d_inode;
439 if (f->f_mode & FMODE_WRITE) {
440 error = get_write_access(inode);
442 error = f->f_op->open(inode,f);
445 + intent_release(it);
447 f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);
453 + intent_release(it);
456 return ERR_PTR(error);
459 EXPORT_SYMBOL(dentry_open);
461 +struct file *filp_open(const char * filename, int flags, int mode)
463 + int namei_flags, error;
464 + struct file * temp_filp;
465 + struct nameidata nd;
466 + intent_init(&nd.intent, IT_OPEN);
468 + namei_flags = flags;
469 + if ((namei_flags+1) & O_ACCMODE)
471 + if (namei_flags & O_TRUNC)
474 + error = open_namei(filename, namei_flags, mode, &nd);
476 + temp_filp = dentry_open_it(nd.dentry, nd.mnt, flags, &nd.intent);
479 + return ERR_PTR(error);
483 +struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
485 + struct lookup_intent it;
486 + intent_init(&it, IT_LOOKUP);
488 + return dentry_open_it(dentry, mnt, flags, &it);
492 * Find an empty file descriptor entry, and mark it busy.
494 Index: linux-2.6.5-12.1/fs/stat.c
495 ===================================================================
496 --- linux-2.6.5-12.1.orig/fs/stat.c 2004-05-10 12:21:56.000000000 -0400
497 +++ linux-2.6.5-12.1/fs/stat.c 2004-06-03 18:31:28.000000000 -0400
500 EXPORT_SYMBOL(generic_fillattr);
502 -int vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
503 +int vfs_getattr_it(struct vfsmount *mnt, struct dentry *dentry, struct lookup_intent *it, struct kstat *stat)
505 struct inode *inode = dentry->d_inode;
511 + if (inode->i_op->getattr_it)
512 + return inode->i_op->getattr_it(mnt, dentry, it, stat);
513 if (inode->i_op->getattr)
514 return inode->i_op->getattr(mnt, dentry, stat);
518 EXPORT_SYMBOL(vfs_getattr);
520 +int vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
522 + return vfs_getattr_it(mnt, dentry, NULL, stat);
525 int vfs_stat(char __user *name, struct kstat *stat)
529 + intent_init(&nd.intent, IT_GETATTR);
531 - FSHOOK_BEGIN_USER_PATH_WALK(stat, error, name, nd, path, .link = false)
532 + FSHOOK_BEGIN_USER_PATH_WALK_IT(stat, error, name, nd, path, .link = false)
534 - error = vfs_getattr(nd.mnt, nd.dentry, stat);
535 + error = vfs_getattr_it(nd.mnt, nd.dentry, &nd.intent, stat);
538 FSHOOK_END_USER_WALK(stat, error, path)
543 + intent_init(&nd.intent, IT_GETATTR);
545 - FSHOOK_BEGIN_USER_PATH_WALK_LINK(stat, error, name, nd, path, .link = true)
546 + FSHOOK_BEGIN_USER_PATH_WALK_LINK_IT(stat, error, name, nd, path, .link = true)
548 - error = vfs_getattr(nd.mnt, nd.dentry, stat);
549 + error = vfs_getattr_it(nd.mnt, nd.dentry, &nd.intent, stat);
552 FSHOOK_END_USER_WALK(stat, error, path)
554 int vfs_fstat(unsigned int fd, struct kstat *stat)
557 + struct nameidata nd;
558 + intent_init(&nd.intent, IT_GETATTR);
560 FSHOOK_BEGIN(fstat, error, .fd = fd)
566 - error = vfs_getattr(f->f_vfsmnt, f->f_dentry, stat);
567 + error = vfs_getattr_it(f->f_vfsmnt, f->f_dentry, &nd.intent, stat);
568 + intent_release(&nd.intent);
572 Index: linux-2.6.5-12.1/fs/inode.c
573 ===================================================================
574 --- linux-2.6.5-12.1.orig/fs/inode.c 2004-05-10 12:21:56.000000000 -0400
575 +++ linux-2.6.5-12.1/fs/inode.c 2004-06-03 18:31:28.000000000 -0400
577 inodes_stat.nr_unused--;
580 +EXPORT_SYMBOL(__iget);
582 * clear_inode - clear an inode
583 * @inode: inode to clear
584 Index: linux-2.6.5-12.1/fs/super.c
585 ===================================================================
586 --- linux-2.6.5-12.1.orig/fs/super.c 2004-05-10 12:21:56.000000000 -0400
587 +++ linux-2.6.5-12.1/fs/super.c 2004-06-03 18:31:28.000000000 -0400
589 return (struct vfsmount *)sb;
592 +EXPORT_SYMBOL(do_kern_mount);
594 struct vfsmount *kern_mount(struct file_system_type *type)
596 return do_kern_mount(type->name, 0, type->name, NULL);
597 Index: linux-2.6.5-12.1/fs/block_dev.c
598 ===================================================================
599 --- linux-2.6.5-12.1.orig/fs/block_dev.c 2004-05-10 12:21:55.000000000 -0400
600 +++ linux-2.6.5-12.1/fs/block_dev.c 2004-06-03 18:31:28.000000000 -0400
603 return ERR_PTR(-EINVAL);
605 + intent_init(&nd.intent, IT_LOOKUP);
606 error = path_lookup(path, LOOKUP_FOLLOW, &nd);
608 return ERR_PTR(error);
609 Index: linux-2.6.5-12.1/include/linux/dcache.h
610 ===================================================================
611 --- linux-2.6.5-12.1.orig/include/linux/dcache.h 2004-04-03 22:38:24.000000000 -0500
612 +++ linux-2.6.5-12.1/include/linux/dcache.h 2004-06-03 18:31:28.000000000 -0400
616 #include <asm/atomic.h>
617 +#include <linux/string.h>
618 #include <linux/list.h>
619 #include <linux/spinlock.h>
620 #include <linux/cache.h>
625 +#include <linux/namei.h>
627 struct dentry_stat_t {
630 Index: linux-2.6.5-12.1/include/linux/fs.h
631 ===================================================================
632 --- linux-2.6.5-12.1.orig/include/linux/fs.h 2004-05-10 12:21:56.000000000 -0400
633 +++ linux-2.6.5-12.1/include/linux/fs.h 2004-06-03 18:31:28.000000000 -0400
637 #define FMODE_WRITE 2
638 +#define FMODE_EXEC 4
643 #define ATTR_ATTR_FLAG 1024
644 #define ATTR_KILL_SUID 2048
645 #define ATTR_KILL_SGID 4096
646 +#define ATTR_RAW 8192 /* file system, not vfs will massage attrs */
647 +#define ATTR_FROM_OPEN 16384 /* called from open path, ie O_TRUNC */
650 * This is the Inode Attributes structure, used for notify_change(). It
652 struct block_device *i_bdev;
655 + void *i_filterdata;
657 unsigned long i_dnotify_mask; /* Directory notify events */
658 struct dnotify_struct *i_dnotify; /* for directory notifications */
660 spinlock_t f_ep_lock;
661 #endif /* #ifdef CONFIG_EPOLL */
662 struct address_space *f_mapping;
663 + struct lookup_intent *f_it;
665 extern spinlock_t files_lock;
666 #define file_list_lock() spin_lock(&files_lock);
668 void (*truncate) (struct inode *);
669 int (*permission) (struct inode *, int, struct nameidata *);
670 int (*setattr) (struct dentry *, struct iattr *);
671 + int (*setattr_raw) (struct inode *, struct iattr *);
672 int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *);
673 + int (*getattr_it) (struct vfsmount *, struct dentry *, struct lookup_intent *, struct kstat *);
674 int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);
675 ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
676 ssize_t (*listxattr) (struct dentry *, char *, size_t);
677 @@ -1114,6 +1120,7 @@
678 extern int unregister_filesystem(struct file_system_type *);
679 extern struct vfsmount *kern_mount(struct file_system_type *);
680 extern int may_umount(struct vfsmount *);
681 +struct vfsmount *do_kern_mount(const char *type, int flags, const char *name, void *data);
682 extern long do_mount(char *, char *, char *, unsigned long, void *);
684 extern int vfs_statfs(struct super_block *, struct kstatfs *);
685 @@ -1178,6 +1185,7 @@
686 extern int do_truncate(struct dentry *, loff_t start);
687 extern struct file *filp_open(const char *, int, int);
688 extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
689 +extern struct file * dentry_open_it(struct dentry *, struct vfsmount *, int, struct lookup_intent *);
690 extern int filp_close(struct file *, fl_owner_t id);
691 extern char * getname(const char __user *);
693 Index: linux-2.6.5-12.1/include/linux/namei.h
694 ===================================================================
695 --- linux-2.6.5-12.1.orig/include/linux/namei.h 2004-05-10 12:21:56.000000000 -0400
696 +++ linux-2.6.5-12.1/include/linux/namei.h 2004-06-03 18:31:28.000000000 -0400
698 #define _LINUX_NAMEI_H
700 #include <linux/linkage.h>
701 +#include <linux/string.h>
706 -struct open_intent {
709 +/* intent opcodes */
711 +#define IT_CREAT (1<<1)
712 +#define IT_READDIR (1<<2)
713 +#define IT_GETATTR (1<<3)
714 +#define IT_LOOKUP (1<<4)
715 +#define IT_UNLINK (1<<5)
716 +#define IT_TRUNC (1<<6)
717 +#define IT_GETXATTR (1<<7)
719 +struct lustre_intent_data {
720 + int it_disposition;
722 + __u64 it_lock_handle;
727 +#define INTENT_MAGIC 0x19620323
728 +struct lookup_intent {
730 + void (*it_op_release)(struct lookup_intent *);
733 + int it_create_mode;
735 + struct lustre_intent_data lustre;
739 +static inline void intent_init(struct lookup_intent *it, int op)
741 + memset(it, 0, sizeof(*it));
742 + it->it_magic = INTENT_MAGIC;
747 struct dentry *dentry;
748 struct vfsmount *mnt;
755 - struct open_intent open;
757 + struct lookup_intent intent;
762 #define LOOKUP_CONTINUE 4
763 #define LOOKUP_PARENT 16
764 #define LOOKUP_NOALT 32
765 +#define LOOKUP_LAST (1<<6)
766 +#define LOOKUP_LINK_NOTLAST (1<<7)
772 #define LOOKUP_ACCESS (0x0400)
774 extern int FASTCALL(__user_walk(const char __user *, unsigned, struct nameidata *, const char **));
775 +extern int FASTCALL(__user_walk_it(const char __user *, unsigned, struct nameidata *, const char **));
776 +#define user_path_walk_it(name,nd) \
777 + __user_walk_it(name, LOOKUP_FOLLOW, nd, 0)
778 +#define user_path_walk_link_it(name,nd) \
779 + __user_walk_it(name, 0, nd, 0)
780 +extern void intent_release(struct lookup_intent *);
781 #define user_path_walk(name,nd) \
782 __user_walk(name, LOOKUP_FOLLOW, nd, 0)
783 #define user_path_walk_link(name,nd) \
786 extern struct dentry * lookup_one_len(const char *, struct dentry *, int);
787 extern struct dentry * lookup_hash(struct qstr *, struct dentry *);
789 extern int follow_down(struct vfsmount **, struct dentry **);
790 extern int follow_up(struct vfsmount **, struct dentry **);
792 Index: linux-2.6.5-12.1/include/linux/fshooks.h
793 ===================================================================
794 --- linux-2.6.5-12.1.orig/include/linux/fshooks.h 2004-05-10 12:21:56.000000000 -0400
795 +++ linux-2.6.5-12.1/include/linux/fshooks.h 2004-06-03 18:31:28.000000000 -0400
798 #define FSHOOK_BEGIN_USER_WALK(type, err, path, flags, nd, field, args...) \
799 FSHOOK_BEGIN_USER_WALK_COMMON(type, err, __user_walk(path, flags, &nd, &info.field), nd, args)
800 +#define FSHOOK_BEGIN_USER_WALK_IT(type, err, path, flags, nd, field, args...) \
801 + FSHOOK_BEGIN_USER_WALK_COMMON(type, err, __user_walk_it(path, flags, &nd, &info.field), nd, args)
803 #define FSHOOK_BEGIN_USER_PATH_WALK(type, err, path, nd, field, args...) \
804 FSHOOK_BEGIN_USER_WALK_COMMON(type, err, __user_walk(path, LOOKUP_FOLLOW, &nd, &info.field), nd, args)
805 +#define FSHOOK_BEGIN_USER_PATH_WALK_IT(type, err, path, nd, field, args...) \
806 + FSHOOK_BEGIN_USER_WALK_COMMON(type, err, __user_walk_it(path, LOOKUP_FOLLOW, &nd, &info.field), nd, args)
808 #define FSHOOK_BEGIN_USER_PATH_WALK_LINK(type, err, path, nd, field, args...) \
809 FSHOOK_BEGIN_USER_WALK_COMMON(type, err, __user_walk(path, 0, &nd, &info.field), nd, args)
810 +#define FSHOOK_BEGIN_USER_PATH_WALK_LINK_IT(type, err, path, nd, field, args...) \
811 + FSHOOK_BEGIN_USER_WALK_COMMON(type, err, __user_walk_it(path, 0, &nd, &info.field), nd, args)
813 #define FSHOOK_END_USER_WALK(type, err, field) \
814 (void)(&info != (struct fshook_##type##_info *)-1L); \
815 @@ -126,12 +132,18 @@
817 #define FSHOOK_BEGIN_USER_WALK(type, err, path, flags, nd, field, args...) \
818 if (!(err = __user_walk(path, flags, &nd, 0))) {
819 +#define FSHOOK_BEGIN_USER_WALK_IT(type, err, path, flags, nd, field, args...) \
820 + if (!(err = __user_walk_it(path, flags, &nd, 0))) {
822 #define FSHOOK_BEGIN_USER_PATH_WALK(type, err, path, nd, field, args...) \
823 if (!(err = user_path_walk(path, &nd))) {
824 +#define FSHOOK_BEGIN_USER_PATH_WALK_IT(type, err, path, nd, field, args...) \
825 + if (!(err = user_path_walk_it(path, &nd))) {
827 #define FSHOOK_BEGIN_USER_PATH_WALK_LINK(type, err, path, nd, field, args...) \
828 if (!(err = user_path_walk_link(path, &nd))) {
829 +#define FSHOOK_BEGIN_USER_PATH_WALK_LINK_IT(type, err, path, nd, field, args...) \
830 + if (!(err = user_path_walk_link_it(path, &nd))) {
832 #define FSHOOK_END_USER_WALK(type, err, field) ((void)0);}