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 19:21:56.000000000 +0300
4 +++ linux-2.6.5-12.1/fs/exec.c 2004-05-25 17:32:14.038494200 +0300
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 19:21:56.000000000 +0300
51 +++ linux-2.6.5-12.1/fs/namei.c 2004-05-25 17:32:14.040493896 +0300
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,29 @@
140 inode = nd->dentry->d_inode;
143 + nd->flags |= LOOKUP_LAST;
144 + err = revalidate_special(nd);
145 + nd->flags &= ~LOOKUP_LAST;
152 + if (!nd->dentry->d_inode)
158 if (nd->dentry->d_op && nd->dentry->d_op->d_hash) {
159 err = nd->dentry->d_op->d_hash(nd->dentry, &this);
163 + nd->flags |= LOOKUP_LAST;
164 err = do_lookup(nd, &this, &next);
165 + nd->flags &= ~LOOKUP_LAST;
168 follow_mount(&next.mnt, &next.dentry);
173 -struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
174 +struct dentry * lookup_one_len_it(const char * name, struct dentry * base, int len, struct nameidata *nd)
178 @@ -956,11 +1017,16 @@
180 this.hash = end_name_hash(hash);
182 - return lookup_hash(&this, base);
183 + return __lookup_hash(&this, base, nd);
185 return ERR_PTR(-EACCES);
188 +struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
190 + return lookup_one_len_it(name, base, len, NULL);
197 * that namei follows links, while lnamei does not.
200 -int fastcall __user_walk(const char __user *name, unsigned flags, struct nameidata *nd, const char **pname)
201 +int fastcall __user_walk_it(const char __user *name, unsigned flags,
202 + struct nameidata *nd, const char **pname)
204 char *tmp = getname(name);
205 int err = PTR_ERR(tmp);
206 @@ -987,6 +1054,13 @@
210 +int __user_walk(const char __user *name, unsigned flags,
211 + struct nameidata *nd, const char **pname)
213 + intent_init(&nd->intent, IT_LOOKUP);
214 + return __user_walk_it(name, flags, nd, pname);
218 * It's inline, so penalty for filesystems that don't use sticky bit is
220 @@ -1259,8 +1333,8 @@
221 acc_mode |= MAY_APPEND;
223 /* Fill in the open() intent data */
224 - nd->intent.open.flags = flag;
225 - nd->intent.open.create_mode = mode;
226 + nd->intent.it_flags = flag;
227 + nd->intent.it_create_mode = mode;
230 * The simplest case - just a plain lookup.
231 @@ -1275,6 +1349,7 @@
233 * Create - we need to know the parent.
235 + nd->intent.it_op |= IT_CREAT;
236 error = path_lookup(pathname, LOOKUP_PARENT|LOOKUP_OPEN|LOOKUP_CREATE, nd);
239 @@ -1291,7 +1366,9 @@
241 nd->flags &= ~LOOKUP_PARENT;
242 down(&dir->d_inode->i_sem);
243 + nd->flags |= LOOKUP_LAST;
244 dentry = __lookup_hash(&nd->last, nd->dentry, nd);
245 + nd->flags &= ~LOOKUP_LAST;
248 error = PTR_ERR(dentry);
249 @@ -1396,7 +1473,9 @@
252 down(&dir->d_inode->i_sem);
253 + nd->flags |= LOOKUP_LAST;
254 dentry = __lookup_hash(&nd->last, nd->dentry, nd);
255 + nd->flags &= ~LOOKUP_LAST;
256 putname(nd->last.name);
259 @@ -2196,7 +2275,9 @@
260 __vfs_follow_link(struct nameidata *nd, const char *link)
263 + struct lookup_intent it = nd->intent;
269 @@ -2206,6 +2287,10 @@
270 /* weird __emul_prefix() stuff did it */
274 + intent_init(&nd->intent, it.it_op);
275 + nd->intent.it_flags = it.it_flags;
276 + nd->intent.it_create_mode = it.it_create_mode;
277 res = link_path_walk(link, nd);
279 if (current->link_count || res || nd->last_type!=LAST_NORM)
280 Index: linux-2.6.5-12.1/fs/namespace.c
281 ===================================================================
282 --- linux-2.6.5-12.1.orig/fs/namespace.c 2004-05-10 19:21:56.000000000 +0300
283 +++ linux-2.6.5-12.1/fs/namespace.c 2004-05-25 17:33:44.385759328 +0300
286 static void detach_mnt(struct vfsmount *mnt, struct nameidata *old_nd)
288 + memset(old_nd, 0, sizeof(*old_nd));
289 old_nd->dentry = mnt->mnt_mountpoint;
290 old_nd->mnt = mnt->mnt_parent;
291 mnt->mnt_parent = mnt;
294 if (!old_name || !*old_name)
297 + intent_init(&old_nd.intent, IT_LOOKUP);
298 err = path_lookup(old_name, LOOKUP_FOLLOW, &old_nd);
303 if (!old_name || !*old_name)
305 + intent_init(&old_nd.intent, IT_LOOKUP);
306 err = path_lookup(old_name, LOOKUP_FOLLOW, &old_nd);
313 + intent_init(&nd.intent, IT_LOOKUP);
315 if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
316 flags &= ~MS_MGC_MSK;
317 Index: linux-2.6.5-12.1/fs/open.c
318 ===================================================================
319 --- linux-2.6.5-12.1.orig/fs/open.c 2004-05-10 19:21:56.000000000 +0300
320 +++ linux-2.6.5-12.1/fs/open.c 2004-05-25 17:32:14.042493592 +0300
321 @@ -227,12 +227,12 @@
323 struct inode * inode;
326 + intent_init(&nd.intent, IT_GETATTR);
328 if (length < 0) /* sorry, but loff_t says... */
331 - FSHOOK_BEGIN_USER_PATH_WALK(truncate, error, path, nd, filename, .length = length)
332 + FSHOOK_BEGIN_USER_PATH_WALK_IT(truncate, error, path, nd, filename, .length = length)
334 inode = nd.dentry->d_inode;
337 int old_fsuid, old_fsgid;
338 kernel_cap_t old_cap;
340 + intent_init(&nd.intent, IT_GETATTR);
342 if (mode & ~S_IRWXO) /* where's F_OK, X_OK, W_OK, R_OK? */
346 current->cap_effective = current->cap_permitted;
348 - FSHOOK_BEGIN_USER_WALK(access,
349 + FSHOOK_BEGIN_USER_WALK_IT(access,
352 LOOKUP_FOLLOW|LOOKUP_ACCESS,
354 if(!res && (mode & S_IWOTH) && IS_RDONLY(nd.dentry->d_inode)
355 && !special_file(nd.dentry->d_inode->i_mode))
360 FSHOOK_END_USER_WALK(access, res, path)
361 @@ -545,11 +547,13 @@
363 asmlinkage long sys_fchdir(unsigned int fd)
365 + struct nameidata nd;
367 struct dentry *dentry;
369 struct vfsmount *mnt;
371 + intent_init(&nd.intent, IT_GETATTR);
373 FSHOOK_BEGIN(fchdir, error, .fd = fd)
379 + intent_init(&nd.intent, IT_GETATTR);
381 - FSHOOK_BEGIN_USER_WALK(chroot,
382 + FSHOOK_BEGIN_USER_WALK_IT(chroot,
385 LOOKUP_FOLLOW | LOOKUP_DIRECTORY | LOOKUP_NOALT,
388 if (IS_RDONLY(inode))
393 if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
396 * for the internal routines (ie open_namei()/follow_link() etc). 00 is
399 -struct file *filp_open(const char * filename, int flags, int mode)
401 - int namei_flags, error;
402 - struct nameidata nd;
404 - namei_flags = flags;
405 - if ((namei_flags+1) & O_ACCMODE)
407 - if (namei_flags & O_TRUNC)
410 - error = open_namei(filename, namei_flags, mode, &nd);
412 - return dentry_open(nd.dentry, nd.mnt, flags);
414 - return ERR_PTR(error);
417 -EXPORT_SYMBOL(filp_open);
419 -struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
420 +struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt, int flags,
421 + struct lookup_intent *it)
428 f->f_mode = (flags+1) & O_ACCMODE;
430 inode = dentry->d_inode;
431 if (f->f_mode & FMODE_WRITE) {
432 error = get_write_access(inode);
434 error = f->f_op->open(inode,f);
437 + intent_release(it);
439 f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);
445 + intent_release(it);
448 return ERR_PTR(error);
451 EXPORT_SYMBOL(dentry_open);
453 +struct file *filp_open(const char * filename, int flags, int mode)
455 + int namei_flags, error;
456 + struct file * temp_filp;
457 + struct nameidata nd;
458 + intent_init(&nd.intent, IT_OPEN);
460 + namei_flags = flags;
461 + if ((namei_flags+1) & O_ACCMODE)
463 + if (namei_flags & O_TRUNC)
466 + error = open_namei(filename, namei_flags, mode, &nd);
468 + temp_filp = dentry_open_it(nd.dentry, nd.mnt, flags, &nd.intent);
471 + return ERR_PTR(error);
475 +struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
477 + struct lookup_intent it;
478 + intent_init(&it, IT_LOOKUP);
480 + return dentry_open_it(dentry, mnt, flags, &it);
484 * Find an empty file descriptor entry, and mark it busy.
486 Index: linux-2.6.5-12.1/fs/stat.c
487 ===================================================================
488 --- linux-2.6.5-12.1.orig/fs/stat.c 2004-05-10 19:21:56.000000000 +0300
489 +++ linux-2.6.5-12.1/fs/stat.c 2004-05-25 17:32:14.042493592 +0300
492 EXPORT_SYMBOL(generic_fillattr);
494 -int vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
495 +int vfs_getattr_it(struct vfsmount *mnt, struct dentry *dentry, struct lookup_intent *it, struct kstat *stat)
497 struct inode *inode = dentry->d_inode;
503 + if (inode->i_op->getattr_it)
504 + return inode->i_op->getattr_it(mnt, dentry, it, stat);
505 if (inode->i_op->getattr)
506 return inode->i_op->getattr(mnt, dentry, stat);
510 EXPORT_SYMBOL(vfs_getattr);
512 +int vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
514 + return vfs_getattr_it(mnt, dentry, NULL, stat);
517 int vfs_stat(char __user *name, struct kstat *stat)
521 + intent_init(&nd.intent, IT_GETATTR);
523 - FSHOOK_BEGIN_USER_PATH_WALK(stat, error, name, nd, path, .link = false)
524 + FSHOOK_BEGIN_USER_PATH_WALK_IT(stat, error, name, nd, path, .link = false)
526 - error = vfs_getattr(nd.mnt, nd.dentry, stat);
527 + error = vfs_getattr_it(nd.mnt, nd.dentry, &nd.intent, stat);
530 FSHOOK_END_USER_WALK(stat, error, path)
535 + intent_init(&nd.intent, IT_GETATTR);
537 - FSHOOK_BEGIN_USER_PATH_WALK_LINK(stat, error, name, nd, path, .link = true)
538 + FSHOOK_BEGIN_USER_PATH_WALK_LINK_IT(stat, error, name, nd, path, .link = true)
540 - error = vfs_getattr(nd.mnt, nd.dentry, stat);
541 + error = vfs_getattr_it(nd.mnt, nd.dentry, &nd.intent, stat);
544 FSHOOK_END_USER_WALK(stat, error, path)
546 int vfs_fstat(unsigned int fd, struct kstat *stat)
549 + struct nameidata nd;
550 + intent_init(&nd.intent, IT_GETATTR);
552 FSHOOK_BEGIN(fstat, error, .fd = fd)
558 - error = vfs_getattr(f->f_vfsmnt, f->f_dentry, stat);
559 + error = vfs_getattr_it(f->f_vfsmnt, f->f_dentry, &nd.intent, stat);
560 + intent_release(&nd.intent);
564 Index: linux-2.6.5-12.1/fs/nfs/dir.c
565 ===================================================================
566 --- linux-2.6.5-12.1.orig/fs/nfs/dir.c 2004-05-10 19:21:53.000000000 +0300
567 +++ linux-2.6.5-12.1/fs/nfs/dir.c 2004-05-25 17:32:14.043493440 +0300
570 if (!nd || (nd->flags & LOOKUP_CONTINUE) || !(nd->flags & LOOKUP_CREATE))
572 - return (nd->intent.open.flags & O_EXCL) != 0;
573 + return (nd->intent.it_flags & O_EXCL) != 0;
576 static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
577 @@ -1026,7 +1026,7 @@
578 attr.ia_valid = ATTR_MODE;
580 if (nd && (nd->flags & LOOKUP_CREATE))
581 - open_flags = nd->intent.open.flags;
582 + open_flags = nd->intent.it_flags;
585 * The 0 argument passed into the create function should one day
586 Index: linux-2.6.5-12.1/fs/inode.c
587 ===================================================================
588 --- linux-2.6.5-12.1.orig/fs/inode.c 2004-05-10 19:21:56.000000000 +0300
589 +++ linux-2.6.5-12.1/fs/inode.c 2004-05-25 17:32:14.044493288 +0300
591 inodes_stat.nr_unused--;
594 +EXPORT_SYMBOL(__iget);
596 * clear_inode - clear an inode
597 * @inode: inode to clear
598 Index: linux-2.6.5-12.1/fs/super.c
599 ===================================================================
600 --- linux-2.6.5-12.1.orig/fs/super.c 2004-05-10 19:21:56.000000000 +0300
601 +++ linux-2.6.5-12.1/fs/super.c 2004-05-25 17:32:14.045493136 +0300
603 return (struct vfsmount *)sb;
606 +EXPORT_SYMBOL(do_kern_mount);
608 struct vfsmount *kern_mount(struct file_system_type *type)
610 return do_kern_mount(type->name, 0, type->name, NULL);
611 Index: linux-2.6.5-12.1/include/linux/dcache.h
612 ===================================================================
613 --- linux-2.6.5-12.1.orig/include/linux/dcache.h 2004-04-04 06:38:24.000000000 +0300
614 +++ linux-2.6.5-12.1/include/linux/dcache.h 2004-05-25 17:32:14.045493136 +0300
618 #include <asm/atomic.h>
619 +#include <linux/string.h>
620 #include <linux/list.h>
621 #include <linux/spinlock.h>
622 #include <linux/cache.h>
627 +#include <linux/namei.h>
629 struct dentry_stat_t {
632 Index: linux-2.6.5-12.1/include/linux/fs.h
633 ===================================================================
634 --- linux-2.6.5-12.1.orig/include/linux/fs.h 2004-05-10 19:21:56.000000000 +0300
635 +++ linux-2.6.5-12.1/include/linux/fs.h 2004-05-25 17:32:14.046492984 +0300
637 #define ATTR_ATTR_FLAG 1024
638 #define ATTR_KILL_SUID 2048
639 #define ATTR_KILL_SGID 4096
640 +#define ATTR_RAW 8192 /* file system, not vfs will massage attrs */
641 +#define ATTR_FROM_OPEN 16384 /* called from open path, ie O_TRUNC */
644 * This is the Inode Attributes structure, used for notify_change(). It
646 struct block_device *i_bdev;
649 + void *i_filterdata;
651 unsigned long i_dnotify_mask; /* Directory notify events */
652 struct dnotify_struct *i_dnotify; /* for directory notifications */
654 spinlock_t f_ep_lock;
655 #endif /* #ifdef CONFIG_EPOLL */
656 struct address_space *f_mapping;
657 + struct lookup_intent *f_it;
659 extern spinlock_t files_lock;
660 #define file_list_lock() spin_lock(&files_lock);
662 void (*truncate) (struct inode *);
663 int (*permission) (struct inode *, int, struct nameidata *);
664 int (*setattr) (struct dentry *, struct iattr *);
665 + int (*setattr_raw) (struct inode *, struct iattr *);
666 int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *);
667 + int (*getattr_it) (struct vfsmount *, struct dentry *, struct lookup_intent *, struct kstat *);
668 int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);
669 ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
670 ssize_t (*listxattr) (struct dentry *, char *, size_t);
671 @@ -1114,6 +1120,7 @@
672 extern int unregister_filesystem(struct file_system_type *);
673 extern struct vfsmount *kern_mount(struct file_system_type *);
674 extern int may_umount(struct vfsmount *);
675 +struct vfsmount *do_kern_mount(const char *type, int flags, const char *name, void *data);
676 extern long do_mount(char *, char *, char *, unsigned long, void *);
678 extern int vfs_statfs(struct super_block *, struct kstatfs *);
679 @@ -1178,6 +1185,7 @@
680 extern int do_truncate(struct dentry *, loff_t start);
681 extern struct file *filp_open(const char *, int, int);
682 extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
683 +extern struct file * dentry_open_it(struct dentry *, struct vfsmount *, int, struct lookup_intent *);
684 extern int filp_close(struct file *, fl_owner_t id);
685 extern char * getname(const char __user *);
687 Index: linux-2.6.5-12.1/include/linux/namei.h
688 ===================================================================
689 --- linux-2.6.5-12.1.orig/include/linux/namei.h 2004-05-10 19:21:56.000000000 +0300
690 +++ linux-2.6.5-12.1/include/linux/namei.h 2004-05-25 17:32:14.047492832 +0300
692 #define _LINUX_NAMEI_H
694 #include <linux/linkage.h>
695 +#include <linux/string.h>
700 -struct open_intent {
703 +/* intent opcodes */
705 +#define IT_CREAT (1<<1)
706 +#define IT_READDIR (1<<2)
707 +#define IT_GETATTR (1<<3)
708 +#define IT_LOOKUP (1<<4)
709 +#define IT_UNLINK (1<<5)
710 +#define IT_TRUNC (1<<6)
711 +#define IT_GETXATTR (1<<7)
713 +struct lustre_intent_data {
714 + int it_disposition;
716 + __u64 it_lock_handle;
721 +#define INTENT_MAGIC 0x19620323
722 +struct lookup_intent {
724 + void (*it_op_release)(struct lookup_intent *);
727 + int it_create_mode;
729 + struct lustre_intent_data lustre;
733 +static inline void intent_init(struct lookup_intent *it, int op)
735 + memset(it, 0, sizeof(*it));
736 + it->it_magic = INTENT_MAGIC;
741 struct dentry *dentry;
742 struct vfsmount *mnt;
749 - struct open_intent open;
751 + struct lookup_intent intent;
756 #define LOOKUP_CONTINUE 4
757 #define LOOKUP_PARENT 16
758 #define LOOKUP_NOALT 32
759 +#define LOOKUP_LAST (1<<6)
760 +#define LOOKUP_LINK_NOTLAST (1<<7)
766 #define LOOKUP_ACCESS (0x0400)
768 extern int FASTCALL(__user_walk(const char __user *, unsigned, struct nameidata *, const char **));
769 +extern int FASTCALL(__user_walk_it(const char __user *, unsigned, struct nameidata *, const char **));
770 +#define user_path_walk_it(name,nd) \
771 + __user_walk_it(name, LOOKUP_FOLLOW, nd, 0)
772 +#define user_path_walk_link_it(name,nd) \
773 + __user_walk_it(name, 0, nd, 0)
774 +extern void intent_release(struct lookup_intent *);
775 #define user_path_walk(name,nd) \
776 __user_walk(name, LOOKUP_FOLLOW, nd, 0)
777 #define user_path_walk_link(name,nd) \
780 extern struct dentry * lookup_one_len(const char *, struct dentry *, int);
781 extern struct dentry * lookup_hash(struct qstr *, struct dentry *);
783 extern int follow_down(struct vfsmount **, struct dentry **);
784 extern int follow_up(struct vfsmount **, struct dentry **);
786 Index: linux-2.6.5-12.1/kernel/exit.c
787 ===================================================================
788 --- linux-2.6.5-12.1.orig/kernel/exit.c 2004-05-10 19:21:56.000000000 +0300
789 +++ linux-2.6.5-12.1/kernel/exit.c 2004-05-25 17:32:14.047492832 +0300
791 write_unlock_irq(&tasklist_lock);
794 +EXPORT_SYMBOL(reparent_to_init);
796 void __set_special_pids(pid_t session, pid_t pgrp)
798 struct task_struct *curr = current;
803 +EXPORT_SYMBOL(exit_files);
805 static inline void __put_fs_struct(struct fs_struct *fs)
807 /* No need to hold fs->lock if we are killing it */
808 Index: linux-2.6.5-12.1/include/linux/fshooks.h
809 ===================================================================
810 --- linux-2.6.5-12.1.orig/include/linux/fshooks.h 2004-05-10 19:21:56.000000000 +0300
811 +++ linux-2.6.5-12.1/include/linux/fshooks.h 2004-05-25 17:32:14.048492680 +0300
814 #define FSHOOK_BEGIN_USER_WALK(type, err, path, flags, nd, field, args...) \
815 FSHOOK_BEGIN_USER_WALK_COMMON(type, err, __user_walk(path, flags, &nd, &info.field), nd, args)
816 +#define FSHOOK_BEGIN_USER_WALK_IT(type, err, path, flags, nd, field, args...) \
817 + FSHOOK_BEGIN_USER_WALK_COMMON(type, err, __user_walk_it(path, flags, &nd, &info.field), nd, args)
819 #define FSHOOK_BEGIN_USER_PATH_WALK(type, err, path, nd, field, args...) \
820 FSHOOK_BEGIN_USER_WALK_COMMON(type, err, __user_walk(path, LOOKUP_FOLLOW, &nd, &info.field), nd, args)
821 +#define FSHOOK_BEGIN_USER_PATH_WALK_IT(type, err, path, nd, field, args...) \
822 + FSHOOK_BEGIN_USER_WALK_COMMON(type, err, __user_walk_it(path, LOOKUP_FOLLOW, &nd, &info.field), nd, args)
824 #define FSHOOK_BEGIN_USER_PATH_WALK_LINK(type, err, path, nd, field, args...) \
825 FSHOOK_BEGIN_USER_WALK_COMMON(type, err, __user_walk(path, 0, &nd, &info.field), nd, args)
826 +#define FSHOOK_BEGIN_USER_PATH_WALK_LINK_IT(type, err, path, nd, field, args...) \
827 + FSHOOK_BEGIN_USER_WALK_COMMON(type, err, __user_walk_it(path, 0, &nd, &info.field), nd, args)
829 #define FSHOOK_END_USER_WALK(type, err, field) \
830 (void)(&info != (struct fshook_##type##_info *)-1L); \
831 @@ -126,12 +132,18 @@
833 #define FSHOOK_BEGIN_USER_WALK(type, err, path, flags, nd, field, args...) \
834 if (!(err = __user_walk(path, flags, &nd, 0))) {
835 +#define FSHOOK_BEGIN_USER_WALK_IT(type, err, path, flags, nd, field, args...) \
836 + if (!(err = __user_walk_it(path, flags, &nd, 0))) {
838 #define FSHOOK_BEGIN_USER_PATH_WALK(type, err, path, nd, field, args...) \
839 if (!(err = user_path_walk(path, &nd))) {
840 +#define FSHOOK_BEGIN_USER_PATH_WALK_IT(type, err, path, nd, field, args...) \
841 + if (!(err = user_path_walk_it(path, &nd))) {
843 #define FSHOOK_BEGIN_USER_PATH_WALK_LINK(type, err, path, nd, field, args...) \
844 if (!(err = user_path_walk_link(path, &nd))) {
845 +#define FSHOOK_BEGIN_USER_PATH_WALK_LINK_IT(type, err, path, nd, field, args...) \
846 + if (!(err = user_path_walk_link_it(path, &nd))) {
848 #define FSHOOK_END_USER_WALK(type, err, field) ((void)0);}
850 Index: linux-2.6.5-12.1/fs/block_dev.c
851 ===================================================================
852 --- linux-2.6.5-12.1.orig/fs/block_dev.c 2004-05-10 19:21:55.000000000 +0300
853 +++ linux-2.6.5-12.1/fs/block_dev.c 2004-05-25 17:32:39.517620784 +0300
856 return ERR_PTR(-EINVAL);
858 + intent_init(&nd.intent, IT_LOOKUP);
859 error = path_lookup(path, LOOKUP_FOLLOW, &nd);
861 return ERR_PTR(error);