From ae99803ba24f76529813130b68a93e5c1550f7a0 Mon Sep 17 00:00:00 2001 From: ericm Date: Sat, 4 Oct 2003 11:32:55 +0000 Subject: [PATCH] merge b_devel -> b_eq 20031004 kernel only --- lustre/include/linux/lustre_log.h | 38 +- .../patches/ext3-map_inode_page.patch | 2 +- .../patches/vfs_intent-2.4.18-18-chaos65.patch | 419 +++-- .../patches/vfs_intent-2.4.20-hp.patch | 377 +++-- .../patches/vfs_intent_2.4.20_chaos.patch | 1716 -------------------- .../patches/vfs_races_2.5.72_rev1.patch | 35 +- lustre/llite/llite_lib.c | 155 +- lustre/obdfilter/filter_internal.h | 2 +- lustre/obdfilter/filter_io.c | 3 - 9 files changed, 576 insertions(+), 2171 deletions(-) delete mode 100644 lustre/kernel_patches/patches/vfs_intent_2.4.20_chaos.patch diff --git a/lustre/include/linux/lustre_log.h b/lustre/include/linux/lustre_log.h index 5d722b4..59bba98 100644 --- a/lustre/include/linux/lustre_log.h +++ b/lustre/include/linux/lustre_log.h @@ -44,6 +44,7 @@ struct lov_stripe_md; struct plain_handle_data { struct list_head phd_entry; + struct llog_handle *phd_cat_handle; struct llog_cookie phd_cookie; /* cookie of this log in its cat */ int phd_last_idx; }; @@ -73,24 +74,26 @@ struct llog_handle { typedef int (*llog_cb_t)(struct llog_handle *, struct llog_rec_hdr *, void *); int llog_init_handle(struct llog_handle *handle, int flags, struct obd_uuid *uuid); extern void llog_free_handle(struct llog_handle *handle); - +int llog_process(struct llog_handle *loghandle, llog_cb_t cb, void *data); +extern int llog_close(struct llog_handle *cathandle); /* llog_cat.c - catalog api */ -void llog_cat_put(struct llog_handle *cathandle); +struct llog_process_data { + void *lpd_data; + llog_cb_t lpd_cb; +}; +int llog_cat_put(struct llog_handle *cathandle); int llog_cat_add_rec(struct llog_handle *cathandle, struct llog_rec_hdr *rec, struct llog_cookie *reccookie, void *buf); - - -extern int llog_cancel_records(struct llog_handle *cathandle, int count, - struct llog_cookie *cookies); +int llog_cat_cancel_records(struct llog_handle *cathandle, int count, + struct llog_cookie *cookies); +int llog_cat_process(struct llog_handle *cat_llh, llog_cb_t cb, void *data); extern struct llog_handle *llog_alloc_handle(void); extern int llog_init_catalog(struct llog_handle *cathandle, struct obd_uuid *tgtuuid); extern int llog_delete_log(struct llog_handle *cathandle, struct llog_handle *loghandle); -extern int llog_close_log(struct llog_handle *cathandle, - struct llog_handle *loghandle); extern struct llog_handle *llog_new_log(struct llog_handle *cathandle, struct obd_uuid *tgtuuid); struct llog_operations { @@ -102,7 +105,7 @@ struct llog_operations { int idx); int (*lop_destroy)(struct llog_handle *handle); int (*lop_next_block)(struct llog_handle *h, - int curr_idx, + int *curr_idx, int next_idx, __u64 *cur_offset, void *buf, @@ -141,20 +144,6 @@ static inline int llog_handle2ops(struct llog_handle *loghandle, return llog_obd2ops(loghandle->lgh_obd, lop); } -static inline int llog_close(struct llog_handle *loghandle) -{ - struct llog_operations *lop; - int rc; - ENTRY; - - rc = llog_handle2ops(loghandle, &lop); - if (rc) - RETURN(rc); - if (lop->lop_close == NULL) - RETURN(-EOPNOTSUPP); - rc = lop->lop_close(loghandle); - RETURN(rc); -} static inline int llog_write_rec(struct llog_handle *handle, struct llog_rec_hdr *rec, @@ -170,6 +159,7 @@ static inline int llog_write_rec(struct llog_handle *handle, RETURN(rc); if (lop->lop_write_rec == NULL) RETURN(-EOPNOTSUPP); + LASSERT((rec->lrh_len % LLOG_MIN_REC_SIZE) == 0); rc = lop->lop_write_rec(handle, rec, logcookies, numcookies, buf, idx); RETURN(rc); @@ -227,7 +217,7 @@ static inline int llog_cancel(struct obd_export *exp, } #endif -static inline int llog_next_block(struct llog_handle *loghandle, int cur_idx, +static inline int llog_next_block(struct llog_handle *loghandle, int *cur_idx, int next_idx, __u64 *cur_offset, void *buf, int len) { diff --git a/lustre/kernel_patches/patches/ext3-map_inode_page.patch b/lustre/kernel_patches/patches/ext3-map_inode_page.patch index 912bb3f6..2be6076 100644 --- a/lustre/kernel_patches/patches/ext3-map_inode_page.patch +++ b/lustre/kernel_patches/patches/ext3-map_inode_page.patch @@ -38,7 +38,7 @@ + if (failed == 0 || create == 0) + return 0; + -+ needed_blocks = ext3_writepage_trans_blocks(inode) * failed; ++ needed_blocks = ext3_writepage_trans_blocks(inode); + lock_kernel(); + handle = ext3_journal_start(inode, needed_blocks); + unlock_kernel(); diff --git a/lustre/kernel_patches/patches/vfs_intent-2.4.18-18-chaos65.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.18-18-chaos65.patch index 4895067..7f16189 100644 --- a/lustre/kernel_patches/patches/vfs_intent-2.4.18-18-chaos65.patch +++ b/lustre/kernel_patches/patches/vfs_intent-2.4.18-18-chaos65.patch @@ -1,35 +1,31 @@ fs/dcache.c | 19 ++ - fs/exec.c | 15 +- - fs/namei.c | 355 +++++++++++++++++++++++++++++++++++++++++-------- - fs/namespace.c | 30 +++- - fs/open.c | 122 ++++++++++++++-- - fs/proc/base.c | 3 - fs/stat.c | 27 ++- - include/linux/dcache.h | 54 +++++++ - include/linux/fs.h | 31 ++++ + fs/exec.c | 18 +- + fs/namei.c | 328 +++++++++++++++++++++++++++++++++++++++++-------- + fs/namespace.c | 28 +++- + fs/open.c | 167 ++++++++++++++++++------ + fs/stat.c | 29 ++-- + include/linux/dcache.h | 60 ++++++++ + include/linux/fs.h | 34 ++++- kernel/exit.c | 3 kernel/fork.c | 3 kernel/ksyms.c | 1 - 12 files changed, 564 insertions(+), 99 deletions(-) + 11 files changed, 564 insertions(+), 126 deletions(-) -Index: linux-2.4.18-chaos52/fs/exec.c -=================================================================== ---- linux-2.4.18-chaos52.orig/fs/exec.c 2003-08-11 10:10:12.000000000 +0800 -+++ linux-2.4.18-chaos52/fs/exec.c 2003-08-11 10:17:04.000000000 +0800 -@@ -117,8 +117,10 @@ +--- linux-2.4.18-chaos/fs/exec.c~vfs_intent-2.4.18-18-chaos65 2003-07-28 17:52:03.000000000 +0400 ++++ linux-2.4.18-chaos-alexey/fs/exec.c 2003-09-14 17:25:41.000000000 +0400 +@@ -117,8 +117,10 @@ asmlinkage long sys_uselib(const char * struct file * file; struct nameidata nd; int error; -- -- error = user_path_walk(library, &nd); + struct lookup_intent it = { .it_op = IT_OPEN, + .it_flags = FMODE_READ|FMODE_EXEC }; -+ + +- error = user_path_walk(library, &nd); + error = user_path_walk_it(library, &nd, &it); if (error) goto out; -@@ -130,7 +132,8 @@ +@@ -130,7 +132,8 @@ asmlinkage long sys_uselib(const char * if (error) goto exit; @@ -39,7 +35,7 @@ Index: linux-2.4.18-chaos52/fs/exec.c error = PTR_ERR(file); if (IS_ERR(file)) goto out; -@@ -359,8 +362,9 @@ +@@ -359,8 +362,9 @@ struct file *open_exec(const char *name) struct inode *inode; struct file *file; int err = 0; @@ -51,7 +47,7 @@ Index: linux-2.4.18-chaos52/fs/exec.c file = ERR_PTR(err); if (!err) { inode = nd.dentry->d_inode; -@@ -372,7 +376,8 @@ +@@ -372,7 +376,8 @@ struct file *open_exec(const char *name) err = -EACCES; file = ERR_PTR(err); if (!err) { @@ -61,7 +57,7 @@ Index: linux-2.4.18-chaos52/fs/exec.c if (!IS_ERR(file)) { err = deny_write_access(file); if (err) { -@@ -384,6 +389,7 @@ +@@ -384,6 +389,7 @@ out: return file; } } @@ -69,7 +65,7 @@ Index: linux-2.4.18-chaos52/fs/exec.c path_release(&nd); } goto out; -@@ -1104,7 +1110,7 @@ +@@ -1104,7 +1110,7 @@ int do_coredump(long signr, struct pt_re goto close_fail; if (!file->f_op->write) goto close_fail; @@ -78,11 +74,9 @@ Index: linux-2.4.18-chaos52/fs/exec.c goto close_fail; retval = binfmt->core_dump(signr, regs, file); -Index: linux-2.4.18-chaos52/fs/dcache.c -=================================================================== ---- linux-2.4.18-chaos52.orig/fs/dcache.c 2003-08-11 10:10:12.000000000 +0800 -+++ linux-2.4.18-chaos52/fs/dcache.c 2003-08-11 10:11:27.000000000 +0800 -@@ -186,6 +186,13 @@ +--- linux-2.4.18-chaos/fs/dcache.c~vfs_intent-2.4.18-18-chaos65 2003-07-28 17:52:03.000000000 +0400 ++++ linux-2.4.18-chaos-alexey/fs/dcache.c 2003-09-14 17:25:41.000000000 +0400 +@@ -186,6 +186,13 @@ int d_invalidate(struct dentry * dentry) spin_unlock(&dcache_lock); return 0; } @@ -96,7 +90,7 @@ Index: linux-2.4.18-chaos52/fs/dcache.c /* * Check whether to do a partial shrink_dcache * to get rid of unused child entries. -@@ -859,13 +866,19 @@ +@@ -859,13 +866,19 @@ void d_delete(struct dentry * dentry) * Adds a dentry to the hash according to its name. */ @@ -119,11 +113,9 @@ Index: linux-2.4.18-chaos52/fs/dcache.c } #define do_switch(x,y) do { \ -Index: linux-2.4.18-chaos52/fs/namespace.c -=================================================================== ---- linux-2.4.18-chaos52.orig/fs/namespace.c 2003-08-11 10:10:12.000000000 +0800 -+++ linux-2.4.18-chaos52/fs/namespace.c 2003-08-11 10:11:27.000000000 +0800 -@@ -99,6 +99,7 @@ +--- linux-2.4.18-chaos/fs/namespace.c~vfs_intent-2.4.18-18-chaos65 2003-07-28 17:52:05.000000000 +0400 ++++ linux-2.4.18-chaos-alexey/fs/namespace.c 2003-09-14 17:25:41.000000000 +0400 +@@ -99,6 +99,7 @@ static void detach_mnt(struct vfsmount * { old_nd->dentry = mnt->mnt_mountpoint; old_nd->mnt = mnt->mnt_parent; @@ -131,7 +123,7 @@ Index: linux-2.4.18-chaos52/fs/namespace.c mnt->mnt_parent = mnt; mnt->mnt_mountpoint = mnt->mnt_root; list_del_init(&mnt->mnt_child); -@@ -110,6 +111,7 @@ +@@ -110,6 +111,7 @@ static void attach_mnt(struct vfsmount * { mnt->mnt_parent = mntget(nd->mnt); mnt->mnt_mountpoint = dget(nd->dentry); @@ -139,7 +131,7 @@ Index: linux-2.4.18-chaos52/fs/namespace.c list_add(&mnt->mnt_hash, mount_hashtable+hash(nd->mnt, nd->dentry)); list_add(&mnt->mnt_child, &nd->mnt->mnt_mounts); nd->dentry->d_mounted++; -@@ -485,14 +487,17 @@ +@@ -485,14 +487,17 @@ static int do_loopback(struct nameidata { struct nameidata old_nd; struct vfsmount *mnt = NULL; @@ -159,7 +151,7 @@ Index: linux-2.4.18-chaos52/fs/namespace.c down_write(¤t->namespace->sem); err = -EINVAL; -@@ -515,6 +520,7 @@ +@@ -515,6 +520,7 @@ static int do_loopback(struct nameidata } up_write(¤t->namespace->sem); @@ -167,7 +159,7 @@ Index: linux-2.4.18-chaos52/fs/namespace.c path_release(&old_nd); return err; } -@@ -698,6 +704,7 @@ +@@ -698,6 +704,7 @@ long do_mount(char * dev_name, char * di unsigned long flags, void *data_page) { struct nameidata nd; @@ -175,7 +167,7 @@ Index: linux-2.4.18-chaos52/fs/namespace.c int retval = 0; int mnt_flags = 0; -@@ -722,10 +729,11 @@ +@@ -722,10 +729,11 @@ long do_mount(char * dev_name, char * di flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV); /* ... and get the mountpoint */ @@ -190,7 +182,7 @@ Index: linux-2.4.18-chaos52/fs/namespace.c if (flags & MS_REMOUNT) retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags, data_page); -@@ -736,6 +744,8 @@ +@@ -736,6 +744,8 @@ long do_mount(char * dev_name, char * di else retval = do_add_mount(&nd, type_page, flags, mnt_flags, dev_name, data_page); @@ -199,7 +191,7 @@ Index: linux-2.4.18-chaos52/fs/namespace.c path_release(&nd); return retval; } -@@ -901,6 +911,8 @@ +@@ -901,6 +911,8 @@ asmlinkage long sys_pivot_root(const cha { struct vfsmount *tmp; struct nameidata new_nd, old_nd, parent_nd, root_parent, user_nd; @@ -208,7 +200,7 @@ Index: linux-2.4.18-chaos52/fs/namespace.c int error; if (!capable(CAP_SYS_ADMIN)) -@@ -908,14 +920,14 @@ +@@ -908,14 +920,14 @@ asmlinkage long sys_pivot_root(const cha lock_kernel(); @@ -225,7 +217,7 @@ Index: linux-2.4.18-chaos52/fs/namespace.c if (error) goto out1; -@@ -970,8 +982,10 @@ +@@ -970,8 +982,10 @@ out2: up(&old_nd.dentry->d_inode->i_zombie); up_write(¤t->namespace->sem); path_release(&user_nd); @@ -236,10 +228,8 @@ Index: linux-2.4.18-chaos52/fs/namespace.c path_release(&new_nd); out0: unlock_kernel(); -Index: linux-2.4.18-chaos52/fs/namei.c -=================================================================== ---- linux-2.4.18-chaos52.orig/fs/namei.c 2003-08-11 10:10:12.000000000 +0800 -+++ linux-2.4.18-chaos52/fs/namei.c 2003-08-11 10:11:27.000000000 +0800 +--- linux-2.4.18-chaos/fs/namei.c~vfs_intent-2.4.18-18-chaos65 2003-07-28 17:52:05.000000000 +0400 ++++ linux-2.4.18-chaos-alexey/fs/namei.c 2003-09-14 17:25:41.000000000 +0400 @@ -94,6 +94,13 @@ * XEmacs seems to be relying on it... */ @@ -254,7 +244,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c /* In order to reduce some races, while at the same time doing additional * checking and hopefully speeding things up, we copy filenames to the * kernel data space before using them.. -@@ -260,10 +267,19 @@ +@@ -260,10 +267,19 @@ void path_release(struct nameidata *nd) * Internal lookup() using the new generic dcache. * SMP-safe */ @@ -275,7 +265,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c if (dentry && dentry->d_op && dentry->d_op->d_revalidate) { if (!dentry->d_op->d_revalidate(dentry, flags) && !d_invalidate(dentry)) { dput(dentry); -@@ -281,11 +297,14 @@ +@@ -281,11 +297,15 @@ static struct dentry * cached_lookup(str * make sure that nobody added the entry to the dcache in the meantime.. * SMP-safe */ @@ -285,13 +275,14 @@ Index: linux-2.4.18-chaos52/fs/namei.c { struct dentry * result; struct inode *dir = parent->d_inode; ++ int counter = 0; +again: -+ ++ counter++; down(&dir->i_sem); /* * First re-do the cached lookup just in case it was created -@@ -300,6 +319,9 @@ +@@ -300,6 +320,9 @@ static struct dentry * real_lookup(struc result = ERR_PTR(-ENOMEM); if (dentry) { lock_kernel(); @@ -301,7 +292,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c result = dir->i_op->lookup(dir, dentry); unlock_kernel(); if (result) -@@ -321,6 +343,12 @@ +@@ -321,6 +344,15 @@ static struct dentry * real_lookup(struc dput(result); result = ERR_PTR(-ENOENT); } @@ -309,12 +300,15 @@ Index: linux-2.4.18-chaos52/fs/namei.c + if (!result->d_op->d_revalidate_it(result, flags, it) && + !d_invalidate(result)) { + dput(result); -+ goto again; ++ if (counter > 10) ++ result = ERR_PTR(-ESTALE); ++ if (!IS_ERR(result)) ++ goto again; + } } return result; } -@@ -334,7 +362,8 @@ +@@ -334,7 +366,8 @@ int max_recursive_link = 5; * Without that kind of total limit, nasty chains of consecutive * symlinks can cause almost arbitrarily long lookups. */ @@ -324,13 +318,12 @@ Index: linux-2.4.18-chaos52/fs/namei.c { int err; if (current->link_count >= max_recursive_link) -@@ -348,10 +377,12 @@ +@@ -348,10 +381,12 @@ static inline int do_follow_link(struct current->link_count++; current->total_link_count++; UPDATE_ATIME(dentry->d_inode); -- err = dentry->d_inode->i_op->follow_link(dentry, nd); + nd->intent = it; -+ err = dentry->d_inode->i_op->follow_link(dentry, nd); + err = dentry->d_inode->i_op->follow_link(dentry, nd); current->link_count--; return err; loop: @@ -338,7 +331,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c path_release(nd); return -ELOOP; } -@@ -381,7 +412,8 @@ +@@ -381,7 +416,8 @@ int follow_up(struct vfsmount **mnt, str return __follow_up(mnt, dentry); } @@ -348,7 +341,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c { struct vfsmount *mounted; -@@ -401,7 +433,7 @@ +@@ -401,7 +437,7 @@ static inline int __follow_down(struct v int follow_down(struct vfsmount **mnt, struct dentry **dentry) { @@ -357,7 +350,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c } static inline void follow_dotdot(struct nameidata *nd) -@@ -437,7 +469,7 @@ +@@ -437,7 +473,7 @@ static inline void follow_dotdot(struct mntput(nd->mnt); nd->mnt = parent; } @@ -366,7 +359,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c ; } -@@ -449,7 +481,8 @@ +@@ -449,7 +485,8 @@ static inline void follow_dotdot(struct * * We expect 'base' to be positive and a directory. */ @@ -376,7 +369,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c { struct dentry *dentry; struct inode *inode; -@@ -526,18 +559,18 @@ +@@ -526,18 +563,18 @@ int link_path_walk(const char * name, st break; } /* This does the actual lookups.. */ @@ -398,7 +391,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c ; err = -ENOENT; -@@ -548,8 +581,8 @@ +@@ -548,8 +585,8 @@ int link_path_walk(const char * name, st if (!inode->i_op) goto out_dput; @@ -409,7 +402,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c dput(dentry); if (err) goto return_err; -@@ -565,7 +598,7 @@ +@@ -565,7 +602,7 @@ int link_path_walk(const char * name, st nd->dentry = dentry; } err = -ENOTDIR; @@ -418,7 +411,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c break; continue; /* here ends the main loop */ -@@ -592,22 +625,23 @@ +@@ -592,22 +629,23 @@ last_component: if (err < 0) break; } @@ -447,7 +440,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c dput(dentry); if (err) goto return_err; -@@ -621,7 +655,8 @@ +@@ -621,7 +659,8 @@ last_component: goto no_inode; if (lookup_flags & LOOKUP_DIRECTORY) { err = -ENOTDIR; @@ -457,12 +450,11 @@ Index: linux-2.4.18-chaos52/fs/namei.c break; } goto return_base; -@@ -645,7 +680,24 @@ +@@ -645,7 +684,26 @@ return_reval: * Check the cached dentry for staleness. */ dentry = nd->dentry; - if (dentry && dentry->d_op && dentry->d_op->d_revalidate) { -+ revalidate_again: + if (dentry && dentry->d_op && dentry->d_op->d_revalidate_it) { + err = -ESTALE; + if (!dentry->d_op->d_revalidate_it(dentry, 0, it)) { @@ -475,15 +467,18 @@ Index: linux-2.4.18-chaos52/fs/namei.c + &dentry->d_name, 0, NULL); + d_invalidate(dentry); + dput(dentry); -+ dentry = new; -+ goto revalidate_again; ++ if (IS_ERR(new)) { ++ err = PTR_ERR(new); ++ break; ++ } ++ nd->dentry = new; + } + } + else if (dentry && dentry->d_op && dentry->d_op->d_revalidate){ err = -ESTALE; if (!dentry->d_op->d_revalidate(dentry, 0)) { d_invalidate(dentry); -@@ -658,15 +710,28 @@ +@@ -658,15 +716,28 @@ out_dput: dput(dentry); break; } @@ -513,7 +508,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c } /* SMP-safe */ -@@ -751,6 +816,17 @@ +@@ -751,6 +822,17 @@ walk_init_root(const char *name, struct } /* SMP-safe */ @@ -531,7 +526,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c int path_lookup(const char *path, unsigned flags, struct nameidata *nd) { int error = 0; -@@ -765,6 +841,7 @@ +@@ -765,6 +847,7 @@ int path_init(const char *name, unsigned { nd->last_type = LAST_ROOT; /* if there are only slashes... */ nd->flags = flags; @@ -539,7 +534,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c if (*name=='/') return walk_init_root(name,nd); read_lock(¤t->fs->lock); -@@ -779,7 +856,8 @@ +@@ -779,7 +862,8 @@ int path_init(const char *name, unsigned * needs parent already locked. Doesn't follow mounts. * SMP-safe. */ @@ -549,7 +544,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c { struct dentry * dentry; struct inode *inode; -@@ -802,13 +880,16 @@ +@@ -802,13 +886,16 @@ struct dentry * lookup_hash(struct qstr goto out; } @@ -567,7 +562,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c dentry = inode->i_op->lookup(inode, new); unlock_kernel(); if (!dentry) -@@ -820,6 +901,12 @@ +@@ -820,6 +907,12 @@ out: return dentry; } @@ -580,7 +575,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c /* SMP-safe */ struct dentry * lookup_one_len(const char * name, struct dentry * base, int len) { -@@ -841,7 +928,7 @@ +@@ -841,7 +934,7 @@ struct dentry * lookup_one_len(const cha } this.hash = end_name_hash(hash); @@ -589,7 +584,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c access: return ERR_PTR(-EACCES); } -@@ -872,6 +959,23 @@ +@@ -872,6 +965,23 @@ int __user_walk(const char *name, unsign return err; } @@ -613,7 +608,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c /* * It's inline, so penalty for filesystems that don't use sticky bit is * minimal. -@@ -969,6 +1073,37 @@ +@@ -969,6 +1079,37 @@ static inline int lookup_flags(unsigned return retval; } @@ -651,7 +646,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c int vfs_create(struct inode *dir, struct dentry *dentry, int mode) { int error; -@@ -1045,14 +1180,17 @@ +@@ -1045,14 +1186,17 @@ int may_open(struct nameidata *nd, int a return get_lease(inode, flag); } @@ -670,7 +665,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c int count = 0; if (!capable(CAP_SYS_ADMIN)) -@@ -1063,13 +1201,14 @@ +@@ -1063,13 +1207,14 @@ struct file *filp_open(const char * path if (flag & O_TRUNC) flag |= 2; @@ -686,7 +681,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c if (error) return ERR_PTR(error); dentry = nd.dentry; -@@ -1079,6 +1218,8 @@ +@@ -1079,6 +1224,8 @@ struct file *filp_open(const char * path /* * Create - we need to know the parent. */ @@ -695,7 +690,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c error = path_lookup(pathname, LOOKUP_PARENT, &nd); if (error) return ERR_PTR(error); -@@ -1094,7 +1235,7 @@ +@@ -1094,7 +1241,7 @@ struct file *filp_open(const char * path dir = nd.dentry; down(&dir->d_inode->i_sem); @@ -704,7 +699,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c do_last: error = PTR_ERR(dentry); -@@ -1103,10 +1244,11 @@ +@@ -1103,10 +1250,11 @@ do_last: goto exit; } @@ -718,7 +713,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c up(&dir->d_inode->i_sem); dput(nd.dentry); nd.dentry = dentry; -@@ -1132,12 +1274,12 @@ +@@ -1132,12 +1280,12 @@ do_last: error = -ELOOP; if (flag & O_NOFOLLOW) goto exit_dput; @@ -733,7 +728,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c goto do_link; dput(nd.dentry); -@@ -1152,11 +1294,13 @@ +@@ -1152,11 +1300,13 @@ ok: if (!S_ISREG(nd.dentry->d_inode->i_mode)) open_flags &= ~O_TRUNC; @@ -748,7 +743,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c path_release(&nd); return ERR_PTR(error); -@@ -1175,10 +1319,14 @@ +@@ -1175,10 +1325,14 @@ do_link: * are done. Procfs-like symlinks just set LAST_BIND. */ UPDATE_ATIME(dentry->d_inode); @@ -764,7 +759,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c if (nd.last_type == LAST_BIND) { dentry = nd.dentry; goto ok; -@@ -1197,13 +1345,15 @@ +@@ -1197,13 +1351,15 @@ do_link: } dir = nd.dentry; down(&dir->d_inode->i_sem); @@ -782,7 +777,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c { struct dentry *dentry; -@@ -1211,7 +1361,7 @@ +@@ -1211,7 +1367,7 @@ static struct dentry *lookup_create(stru dentry = ERR_PTR(-EEXIST); if (nd->last_type != LAST_NORM) goto fail; @@ -791,7 +786,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c if (IS_ERR(dentry)) goto fail; if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode) -@@ -1267,7 +1417,16 @@ +@@ -1267,7 +1423,16 @@ asmlinkage long sys_mknod(const char * f error = path_lookup(tmp, LOOKUP_PARENT, &nd); if (error) goto out; @@ -809,7 +804,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c error = PTR_ERR(dentry); mode &= ~current->fs->umask; -@@ -1288,6 +1447,7 @@ +@@ -1288,6 +1453,7 @@ asmlinkage long sys_mknod(const char * f dput(dentry); } up(&nd.dentry->d_inode->i_sem); @@ -817,23 +812,23 @@ Index: linux-2.4.18-chaos52/fs/namei.c path_release(&nd); out: putname(tmp); -@@ -1335,7 +1495,14 @@ +@@ -1335,7 +1501,14 @@ asmlinkage long sys_mkdir(const char * p error = path_lookup(tmp, LOOKUP_PARENT, &nd); if (error) goto out; - dentry = lookup_create(&nd, 1); -+ if (nd.dentry->d_inode->i_op->mkdir_raw) { -+ struct inode_operations *op = nd.dentry->d_inode->i_op; -+ error = op->mkdir_raw(&nd, mode); -+ /* the file system wants to use normal vfs path now */ -+ if (error != -EOPNOTSUPP) -+ goto out2; -+ } ++ if (nd.dentry->d_inode->i_op->mkdir_raw) { ++ struct inode_operations *op = nd.dentry->d_inode->i_op; ++ error = op->mkdir_raw(&nd, mode); ++ /* the file system wants to use normal vfs path now */ ++ if (error != -EOPNOTSUPP) ++ goto out2; ++ } + dentry = lookup_create(&nd, 1, NULL); error = PTR_ERR(dentry); if (!IS_ERR(dentry)) { error = vfs_mkdir(nd.dentry->d_inode, dentry, -@@ -1343,6 +1510,7 @@ +@@ -1343,6 +1516,7 @@ asmlinkage long sys_mkdir(const char * p dput(dentry); } up(&nd.dentry->d_inode->i_sem); @@ -841,42 +836,42 @@ Index: linux-2.4.18-chaos52/fs/namei.c path_release(&nd); out: putname(tmp); -@@ -1443,8 +1611,16 @@ +@@ -1443,8 +1617,16 @@ asmlinkage long sys_rmdir(const char * p error = -EBUSY; goto exit1; } -+ if (nd.dentry->d_inode->i_op->rmdir_raw) { -+ struct inode_operations *op = nd.dentry->d_inode->i_op; ++ if (nd.dentry->d_inode->i_op->rmdir_raw) { ++ struct inode_operations *op = nd.dentry->d_inode->i_op; + -+ error = op->rmdir_raw(&nd); -+ /* the file system wants to use normal vfs path now */ -+ if (error != -EOPNOTSUPP) -+ goto exit1; -+ } ++ error = op->rmdir_raw(&nd); ++ /* the file system wants to use normal vfs path now */ ++ if (error != -EOPNOTSUPP) ++ goto exit1; ++ } down(&nd.dentry->d_inode->i_sem); - dentry = lookup_hash(&nd.last, nd.dentry); + dentry = lookup_hash_it(&nd.last, nd.dentry, NULL); error = PTR_ERR(dentry); if (!IS_ERR(dentry)) { error = vfs_rmdir(nd.dentry->d_inode, dentry); -@@ -1502,8 +1678,15 @@ +@@ -1502,8 +1684,15 @@ asmlinkage long sys_unlink(const char * error = -EISDIR; if (nd.last_type != LAST_NORM) goto exit1; -+ if (nd.dentry->d_inode->i_op->unlink_raw) { -+ struct inode_operations *op = nd.dentry->d_inode->i_op; -+ error = op->unlink_raw(&nd); -+ /* the file system wants to use normal vfs path now */ -+ if (error != -EOPNOTSUPP) -+ goto exit1; -+ } ++ if (nd.dentry->d_inode->i_op->unlink_raw) { ++ struct inode_operations *op = nd.dentry->d_inode->i_op; ++ error = op->unlink_raw(&nd); ++ /* the file system wants to use normal vfs path now */ ++ if (error != -EOPNOTSUPP) ++ goto exit1; ++ } down(&nd.dentry->d_inode->i_sem); - dentry = lookup_hash(&nd.last, nd.dentry); + dentry = lookup_hash_it(&nd.last, nd.dentry, NULL); error = PTR_ERR(dentry); if (!IS_ERR(dentry)) { /* Why not before? Because we want correct error value */ -@@ -1570,15 +1753,23 @@ +@@ -1570,15 +1759,23 @@ asmlinkage long sys_symlink(const char * error = path_lookup(to, LOOKUP_PARENT, &nd); if (error) goto out; @@ -902,7 +897,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c putname(to); } putname(from); -@@ -1654,7 +1845,14 @@ +@@ -1654,7 +1851,14 @@ asmlinkage long sys_link(const char * ol error = -EXDEV; if (old_nd.mnt != nd.mnt) goto out_release; @@ -918,7 +913,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c error = PTR_ERR(new_dentry); if (!IS_ERR(new_dentry)) { error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry); -@@ -1698,7 +1896,7 @@ +@@ -1698,7 +1902,7 @@ exit: * locking]. */ int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry, @@ -927,7 +922,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c { int error; struct inode *target; -@@ -1777,7 +1975,7 @@ +@@ -1777,7 +1981,7 @@ out_unlock: } int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry, @@ -936,18 +931,18 @@ Index: linux-2.4.18-chaos52/fs/namei.c { int error; -@@ -1865,9 +2063,18 @@ +@@ -1865,9 +2069,18 @@ static inline int do_rename(const char * if (newnd.last_type != LAST_NORM) goto exit2; -+ if (old_dir->d_inode->i_op->rename_raw) { ++ if (old_dir->d_inode->i_op->rename_raw) { + lock_kernel(); -+ error = old_dir->d_inode->i_op->rename_raw(&oldnd, &newnd); ++ error = old_dir->d_inode->i_op->rename_raw(&oldnd, &newnd); + unlock_kernel(); -+ /* the file system wants to use normal vfs path now */ -+ if (error != -EOPNOTSUPP) -+ goto exit2; -+ } ++ /* the file system wants to use normal vfs path now */ ++ if (error != -EOPNOTSUPP) ++ goto exit2; ++ } + double_lock(new_dir, old_dir); @@ -956,7 +951,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c error = PTR_ERR(old_dentry); if (IS_ERR(old_dentry)) goto exit3; -@@ -1883,16 +2090,16 @@ +@@ -1883,16 +2096,16 @@ static inline int do_rename(const char * if (newnd.last.name[newnd.last.len]) goto exit4; } @@ -975,7 +970,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c dput(new_dentry); exit4: dput(old_dentry); -@@ -1943,12 +2150,17 @@ +@@ -1943,12 +2156,17 @@ out: } static inline int @@ -994,7 +989,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c if (*link == '/') { path_release(nd); -@@ -1956,7 +2168,7 @@ +@@ -1956,7 +2174,7 @@ __vfs_follow_link(struct nameidata *nd, /* weird __emul_prefix() stuff did it */ goto out; } @@ -1003,7 +998,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c out: if (current->link_count || res || nd->last_type!=LAST_NORM) return res; -@@ -1978,7 +2190,13 @@ +@@ -1978,7 +2196,13 @@ fail: int vfs_follow_link(struct nameidata *nd, const char *link) { @@ -1018,7 +1013,7 @@ Index: linux-2.4.18-chaos52/fs/namei.c } /* get the link contents into pagecache */ -@@ -2020,7 +2238,7 @@ +@@ -2020,7 +2244,7 @@ int page_follow_link(struct dentry *dent { struct page *page = NULL; char *s = page_getlink(dentry, &page); @@ -1027,10 +1022,8 @@ Index: linux-2.4.18-chaos52/fs/namei.c if (page) { kunmap(page); page_cache_release(page); -Index: linux-2.4.18-chaos52/fs/open.c -=================================================================== ---- linux-2.4.18-chaos52.orig/fs/open.c 2003-08-11 10:10:12.000000000 +0800 -+++ linux-2.4.18-chaos52/fs/open.c 2003-08-11 10:19:28.000000000 +0800 +--- linux-2.4.18-chaos/fs/open.c~vfs_intent-2.4.18-18-chaos65 2003-07-28 17:52:06.000000000 +0400 ++++ linux-2.4.18-chaos-alexey/fs/open.c 2003-09-14 17:25:41.000000000 +0400 @@ -19,6 +19,8 @@ #include @@ -1040,7 +1033,7 @@ Index: linux-2.4.18-chaos52/fs/open.c int vfs_statfs(struct super_block *sb, struct statfs *buf) { -@@ -95,9 +97,10 @@ +@@ -95,9 +97,10 @@ void fd_install(unsigned int fd, struct write_unlock(&files->file_lock); } @@ -1052,7 +1045,7 @@ Index: linux-2.4.18-chaos52/fs/open.c int error; struct iattr newattrs; -@@ -108,7 +111,13 @@ +@@ -108,7 +111,13 @@ int do_truncate(struct dentry *dentry, l down(&inode->i_sem); newattrs.ia_size = length; newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME; @@ -1067,7 +1060,7 @@ Index: linux-2.4.18-chaos52/fs/open.c up(&inode->i_sem); return error; } -@@ -118,12 +127,13 @@ +@@ -118,12 +127,13 @@ static inline long do_sys_truncate(const struct nameidata nd; struct inode * inode; int error; @@ -1082,7 +1075,7 @@ Index: linux-2.4.18-chaos52/fs/open.c if (error) goto out; inode = nd.dentry->d_inode; -@@ -163,11 +173,13 @@ +@@ -163,11 +173,13 @@ static inline long do_sys_truncate(const error = locks_verify_truncate(inode, NULL, length); if (!error) { DQUOT_INIT(inode); @@ -1097,7 +1090,7 @@ Index: linux-2.4.18-chaos52/fs/open.c path_release(&nd); out: return error; -@@ -215,7 +227,7 @@ +@@ -215,7 +227,7 @@ static inline long do_sys_ftruncate(unsi error = locks_verify_truncate(inode, file, length); if (!error) @@ -1106,7 +1099,7 @@ Index: linux-2.4.18-chaos52/fs/open.c out_putf: fput(file); out: -@@ -260,11 +272,13 @@ +@@ -260,11 +272,13 @@ asmlinkage long sys_utime(char * filenam struct inode * inode; struct iattr newattrs; @@ -1121,7 +1114,7 @@ Index: linux-2.4.18-chaos52/fs/open.c error = -EROFS; if (IS_RDONLY(inode)) goto dput_and_out; -@@ -279,11 +293,25 @@ +@@ -279,11 +293,25 @@ asmlinkage long sys_utime(char * filenam goto dput_and_out; newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET; @@ -1148,7 +1141,7 @@ Index: linux-2.4.18-chaos52/fs/open.c error = notify_change(nd.dentry, &newattrs); dput_and_out: path_release(&nd); -@@ -304,12 +332,14 @@ +@@ -304,12 +332,14 @@ asmlinkage long sys_utimes(char * filena struct inode * inode; struct iattr newattrs; @@ -1164,7 +1157,7 @@ Index: linux-2.4.18-chaos52/fs/open.c error = -EROFS; if (IS_RDONLY(inode)) goto dput_and_out; -@@ -324,7 +354,20 @@ +@@ -324,7 +354,20 @@ asmlinkage long sys_utimes(char * filena newattrs.ia_atime = times[0].tv_sec; newattrs.ia_mtime = times[1].tv_sec; newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET; @@ -1186,7 +1179,7 @@ Index: linux-2.4.18-chaos52/fs/open.c if (current->fsuid != inode->i_uid && (error = permission(inode,MAY_WRITE)) != 0) goto dput_and_out; -@@ -347,6 +390,7 @@ +@@ -347,6 +390,7 @@ asmlinkage long sys_access(const char * int old_fsuid, old_fsgid; kernel_cap_t old_cap; int res; @@ -1194,7 +1187,7 @@ Index: linux-2.4.18-chaos52/fs/open.c if (mode & ~S_IRWXO) /* where's F_OK, X_OK, W_OK, R_OK? */ return -EINVAL; -@@ -364,13 +408,14 @@ +@@ -364,13 +408,14 @@ asmlinkage long sys_access(const char * else current->cap_effective = current->cap_permitted; @@ -1210,7 +1203,7 @@ Index: linux-2.4.18-chaos52/fs/open.c path_release(&nd); } -@@ -385,8 +430,11 @@ +@@ -385,8 +430,11 @@ asmlinkage long sys_chdir(const char * f { int error; struct nameidata nd; @@ -1223,7 +1216,7 @@ Index: linux-2.4.18-chaos52/fs/open.c if (error) goto out; -@@ -397,6 +445,7 @@ +@@ -397,6 +445,7 @@ asmlinkage long sys_chdir(const char * f set_fs_pwd(current->fs, nd.mnt, nd.dentry); dput_and_out: @@ -1231,7 +1224,7 @@ Index: linux-2.4.18-chaos52/fs/open.c path_release(&nd); out: return error; -@@ -436,9 +485,10 @@ +@@ -436,9 +485,10 @@ asmlinkage long sys_chroot(const char * { int error; struct nameidata nd; @@ -1244,7 +1237,7 @@ Index: linux-2.4.18-chaos52/fs/open.c if (error) goto out; -@@ -454,39 +504,56 @@ +@@ -454,39 +504,56 @@ asmlinkage long sys_chroot(const char * set_fs_altroot(); error = 0; dput_and_out: @@ -1315,7 +1308,7 @@ Index: linux-2.4.18-chaos52/fs/open.c fput(file); out: return err; -@@ -495,30 +562,14 @@ +@@ -495,30 +562,14 @@ out: asmlinkage long sys_chmod(const char * filename, mode_t mode) { struct nameidata nd; @@ -1347,7 +1340,7 @@ Index: linux-2.4.18-chaos52/fs/open.c path_release(&nd); out: return error; -@@ -538,6 +589,20 @@ +@@ -538,6 +589,20 @@ static int chown_common(struct dentry * error = -EROFS; if (IS_RDONLY(inode)) goto out; @@ -1368,7 +1361,7 @@ Index: linux-2.4.18-chaos52/fs/open.c error = -EPERM; if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) goto out; -@@ -628,7 +693,8 @@ +@@ -628,7 +693,8 @@ extern ssize_t do_readahead(struct file /* for files over a certains size it doesn't pay to do readahead on open */ #define READAHEAD_CUTOFF 48000 @@ -1378,7 +1371,7 @@ Index: linux-2.4.18-chaos52/fs/open.c { struct file * f; struct inode *inode; -@@ -649,7 +715,7 @@ +@@ -649,7 +715,7 @@ struct file *dentry_open(struct dentry * error = locks_verify_locked(inode); if (!error) { DQUOT_INIT(inode); @@ -1387,7 +1380,7 @@ Index: linux-2.4.18-chaos52/fs/open.c } if (error || !(f->f_mode & FMODE_WRITE)) put_write_access(inode); -@@ -679,7 +745,9 @@ +@@ -679,7 +745,9 @@ struct file *dentry_open(struct dentry * } if (f->f_op && f->f_op->open) { @@ -1397,7 +1390,7 @@ Index: linux-2.4.18-chaos52/fs/open.c if (error) goto cleanup_all; } -@@ -693,6 +761,7 @@ +@@ -693,6 +761,7 @@ struct file *dentry_open(struct dentry * do_readahead(f, 0, (48 * 1024) >> PAGE_SHIFT); @@ -1405,7 +1398,7 @@ Index: linux-2.4.18-chaos52/fs/open.c return f; cleanup_all: -@@ -707,11 +776,17 @@ +@@ -707,11 +776,17 @@ cleanup_all: cleanup_file: put_filp(f); cleanup_dentry: @@ -1423,11 +1416,9 @@ Index: linux-2.4.18-chaos52/fs/open.c /* * Find an empty file descriptor entry, and mark it busy. */ -Index: linux-2.4.18-chaos52/fs/stat.c -=================================================================== ---- linux-2.4.18-chaos52.orig/fs/stat.c 2003-08-11 10:10:12.000000000 +0800 -+++ linux-2.4.18-chaos52/fs/stat.c 2003-08-11 10:11:27.000000000 +0800 -@@ -17,21 +17,24 @@ +--- linux-2.4.18-chaos/fs/stat.c~vfs_intent-2.4.18-18-chaos65 2003-07-28 17:52:06.000000000 +0400 ++++ linux-2.4.18-chaos-alexey/fs/stat.c 2003-09-14 17:30:21.000000000 +0400 +@@ -17,21 +17,26 @@ * Revalidate the inode. This is required for proper NFS attribute caching. */ static __inline__ int @@ -1436,6 +1427,8 @@ Index: linux-2.4.18-chaos52/fs/stat.c { struct inode * inode = dentry->d_inode; - if (inode->i_op && inode->i_op->revalidate) ++ if (!inode) ++ return -ENOENT; + if (inode->i_op && inode->i_op->revalidate_it) + return inode->i_op->revalidate_it(dentry, it); + else if (inode->i_op && inode->i_op->revalidate) @@ -1456,7 +1449,7 @@ Index: linux-2.4.18-chaos52/fs/stat.c if (res) return res; -@@ -104,10 +107,12 @@ +@@ -104,10 +109,12 @@ int vfs_stat(char *name, struct kstat *s { struct nameidata nd; int error; @@ -1471,7 +1464,7 @@ Index: linux-2.4.18-chaos52/fs/stat.c path_release(&nd); } return error; -@@ -117,10 +122,12 @@ +@@ -117,10 +124,12 @@ int vfs_lstat(char *name, struct kstat * { struct nameidata nd; int error; @@ -1486,7 +1479,7 @@ Index: linux-2.4.18-chaos52/fs/stat.c path_release(&nd); } return error; -@@ -132,7 +139,7 @@ +@@ -132,7 +141,7 @@ int vfs_fstat(unsigned int fd, struct ks int error = -EBADF; if (f) { @@ -1495,7 +1488,7 @@ Index: linux-2.4.18-chaos52/fs/stat.c fput(f); } return error; -@@ -279,7 +286,7 @@ +@@ -279,7 +288,7 @@ asmlinkage long sys_readlink(const char error = -EINVAL; if (inode->i_op && inode->i_op->readlink && @@ -1504,10 +1497,8 @@ Index: linux-2.4.18-chaos52/fs/stat.c UPDATE_ATIME(inode); error = inode->i_op->readlink(nd.dentry, buf, bufsiz); } -Index: linux-2.4.18-chaos52/include/linux/dcache.h -=================================================================== ---- linux-2.4.18-chaos52.orig/include/linux/dcache.h 2003-08-11 10:10:12.000000000 +0800 -+++ linux-2.4.18-chaos52/include/linux/dcache.h 2003-08-11 10:11:28.000000000 +0800 +--- linux-2.4.18-chaos/include/linux/dcache.h~vfs_intent-2.4.18-18-chaos65 2003-07-28 17:52:16.000000000 +0400 ++++ linux-2.4.18-chaos-alexey/include/linux/dcache.h 2003-09-14 17:25:41.000000000 +0400 @@ -5,6 +5,51 @@ #include @@ -1531,22 +1522,22 @@ Index: linux-2.4.18-chaos52/include/linux/dcache.h + + +struct lustre_intent_data { -+ int it_disposition; -+ int it_status; -+ __u64 it_lock_handle; -+ void *it_data; -+ int it_lock_mode; ++ int it_disposition; ++ int it_status; ++ __u64 it_lock_handle; ++ void *it_data; ++ int it_lock_mode; + int it_int_flags; +}; +struct lookup_intent { -+ int it_magic; -+ void (*it_op_release)(struct lookup_intent *); -+ int it_op; ++ int it_magic; ++ void (*it_op_release)(struct lookup_intent *); ++ int it_op; + int it_flags; + int it_create_mode; -+ union { -+ struct lustre_intent_data lustre; -+ } d; ++ union { ++ struct lustre_intent_data lustre; ++ } d; +}; + +static inline void intent_init(struct lookup_intent *it, int op, int flags) @@ -1560,7 +1551,7 @@ Index: linux-2.4.18-chaos52/include/linux/dcache.h /* * linux/include/linux/dcache.h -@@ -91,8 +136,22 @@ +@@ -91,8 +136,22 @@ struct dentry_operations { int (*d_delete)(struct dentry *); void (*d_release)(struct dentry *); void (*d_iput)(struct dentry *, struct inode *); @@ -1583,7 +1574,7 @@ Index: linux-2.4.18-chaos52/include/linux/dcache.h /* the dentry parameter passed to d_hash and d_compare is the parent * directory of the entries to be compared. It is used in case these * functions need any directory specific information for determining -@@ -124,6 +183,7 @@ +@@ -124,6 +183,7 @@ d_iput: no no yes * s_nfsd_free_path semaphore will be down */ #define DCACHE_REFERENCED 0x0008 /* Recently used, don't discard. */ @@ -1591,11 +1582,9 @@ Index: linux-2.4.18-chaos52/include/linux/dcache.h extern spinlock_t dcache_lock; -Index: linux-2.4.18-chaos52/include/linux/fs.h -=================================================================== ---- linux-2.4.18-chaos52.orig/include/linux/fs.h 2003-08-11 10:11:24.000000000 +0800 -+++ linux-2.4.18-chaos52/include/linux/fs.h 2003-08-11 10:41:55.000000000 +0800 -@@ -73,6 +73,7 @@ +--- linux-2.4.18-chaos/include/linux/fs.h~vfs_intent-2.4.18-18-chaos65 2003-09-14 17:24:21.000000000 +0400 ++++ linux-2.4.18-chaos-alexey/include/linux/fs.h 2003-09-14 17:25:41.000000000 +0400 +@@ -73,6 +73,7 @@ extern int leases_enable, dir_notify_ena #define FMODE_READ 1 #define FMODE_WRITE 2 @@ -1603,7 +1592,7 @@ Index: linux-2.4.18-chaos52/include/linux/fs.h #define READ 0 #define WRITE 1 -@@ -338,6 +339,9 @@ +@@ -339,6 +340,9 @@ extern void set_bh_page(struct buffer_he #define ATTR_MTIME_SET 256 #define ATTR_FORCE 512 /* Not a change, but a change it */ #define ATTR_ATTR_FLAG 1024 @@ -1613,7 +1602,15 @@ Index: linux-2.4.18-chaos52/include/linux/fs.h /* * This is the Inode Attributes structure, used for notify_change(). It -@@ -576,6 +580,7 @@ +@@ -474,6 +478,7 @@ struct inode { + struct pipe_inode_info *i_pipe; + struct block_device *i_bdev; + struct char_device *i_cdev; ++ void *i_filterdata; + + unsigned long i_dnotify_mask; /* Directory notify events */ + struct dnotify_struct *i_dnotify; /* for directory notifications */ +@@ -578,6 +583,7 @@ struct file { /* needed for tty driver, and maybe others */ void *private_data; @@ -1621,7 +1618,7 @@ Index: linux-2.4.18-chaos52/include/linux/fs.h /* preallocated helper kiobuf to speedup O_DIRECT */ struct kiobuf *f_iobuf; -@@ -705,6 +710,7 @@ +@@ -707,6 +713,7 @@ struct nameidata { struct qstr last; unsigned int flags; int last_type; @@ -1629,7 +1626,7 @@ Index: linux-2.4.18-chaos52/include/linux/fs.h }; #define DQUOT_USR_ENABLED 0x01 /* User diskquotas enabled */ -@@ -836,7 +842,8 @@ +@@ -840,7 +847,8 @@ extern int vfs_symlink(struct inode *, s extern int vfs_link(struct dentry *, struct inode *, struct dentry *); extern int vfs_rmdir(struct inode *, struct dentry *); extern int vfs_unlink(struct inode *, struct dentry *); @@ -1639,7 +1636,7 @@ Index: linux-2.4.18-chaos52/include/linux/fs.h /* * File types -@@ -896,21 +903,34 @@ +@@ -900,21 +908,34 @@ struct file_operations { struct inode_operations { int (*create) (struct inode *,struct dentry *,int); @@ -1670,11 +1667,11 @@ Index: linux-2.4.18-chaos52/include/linux/fs.h int (*revalidate) (struct dentry *); + int (*revalidate_it) (struct dentry *, struct lookup_intent *); int (*setattr) (struct dentry *, struct iattr *); -+ int (*setattr_raw) (struct inode *, struct iattr *); ++ int (*setattr_raw) (struct inode *, struct iattr *); int (*getattr) (struct dentry *, struct iattr *); }; -@@ -1115,10 +1135,12 @@ +@@ -1119,10 +1140,12 @@ static inline int get_lease(struct inode asmlinkage long sys_open(const char *, int, int); asmlinkage long sys_close(unsigned int); /* yes, it's really unsigned */ @@ -1688,7 +1685,7 @@ Index: linux-2.4.18-chaos52/include/linux/fs.h extern int filp_close(struct file *, fl_owner_t id); extern char * getname(const char *); -@@ -1384,9 +1406,12 @@ +@@ -1388,9 +1411,12 @@ typedef int (*read_actor_t)(read_descrip extern loff_t default_llseek(struct file *file, loff_t offset, int origin); extern int FASTCALL(__user_walk(const char *, unsigned, struct nameidata *)); @@ -1701,7 +1698,7 @@ Index: linux-2.4.18-chaos52/include/linux/fs.h extern int FASTCALL(link_path_walk(const char *, struct nameidata *)); extern void path_release(struct nameidata *); extern int follow_down(struct vfsmount **, struct dentry **); -@@ -1395,6 +1420,8 @@ +@@ -1399,6 +1425,8 @@ extern struct dentry * lookup_one_len(co extern struct dentry * lookup_hash(struct qstr *, struct dentry *); #define user_path_walk(name,nd) __user_walk(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, nd) #define user_path_walk_link(name,nd) __user_walk(name, LOOKUP_POSITIVE, nd) @@ -1710,7 +1707,7 @@ Index: linux-2.4.18-chaos52/include/linux/fs.h extern void inode_init_once(struct inode *); extern void iput(struct inode *); -@@ -1495,6 +1522,8 @@ +@@ -1499,6 +1527,8 @@ extern struct file_operations generic_ro extern int vfs_readlink(struct dentry *, char *, int, const char *); extern int vfs_follow_link(struct nameidata *, const char *); @@ -1719,11 +1716,9 @@ Index: linux-2.4.18-chaos52/include/linux/fs.h extern int page_readlink(struct dentry *, char *, int); extern int page_follow_link(struct dentry *, struct nameidata *); extern struct inode_operations page_symlink_inode_operations; -Index: linux-2.4.18-chaos52/kernel/fork.c -=================================================================== ---- linux-2.4.18-chaos52.orig/kernel/fork.c 2003-08-11 10:10:13.000000000 +0800 -+++ linux-2.4.18-chaos52/kernel/fork.c 2003-08-11 10:11:28.000000000 +0800 -@@ -399,10 +399,13 @@ +--- linux-2.4.18-chaos/kernel/fork.c~vfs_intent-2.4.18-18-chaos65 2003-07-28 17:52:20.000000000 +0400 ++++ linux-2.4.18-chaos-alexey/kernel/fork.c 2003-09-14 17:25:41.000000000 +0400 +@@ -399,10 +399,13 @@ static inline struct fs_struct *__copy_f fs->umask = old->umask; read_lock(&old->lock); fs->rootmnt = mntget(old->rootmnt); @@ -1737,11 +1732,9 @@ Index: linux-2.4.18-chaos52/kernel/fork.c fs->altrootmnt = mntget(old->altrootmnt); fs->altroot = dget(old->altroot); } else { -Index: linux-2.4.18-chaos52/kernel/exit.c -=================================================================== ---- linux-2.4.18-chaos52.orig/kernel/exit.c 2003-08-11 10:10:13.000000000 +0800 -+++ linux-2.4.18-chaos52/kernel/exit.c 2003-08-11 10:11:28.000000000 +0800 -@@ -303,11 +303,14 @@ +--- linux-2.4.18-chaos/kernel/exit.c~vfs_intent-2.4.18-18-chaos65 2003-07-28 17:52:20.000000000 +0400 ++++ linux-2.4.18-chaos-alexey/kernel/exit.c 2003-09-14 17:25:41.000000000 +0400 +@@ -303,11 +303,14 @@ static inline void __put_fs_struct(struc { /* No need to hold fs->lock if we are killing it */ if (atomic_dec_and_test(&fs->count)) { @@ -1756,11 +1749,9 @@ Index: linux-2.4.18-chaos52/kernel/exit.c dput(fs->altroot); mntput(fs->altrootmnt); } -Index: linux-2.4.18-chaos52/kernel/ksyms.c -=================================================================== ---- linux-2.4.18-chaos52.orig/kernel/ksyms.c 2003-08-11 10:11:25.000000000 +0800 -+++ linux-2.4.18-chaos52/kernel/ksyms.c 2003-08-11 10:11:28.000000000 +0800 -@@ -294,6 +294,7 @@ +--- linux-2.4.18-chaos/kernel/ksyms.c~vfs_intent-2.4.18-18-chaos65 2003-09-14 17:24:22.000000000 +0400 ++++ linux-2.4.18-chaos-alexey/kernel/ksyms.c 2003-09-14 17:25:41.000000000 +0400 +@@ -294,6 +294,7 @@ EXPORT_SYMBOL(read_cache_page); EXPORT_SYMBOL(set_page_dirty); EXPORT_SYMBOL(vfs_readlink); EXPORT_SYMBOL(vfs_follow_link); @@ -1768,3 +1759,5 @@ Index: linux-2.4.18-chaos52/kernel/ksyms.c EXPORT_SYMBOL(page_readlink); EXPORT_SYMBOL(page_follow_link); EXPORT_SYMBOL(page_symlink_inode_operations); + +_ diff --git a/lustre/kernel_patches/patches/vfs_intent-2.4.20-hp.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.20-hp.patch index fbda979..8cd3657 100644 --- a/lustre/kernel_patches/patches/vfs_intent-2.4.20-hp.patch +++ b/lustre/kernel_patches/patches/vfs_intent-2.4.20-hp.patch @@ -1,12 +1,25 @@ - 0 files changed + fs/dcache.c | 19 ++ + fs/exec.c | 17 +- + fs/namei.c | 330 +++++++++++++++++++++++++++++++++++++++------- + fs/namespace.c | 28 ++- + fs/open.c | 172 +++++++++++++++++------ + fs/proc/base.c | 3 + fs/stat.c | 52 ++++--- + include/linux/dcache.h | 60 ++++++++ + include/linux/fs.h | 32 ++++ + include/linux/fs_struct.h | 4 + kernel/exit.c | 3 + kernel/fork.c | 3 + kernel/ksyms.c | 1 + 13 files changed, 591 insertions(+), 133 deletions(-) ---- linux/fs/exec.c~vfs_intent-2.4.20-hp 2003-06-09 23:07:04.000000000 +0800 -+++ linux-root/fs/exec.c 2003-08-08 16:13:23.000000000 +0800 +--- linux-2.4.20-hp4-pnnl13/fs/exec.c~vfs_intent-2.4.20-hp 2003-09-13 15:19:27.000000000 +0400 ++++ linux-2.4.20-hp4-pnnl13-alexey/fs/exec.c 2003-09-14 17:33:51.000000000 +0400 @@ -116,8 +116,10 @@ asmlinkage long sys_uselib(const char * struct file * file; struct nameidata nd; int error; -+ struct lookup_intent it = { .it_op = IT_OPEN, ++ struct lookup_intent it = { .it_op = IT_OPEN, + .it_flags = FMODE_READ|FMODE_EXEC }; - error = user_path_walk(library, &nd); @@ -28,7 +41,7 @@ struct inode *inode; struct file *file; int err = 0; -+ struct lookup_intent it = { .it_op = IT_OPEN, ++ struct lookup_intent it = { .it_op = IT_OPEN, + .it_flags = FMODE_READ|FMODE_EXEC }; - err = path_lookup(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd); @@ -63,8 +76,8 @@ goto close_fail; retval = binfmt->core_dump(signr, regs, file); ---- linux/fs/dcache.c~vfs_intent-2.4.20-hp 2003-06-09 23:07:04.000000000 +0800 -+++ linux-root/fs/dcache.c 2003-08-08 15:58:57.000000000 +0800 +--- linux-2.4.20-hp4-pnnl13/fs/dcache.c~vfs_intent-2.4.20-hp 2002-11-29 02:53:15.000000000 +0300 ++++ linux-2.4.20-hp4-pnnl13-alexey/fs/dcache.c 2003-09-14 17:33:51.000000000 +0400 @@ -181,6 +181,13 @@ int d_invalidate(struct dentry * dentry) spin_unlock(&dcache_lock); return 0; @@ -102,8 +115,8 @@ } #define do_switch(x,y) do { \ ---- linux/fs/namespace.c~vfs_intent-2.4.20-hp 2002-11-29 07:53:15.000000000 +0800 -+++ linux-root/fs/namespace.c 2003-08-08 15:58:57.000000000 +0800 +--- linux-2.4.20-hp4-pnnl13/fs/namespace.c~vfs_intent-2.4.20-hp 2002-11-29 02:53:15.000000000 +0300 ++++ linux-2.4.20-hp4-pnnl13-alexey/fs/namespace.c 2003-09-14 17:33:51.000000000 +0400 @@ -99,6 +99,7 @@ static void detach_mnt(struct vfsmount * { old_nd->dentry = mnt->mnt_mountpoint; @@ -217,8 +230,8 @@ path_release(&new_nd); out0: unlock_kernel(); ---- linux/fs/namei.c~vfs_intent-2.4.20-hp 2003-06-09 23:07:04.000000000 +0800 -+++ linux-root/fs/namei.c 2003-08-08 15:58:57.000000000 +0800 +--- linux-2.4.20-hp4-pnnl13/fs/namei.c~vfs_intent-2.4.20-hp 2003-09-13 15:19:23.000000000 +0400 ++++ linux-2.4.20-hp4-pnnl13-alexey/fs/namei.c 2003-09-14 17:33:51.000000000 +0400 @@ -94,6 +94,13 @@ * XEmacs seems to be relying on it... */ @@ -254,7 +267,7 @@ if (dentry && dentry->d_op && dentry->d_op->d_revalidate) { if (!dentry->d_op->d_revalidate(dentry, flags) && !d_invalidate(dentry)) { dput(dentry); -@@ -281,11 +297,14 @@ static struct dentry * cached_lookup(str +@@ -281,11 +297,15 @@ static struct dentry * cached_lookup(str * make sure that nobody added the entry to the dcache in the meantime.. * SMP-safe */ @@ -264,13 +277,14 @@ { struct dentry * result; struct inode *dir = parent->d_inode; ++ int counter = 0; +again: -+ ++ counter++; down(&dir->i_sem); /* * First re-do the cached lookup just in case it was created -@@ -300,6 +319,9 @@ static struct dentry * real_lookup(struc +@@ -300,6 +320,9 @@ static struct dentry * real_lookup(struc result = ERR_PTR(-ENOMEM); if (dentry) { lock_kernel(); @@ -280,7 +294,7 @@ result = dir->i_op->lookup(dir, dentry); unlock_kernel(); if (result) -@@ -321,6 +343,12 @@ static struct dentry * real_lookup(struc +@@ -321,6 +344,15 @@ static struct dentry * real_lookup(struc dput(result); result = ERR_PTR(-ENOENT); } @@ -288,12 +302,15 @@ + if (!result->d_op->d_revalidate_it(result, flags, it) && + !d_invalidate(result)) { + dput(result); -+ goto again; ++ if (counter > 10) ++ result = ERR_PTR(-ESTALE); ++ if (!IS_ERR(result)) ++ goto again; + } } return result; } -@@ -332,7 +360,8 @@ static struct dentry * real_lookup(struc +@@ -332,7 +364,8 @@ static struct dentry * real_lookup(struc * Without that kind of total limit, nasty chains of consecutive * symlinks can cause almost arbitrarily long lookups. */ @@ -303,7 +320,7 @@ { int err; if (current->link_count >= 5) -@@ -346,10 +375,18 @@ static inline int do_follow_link(struct +@@ -346,10 +379,18 @@ static inline int do_follow_link(struct current->link_count++; current->total_link_count++; UPDATE_ATIME(dentry->d_inode); @@ -322,7 +339,7 @@ path_release(nd); return -ELOOP; } -@@ -379,15 +416,26 @@ int follow_up(struct vfsmount **mnt, str +@@ -379,15 +420,26 @@ int follow_up(struct vfsmount **mnt, str return __follow_up(mnt, dentry); } @@ -350,7 +367,7 @@ dput(*dentry); mntput(mounted->mnt_parent); *dentry = dget(mounted->mnt_root); -@@ -399,7 +447,7 @@ static inline int __follow_down(struct v +@@ -399,7 +451,7 @@ static inline int __follow_down(struct v int follow_down(struct vfsmount **mnt, struct dentry **dentry) { @@ -359,7 +376,7 @@ } static inline void follow_dotdot(struct nameidata *nd) -@@ -435,7 +483,7 @@ static inline void follow_dotdot(struct +@@ -435,7 +487,7 @@ static inline void follow_dotdot(struct mntput(nd->mnt); nd->mnt = parent; } @@ -368,7 +385,7 @@ ; } -@@ -447,7 +495,8 @@ static inline void follow_dotdot(struct +@@ -447,7 +499,8 @@ static inline void follow_dotdot(struct * * We expect 'base' to be positive and a directory. */ @@ -378,7 +395,7 @@ { struct dentry *dentry; struct inode *inode; -@@ -520,15 +569,15 @@ int link_path_walk(const char * name, st +@@ -520,15 +573,15 @@ int link_path_walk(const char * name, st break; } /* This does the actual lookups.. */ @@ -397,7 +414,7 @@ ; err = -ENOENT; -@@ -540,7 +589,7 @@ int link_path_walk(const char * name, st +@@ -540,7 +593,7 @@ int link_path_walk(const char * name, st goto out_dput; if (inode->i_op->follow_link) { @@ -406,7 +423,7 @@ dput(dentry); if (err) goto return_err; -@@ -556,7 +605,7 @@ int link_path_walk(const char * name, st +@@ -556,7 +609,7 @@ int link_path_walk(const char * name, st nd->dentry = dentry; } err = -ENOTDIR; @@ -415,7 +432,7 @@ break; continue; /* here ends the main loop */ -@@ -583,19 +632,19 @@ last_component: +@@ -583,19 +636,19 @@ last_component: if (err < 0) break; } @@ -439,7 +456,7 @@ dput(dentry); if (err) goto return_err; -@@ -609,7 +658,8 @@ last_component: +@@ -609,7 +662,8 @@ last_component: goto no_inode; if (lookup_flags & LOOKUP_DIRECTORY) { err = -ENOTDIR; @@ -449,11 +466,10 @@ break; } goto return_base; -@@ -633,6 +683,23 @@ return_reval: +@@ -633,6 +687,25 @@ return_reval: * Check the cached dentry for staleness. */ dentry = nd->dentry; -+ revalidate_again: + if (dentry && dentry->d_op && dentry->d_op->d_revalidate_it) { + err = -ESTALE; + if (!dentry->d_op->d_revalidate_it(dentry, 0, it)) { @@ -466,14 +482,17 @@ + &dentry->d_name, 0, NULL); + d_invalidate(dentry); + dput(dentry); -+ dentry = new; -+ goto revalidate_again; ++ if (IS_ERR(new)) { ++ err = PTR_ERR(new); ++ break; ++ } ++ nd->dentry = new; + } + } else if (dentry && dentry->d_op && dentry->d_op->d_revalidate) { err = -ESTALE; if (!dentry->d_op->d_revalidate(dentry, 0)) { -@@ -646,15 +713,28 @@ out_dput: +@@ -646,15 +719,28 @@ out_dput: dput(dentry); break; } @@ -503,7 +522,7 @@ } /* SMP-safe */ -@@ -739,6 +819,17 @@ walk_init_root(const char *name, struct +@@ -739,6 +825,17 @@ walk_init_root(const char *name, struct } /* SMP-safe */ @@ -521,7 +540,7 @@ int path_lookup(const char *path, unsigned flags, struct nameidata *nd) { int error = 0; -@@ -753,6 +844,7 @@ int path_init(const char *name, unsigned +@@ -753,6 +850,7 @@ int path_init(const char *name, unsigned { nd->last_type = LAST_ROOT; /* if there are only slashes... */ nd->flags = flags; @@ -529,7 +548,7 @@ if (*name=='/') return walk_init_root(name,nd); read_lock(¤t->fs->lock); -@@ -767,7 +859,8 @@ int path_init(const char *name, unsigned +@@ -767,7 +865,8 @@ int path_init(const char *name, unsigned * needs parent already locked. Doesn't follow mounts. * SMP-safe. */ @@ -539,7 +558,7 @@ { struct dentry * dentry; struct inode *inode; -@@ -790,13 +883,16 @@ struct dentry * lookup_hash(struct qstr +@@ -790,13 +889,16 @@ struct dentry * lookup_hash(struct qstr goto out; } @@ -557,7 +576,7 @@ dentry = inode->i_op->lookup(inode, new); unlock_kernel(); if (!dentry) -@@ -808,6 +904,12 @@ out: +@@ -808,6 +910,12 @@ out: return dentry; } @@ -570,7 +589,7 @@ /* SMP-safe */ struct dentry * lookup_one_len(const char * name, struct dentry * base, int len) { -@@ -829,7 +931,7 @@ struct dentry * lookup_one_len(const cha +@@ -829,7 +937,7 @@ struct dentry * lookup_one_len(const cha } this.hash = end_name_hash(hash); @@ -579,7 +598,7 @@ access: return ERR_PTR(-EACCES); } -@@ -860,6 +962,23 @@ int __user_walk(const char *name, unsign +@@ -860,6 +968,23 @@ int __user_walk(const char *name, unsign return err; } @@ -603,7 +622,7 @@ /* * It's inline, so penalty for filesystems that don't use sticky bit is * minimal. -@@ -955,7 +1074,8 @@ static inline int lookup_flags(unsigned +@@ -955,7 +1080,8 @@ static inline int lookup_flags(unsigned return retval; } @@ -613,7 +632,7 @@ { int error; -@@ -968,12 +1088,15 @@ int vfs_create(struct inode *dir, struct +@@ -968,12 +1094,15 @@ int vfs_create(struct inode *dir, struct goto exit_lock; error = -EACCES; /* shouldn't it be ENOSYS? */ @@ -631,7 +650,7 @@ unlock_kernel(); exit_lock: up(&dir->i_zombie); -@@ -982,6 +1105,11 @@ exit_lock: +@@ -982,6 +1111,11 @@ exit_lock: return error; } @@ -643,7 +662,7 @@ /* * open_namei() * -@@ -996,7 +1124,8 @@ exit_lock: +@@ -996,7 +1130,8 @@ exit_lock: * for symlinks (where the permissions are checked later). * SMP-safe */ @@ -653,7 +672,14 @@ { int acc_mode, error = 0; struct inode *inode; -@@ -1010,7 +1139,7 @@ int open_namei(const char * pathname, in +@@ -1006,11 +1141,14 @@ int open_namei(const char * pathname, in + + acc_mode = ACC_MODE(flag); + ++ if (it) ++ it->it_flags = flag; ++ + /* * The simplest case - just a plain lookup. */ if (!(flag & O_CREAT)) { @@ -662,18 +688,18 @@ if (error) return error; dentry = nd->dentry; -@@ -1020,6 +1149,10 @@ int open_namei(const char * pathname, in +@@ -1020,6 +1158,10 @@ int open_namei(const char * pathname, in /* * Create - we need to know the parent. */ -+ if (it) { -+ it->it_create_mode = mode; -+ it->it_op |= IT_CREAT; -+ } ++ if (it) { ++ it->it_create_mode = mode; ++ it->it_op |= IT_CREAT; ++ } error = path_lookup(pathname, LOOKUP_PARENT, nd); if (error) return error; -@@ -1035,7 +1168,7 @@ int open_namei(const char * pathname, in +@@ -1035,7 +1177,7 @@ int open_namei(const char * pathname, in dir = nd->dentry; down(&dir->d_inode->i_sem); @@ -682,7 +708,7 @@ do_last: error = PTR_ERR(dentry); -@@ -1044,11 +1177,12 @@ do_last: +@@ -1044,11 +1186,12 @@ do_last: goto exit; } @@ -696,7 +722,7 @@ up(&dir->d_inode->i_sem); dput(nd->dentry); nd->dentry = dentry; -@@ -1073,7 +1207,7 @@ do_last: +@@ -1073,7 +1216,7 @@ do_last: error = -ELOOP; if (flag & O_NOFOLLOW) goto exit_dput; @@ -705,7 +731,7 @@ } error = -ENOENT; if (!dentry->d_inode) -@@ -1152,7 +1286,7 @@ ok: +@@ -1152,7 +1295,7 @@ ok: if (!error) { DQUOT_INIT(inode); @@ -714,7 +740,7 @@ } put_write_access(inode); if (error) -@@ -1164,8 +1298,10 @@ ok: +@@ -1164,8 +1307,10 @@ ok: return 0; exit_dput: @@ -725,7 +751,7 @@ path_release(nd); return error; -@@ -1184,7 +1320,16 @@ do_link: +@@ -1184,7 +1329,16 @@ do_link: * are done. Procfs-like symlinks just set LAST_BIND. */ UPDATE_ATIME(dentry->d_inode); @@ -742,7 +768,7 @@ dput(dentry); if (error) return error; -@@ -1206,13 +1351,20 @@ do_link: +@@ -1206,13 +1360,20 @@ do_link: } dir = nd->dentry; down(&dir->d_inode->i_sem); @@ -765,7 +791,7 @@ { struct dentry *dentry; -@@ -1220,7 +1372,7 @@ static struct dentry *lookup_create(stru +@@ -1220,7 +1381,7 @@ static struct dentry *lookup_create(stru dentry = ERR_PTR(-EEXIST); if (nd->last_type != LAST_NORM) goto fail; @@ -774,7 +800,7 @@ if (IS_ERR(dentry)) goto fail; if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode) -@@ -1276,7 +1428,16 @@ asmlinkage long sys_mknod(const char * f +@@ -1276,7 +1437,16 @@ asmlinkage long sys_mknod(const char * f error = path_lookup(tmp, LOOKUP_PARENT, &nd); if (error) goto out; @@ -792,7 +818,7 @@ error = PTR_ERR(dentry); if (!IS_POSIXACL(nd.dentry->d_inode)) -@@ -1298,6 +1459,7 @@ asmlinkage long sys_mknod(const char * f +@@ -1298,6 +1468,7 @@ asmlinkage long sys_mknod(const char * f dput(dentry); } up(&nd.dentry->d_inode->i_sem); @@ -800,23 +826,23 @@ path_release(&nd); out: putname(tmp); -@@ -1345,7 +1507,14 @@ asmlinkage long sys_mkdir(const char * p +@@ -1345,7 +1516,14 @@ asmlinkage long sys_mkdir(const char * p error = path_lookup(tmp, LOOKUP_PARENT, &nd); if (error) goto out; - dentry = lookup_create(&nd, 1); -+ if (nd.dentry->d_inode->i_op->mkdir_raw) { -+ struct inode_operations *op = nd.dentry->d_inode->i_op; -+ error = op->mkdir_raw(&nd, mode); -+ /* the file system wants to use normal vfs path now */ -+ if (error != -EOPNOTSUPP) -+ goto out2; -+ } ++ if (nd.dentry->d_inode->i_op->mkdir_raw) { ++ struct inode_operations *op = nd.dentry->d_inode->i_op; ++ error = op->mkdir_raw(&nd, mode); ++ /* the file system wants to use normal vfs path now */ ++ if (error != -EOPNOTSUPP) ++ goto out2; ++ } + dentry = lookup_create(&nd, 1, NULL); error = PTR_ERR(dentry); if (!IS_ERR(dentry)) { if (!IS_POSIXACL(nd.dentry->d_inode)) -@@ -1354,6 +1523,7 @@ asmlinkage long sys_mkdir(const char * p +@@ -1354,6 +1532,7 @@ asmlinkage long sys_mkdir(const char * p dput(dentry); } up(&nd.dentry->d_inode->i_sem); @@ -824,42 +850,42 @@ path_release(&nd); out: putname(tmp); -@@ -1454,8 +1624,16 @@ asmlinkage long sys_rmdir(const char * p +@@ -1454,8 +1633,16 @@ asmlinkage long sys_rmdir(const char * p error = -EBUSY; goto exit1; } -+ if (nd.dentry->d_inode->i_op->rmdir_raw) { -+ struct inode_operations *op = nd.dentry->d_inode->i_op; ++ if (nd.dentry->d_inode->i_op->rmdir_raw) { ++ struct inode_operations *op = nd.dentry->d_inode->i_op; + -+ error = op->rmdir_raw(&nd); -+ /* the file system wants to use normal vfs path now */ -+ if (error != -EOPNOTSUPP) -+ goto exit1; -+ } ++ error = op->rmdir_raw(&nd); ++ /* the file system wants to use normal vfs path now */ ++ if (error != -EOPNOTSUPP) ++ goto exit1; ++ } down(&nd.dentry->d_inode->i_sem); - dentry = lookup_hash(&nd.last, nd.dentry); + dentry = lookup_hash_it(&nd.last, nd.dentry, NULL); error = PTR_ERR(dentry); if (!IS_ERR(dentry)) { error = vfs_rmdir(nd.dentry->d_inode, dentry); -@@ -1513,8 +1691,15 @@ asmlinkage long sys_unlink(const char * +@@ -1513,8 +1700,15 @@ asmlinkage long sys_unlink(const char * error = -EISDIR; if (nd.last_type != LAST_NORM) goto exit1; -+ if (nd.dentry->d_inode->i_op->unlink_raw) { -+ struct inode_operations *op = nd.dentry->d_inode->i_op; -+ error = op->unlink_raw(&nd); -+ /* the file system wants to use normal vfs path now */ -+ if (error != -EOPNOTSUPP) -+ goto exit1; -+ } ++ if (nd.dentry->d_inode->i_op->unlink_raw) { ++ struct inode_operations *op = nd.dentry->d_inode->i_op; ++ error = op->unlink_raw(&nd); ++ /* the file system wants to use normal vfs path now */ ++ if (error != -EOPNOTSUPP) ++ goto exit1; ++ } down(&nd.dentry->d_inode->i_sem); - dentry = lookup_hash(&nd.last, nd.dentry); + dentry = lookup_hash_it(&nd.last, nd.dentry, NULL); error = PTR_ERR(dentry); if (!IS_ERR(dentry)) { /* Why not before? Because we want correct error value */ -@@ -1581,15 +1766,23 @@ asmlinkage long sys_symlink(const char * +@@ -1581,15 +1775,23 @@ asmlinkage long sys_symlink(const char * error = path_lookup(to, LOOKUP_PARENT, &nd); if (error) goto out; @@ -885,7 +911,7 @@ putname(to); } putname(from); -@@ -1665,7 +1858,14 @@ asmlinkage long sys_link(const char * ol +@@ -1665,7 +1867,14 @@ asmlinkage long sys_link(const char * ol error = -EXDEV; if (old_nd.mnt != nd.mnt) goto out_release; @@ -901,7 +927,7 @@ error = PTR_ERR(new_dentry); if (!IS_ERR(new_dentry)) { error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry); -@@ -1709,7 +1909,7 @@ exit: +@@ -1709,7 +1918,7 @@ exit: * locking]. */ int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry, @@ -910,7 +936,7 @@ { int error; struct inode *target; -@@ -1788,7 +1988,7 @@ out_unlock: +@@ -1788,7 +1997,7 @@ out_unlock: } int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry, @@ -919,18 +945,18 @@ { int error; -@@ -1876,9 +2076,18 @@ static inline int do_rename(const char * +@@ -1876,9 +2085,18 @@ static inline int do_rename(const char * if (newnd.last_type != LAST_NORM) goto exit2; -+ if (old_dir->d_inode->i_op->rename_raw) { ++ if (old_dir->d_inode->i_op->rename_raw) { + lock_kernel(); -+ error = old_dir->d_inode->i_op->rename_raw(&oldnd, &newnd); ++ error = old_dir->d_inode->i_op->rename_raw(&oldnd, &newnd); + unlock_kernel(); -+ /* the file system wants to use normal vfs path now */ -+ if (error != -EOPNOTSUPP) -+ goto exit2; -+ } ++ /* the file system wants to use normal vfs path now */ ++ if (error != -EOPNOTSUPP) ++ goto exit2; ++ } + double_lock(new_dir, old_dir); @@ -939,7 +965,7 @@ error = PTR_ERR(old_dentry); if (IS_ERR(old_dentry)) goto exit3; -@@ -1894,16 +2103,16 @@ static inline int do_rename(const char * +@@ -1894,16 +2112,16 @@ static inline int do_rename(const char * if (newnd.last.name[newnd.last.len]) goto exit4; } @@ -958,7 +984,7 @@ dput(new_dentry); exit4: dput(old_dentry); -@@ -1954,20 +2163,28 @@ out: +@@ -1954,20 +2172,28 @@ out: } static inline int @@ -989,7 +1015,7 @@ out: if (current->link_count || res || nd->last_type!=LAST_NORM) return res; -@@ -1989,7 +2206,13 @@ fail: +@@ -1989,7 +2215,13 @@ fail: int vfs_follow_link(struct nameidata *nd, const char *link) { @@ -1004,7 +1030,7 @@ } /* get the link contents into pagecache */ -@@ -2031,7 +2254,7 @@ int page_follow_link(struct dentry *dent +@@ -2031,7 +2263,7 @@ int page_follow_link(struct dentry *dent { struct page *page = NULL; char *s = page_getlink(dentry, &page); @@ -1013,8 +1039,8 @@ if (page) { kunmap(page); page_cache_release(page); ---- linux/fs/open.c~vfs_intent-2.4.20-hp 2003-06-09 23:07:04.000000000 +0800 -+++ linux-root/fs/open.c 2003-08-08 17:09:13.000000000 +0800 +--- linux-2.4.20-hp4-pnnl13/fs/open.c~vfs_intent-2.4.20-hp 2002-11-29 02:53:15.000000000 +0300 ++++ linux-2.4.20-hp4-pnnl13-alexey/fs/open.c 2003-09-14 17:33:51.000000000 +0400 @@ -19,6 +19,8 @@ #include @@ -1198,7 +1224,7 @@ { int error; struct nameidata nd; -+ struct lookup_intent it = { .it_op = IT_GETATTR }; ++ struct lookup_intent it = { .it_op = IT_GETATTR }; - error = __user_walk(filename,LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY,&nd); + error = __user_walk_it(filename,LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY,&nd, &it); @@ -1217,7 +1243,7 @@ { int error; struct nameidata nd; -+ struct lookup_intent it = { .it_op = IT_GETATTR }; ++ struct lookup_intent it = { .it_op = IT_GETATTR }; - error = __user_walk(filename, LOOKUP_POSITIVE | LOOKUP_FOLLOW | - LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd); @@ -1313,18 +1339,18 @@ - error = -EROFS; - if (IS_RDONLY(inode)) - goto dput_and_out; -- + - error = -EPERM; - if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) - goto dput_and_out; ++ error = chmod_common(nd.dentry, mode); - if (mode == (mode_t) -1) - mode = inode->i_mode; - newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO); - newattrs.ia_valid = ATTR_MODE | ATTR_CTIME; - error = notify_change(nd.dentry, &newattrs); -+ error = chmod_common(nd.dentry, mode); - +- -dput_and_out: path_release(&nd); out: @@ -1350,20 +1376,15 @@ error = -EPERM; if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) goto out; -@@ -638,10 +701,12 @@ asmlinkage long sys_fchown(unsigned int - * for the internal routines (ie open_namei()/follow_link() etc). 00 is - * used by symlinks. - */ -+ - struct file *filp_open(const char * filename, int flags, int mode) +@@ -642,6 +705,7 @@ struct file *filp_open(const char * file { int namei_flags, error; struct nameidata nd; -+ struct lookup_intent it = { .it_op = IT_OPEN, .it_flags = flags }; ++ struct lookup_intent it = { .it_op = IT_OPEN }; namei_flags = flags; if ((namei_flags+1) & O_ACCMODE) -@@ -649,14 +714,15 @@ struct file *filp_open(const char * file +@@ -649,14 +713,15 @@ struct file *filp_open(const char * file if (namei_flags & O_TRUNC) namei_flags |= 2; @@ -1384,7 +1405,7 @@ { struct file * f; struct inode *inode; -@@ -693,12 +759,15 @@ struct file *dentry_open(struct dentry * +@@ -693,12 +758,15 @@ struct file *dentry_open(struct dentry * } if (f->f_op && f->f_op->open) { @@ -1400,7 +1421,7 @@ return f; cleanup_all: -@@ -713,11 +782,17 @@ cleanup_all: +@@ -713,11 +781,17 @@ cleanup_all: cleanup_file: put_filp(f); cleanup_dentry: @@ -1418,9 +1439,9 @@ /* * Find an empty file descriptor entry, and mark it busy. */ ---- linux/fs/stat.c~vfs_intent-2.4.20-hp 2003-06-09 23:07:04.000000000 +0800 -+++ linux-root/fs/stat.c 2003-08-08 15:58:57.000000000 +0800 -@@ -17,10 +17,12 @@ +--- linux-2.4.20-hp4-pnnl13/fs/stat.c~vfs_intent-2.4.20-hp 2001-09-14 03:04:43.000000000 +0400 ++++ linux-2.4.20-hp4-pnnl13-alexey/fs/stat.c 2003-09-14 17:34:07.000000000 +0400 +@@ -17,10 +17,14 @@ * Revalidate the inode. This is required for proper NFS attribute caching. */ static __inline__ int @@ -1429,13 +1450,15 @@ { struct inode * inode = dentry->d_inode; - if (inode->i_op && inode->i_op->revalidate) ++ if (!inode) ++ return -ENOENT; + if (inode->i_op && inode->i_op->revalidate_it) + return inode->i_op->revalidate_it(dentry, it); + else if (inode->i_op && inode->i_op->revalidate) return inode->i_op->revalidate(dentry); return 0; } -@@ -135,13 +137,15 @@ static int cp_new_stat(struct inode * in +@@ -135,13 +139,15 @@ static int cp_new_stat(struct inode * in asmlinkage long sys_stat(char * filename, struct __old_kernel_stat * statbuf) { struct nameidata nd; @@ -1453,7 +1476,7 @@ path_release(&nd); } return error; -@@ -151,13 +155,15 @@ asmlinkage long sys_stat(char * filename +@@ -151,13 +157,15 @@ asmlinkage long sys_stat(char * filename asmlinkage long sys_newstat(char * filename, struct stat * statbuf) { struct nameidata nd; @@ -1471,7 +1494,7 @@ path_release(&nd); } return error; -@@ -172,13 +178,15 @@ asmlinkage long sys_newstat(char * filen +@@ -172,13 +180,15 @@ asmlinkage long sys_newstat(char * filen asmlinkage long sys_lstat(char * filename, struct __old_kernel_stat * statbuf) { struct nameidata nd; @@ -1489,7 +1512,7 @@ path_release(&nd); } return error; -@@ -189,13 +197,15 @@ asmlinkage long sys_lstat(char * filenam +@@ -189,13 +199,15 @@ asmlinkage long sys_lstat(char * filenam asmlinkage long sys_newlstat(char * filename, struct stat * statbuf) { struct nameidata nd; @@ -1507,7 +1530,7 @@ path_release(&nd); } return error; -@@ -216,7 +226,7 @@ asmlinkage long sys_fstat(unsigned int f +@@ -216,7 +228,7 @@ asmlinkage long sys_fstat(unsigned int f if (f) { struct dentry * dentry = f->f_dentry; @@ -1516,7 +1539,7 @@ if (!err) err = cp_old_stat(dentry->d_inode, statbuf); fput(f); -@@ -235,7 +245,7 @@ asmlinkage long sys_newfstat(unsigned in +@@ -235,7 +247,7 @@ asmlinkage long sys_newfstat(unsigned in if (f) { struct dentry * dentry = f->f_dentry; @@ -1525,7 +1548,7 @@ if (!err) err = cp_new_stat(dentry->d_inode, statbuf); fput(f); -@@ -257,7 +267,7 @@ asmlinkage long sys_readlink(const char +@@ -257,7 +269,7 @@ asmlinkage long sys_readlink(const char error = -EINVAL; if (inode->i_op && inode->i_op->readlink && @@ -1534,7 +1557,7 @@ UPDATE_ATIME(inode); error = inode->i_op->readlink(nd.dentry, buf, bufsiz); } -@@ -333,12 +343,14 @@ asmlinkage long sys_stat64(char * filena +@@ -333,12 +345,14 @@ asmlinkage long sys_stat64(char * filena { struct nameidata nd; int error; @@ -1551,7 +1574,7 @@ path_release(&nd); } return error; -@@ -348,12 +360,14 @@ asmlinkage long sys_lstat64(char * filen +@@ -348,12 +362,14 @@ asmlinkage long sys_lstat64(char * filen { struct nameidata nd; int error; @@ -1568,7 +1591,7 @@ path_release(&nd); } return error; -@@ -368,7 +382,7 @@ asmlinkage long sys_fstat64(unsigned lon +@@ -368,7 +384,7 @@ asmlinkage long sys_fstat64(unsigned lon if (f) { struct dentry * dentry = f->f_dentry; @@ -1577,9 +1600,9 @@ if (!err) err = cp_new_stat64(dentry->d_inode, statbuf); fput(f); ---- linux/fs/proc/base.c~vfs_intent-2.4.20-hp 2003-06-09 23:04:21.000000000 +0800 -+++ linux-root/fs/proc/base.c 2003-08-08 15:58:57.000000000 +0800 -@@ -464,6 +464,9 @@ static int proc_pid_follow_link(struct d +--- linux-2.4.20-hp4-pnnl13/fs/proc/base.c~vfs_intent-2.4.20-hp 2003-09-13 15:19:19.000000000 +0400 ++++ linux-2.4.20-hp4-pnnl13-alexey/fs/proc/base.c 2003-09-14 17:33:51.000000000 +0400 +@@ -481,6 +481,9 @@ static int proc_pid_follow_link(struct d error = inode->u.proc_i.op.proc_get_link(inode, &nd->dentry, &nd->mnt); nd->last_type = LAST_BIND; @@ -1589,15 +1612,14 @@ out: return error; } ---- linux/include/linux/dcache.h~vfs_intent-2.4.20-hp 2002-11-29 07:53:15.000000000 +0800 -+++ linux-root/include/linux/dcache.h 2003-08-08 15:58:57.000000000 +0800 -@@ -5,8 +5,53 @@ - +--- linux-2.4.20-hp4-pnnl13/include/linux/dcache.h~vfs_intent-2.4.20-hp 2002-11-29 02:53:15.000000000 +0300 ++++ linux-2.4.20-hp4-pnnl13-alexey/include/linux/dcache.h 2003-09-14 17:33:51.000000000 +0400 +@@ -6,6 +6,51 @@ #include #include -+#include #include - ++#include ++ +#define IT_OPEN 0x0001 +#define IT_CREAT 0x0002 +#define IT_READDIR 0x0004 @@ -1613,26 +1635,26 @@ + +#define INTENT_MAGIC 0x19620323 + ++ +struct lustre_intent_data { -+ int it_disposition; -+ int it_status; -+ __u64 it_lock_handle; -+ void *it_data; -+ int it_lock_mode; -+ int it_int_flags; ++ int it_disposition; ++ int it_status; ++ __u64 it_lock_handle; ++ void *it_data; ++ int it_lock_mode; ++ int it_int_flags; +}; +struct lookup_intent { -+ int it_magic; -+ void (*it_op_release)(struct lookup_intent *); -+ int it_op; -+ int it_flags; -+ int it_create_mode; -+ union { -+ struct lustre_intent_data lustre; -+ } d; ++ int it_magic; ++ void (*it_op_release)(struct lookup_intent *); ++ int it_op; ++ int it_flags; ++ int it_create_mode; ++ union { ++ struct lustre_intent_data lustre; ++ } d; +}; + -+ +static inline void intent_init(struct lookup_intent *it, int op, int flags) +{ + memset(it, 0, sizeof(*it)); @@ -1641,10 +1663,9 @@ + it->it_flags = flags; +} + -+ + /* * linux/include/linux/dcache.h - * @@ -91,8 +136,22 @@ struct dentry_operations { int (*d_delete)(struct dentry *); void (*d_release)(struct dentry *); @@ -1676,8 +1697,8 @@ extern spinlock_t dcache_lock; ---- linux/include/linux/fs.h~vfs_intent-2.4.20-hp 2003-08-08 15:58:54.000000000 +0800 -+++ linux-root/include/linux/fs.h 2003-08-08 17:16:15.000000000 +0800 +--- linux-2.4.20-hp4-pnnl13/include/linux/fs.h~vfs_intent-2.4.20-hp 2003-09-14 17:33:50.000000000 +0400 ++++ linux-2.4.20-hp4-pnnl13-alexey/include/linux/fs.h 2003-09-14 17:33:51.000000000 +0400 @@ -73,6 +73,7 @@ extern int leases_enable, dir_notify_ena #define FMODE_READ 1 @@ -1696,7 +1717,15 @@ /* * This is the Inode Attributes structure, used for notify_change(). It -@@ -576,6 +580,7 @@ struct file { +@@ -474,6 +478,7 @@ struct inode { + struct pipe_inode_info *i_pipe; + struct block_device *i_bdev; + struct char_device *i_cdev; ++ void *i_filterdata; + + unsigned long i_dnotify_mask; /* Directory notify events */ + struct dnotify_struct *i_dnotify; /* for directory notifications */ +@@ -576,6 +581,7 @@ struct file { /* needed for tty driver, and maybe others */ void *private_data; @@ -1704,7 +1733,7 @@ /* preallocated helper kiobuf to speedup O_DIRECT */ struct kiobuf *f_iobuf; -@@ -697,6 +702,7 @@ struct nameidata { +@@ -697,6 +703,7 @@ struct nameidata { struct qstr last; unsigned int flags; int last_type; @@ -1712,7 +1741,7 @@ }; /* -@@ -817,7 +823,8 @@ extern int vfs_symlink(struct inode *, s +@@ -817,7 +824,8 @@ extern int vfs_symlink(struct inode *, s extern int vfs_link(struct dentry *, struct inode *, struct dentry *); extern int vfs_rmdir(struct inode *, struct dentry *); extern int vfs_unlink(struct inode *, struct dentry *); @@ -1722,7 +1751,7 @@ /* * File types -@@ -877,21 +884,32 @@ struct file_operations { +@@ -877,21 +885,32 @@ struct file_operations { struct inode_operations { int (*create) (struct inode *,struct dentry *,int); @@ -1751,11 +1780,11 @@ int (*revalidate) (struct dentry *); + int (*revalidate_it) (struct dentry *, struct lookup_intent *); int (*setattr) (struct dentry *, struct iattr *); -+ int (*setattr_raw) (struct inode *, struct iattr *); ++ int (*setattr_raw) (struct inode *, struct iattr *); int (*getattr) (struct dentry *, struct iattr *); int (*setxattr) (struct dentry *, const char *, void *, size_t, int); ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t); -@@ -1088,10 +1106,14 @@ static inline int get_lease(struct inode +@@ -1088,10 +1107,14 @@ static inline int get_lease(struct inode asmlinkage long sys_open(const char *, int, int); asmlinkage long sys_close(unsigned int); /* yes, it's really unsigned */ @@ -1771,7 +1800,7 @@ extern int filp_close(struct file *, fl_owner_t id); extern char * getname(const char *); -@@ -1353,6 +1375,7 @@ typedef int (*read_actor_t)(read_descrip +@@ -1353,6 +1376,7 @@ typedef int (*read_actor_t)(read_descrip extern loff_t default_llseek(struct file *file, loff_t offset, int origin); extern int FASTCALL(__user_walk(const char *, unsigned, struct nameidata *)); @@ -1779,7 +1808,7 @@ extern int FASTCALL(path_init(const char *, unsigned, struct nameidata *)); extern int FASTCALL(path_walk(const char *, struct nameidata *)); extern int FASTCALL(path_lookup(const char *, unsigned, struct nameidata *)); -@@ -1364,6 +1387,8 @@ extern struct dentry * lookup_one_len(co +@@ -1364,6 +1388,8 @@ extern struct dentry * lookup_one_len(co extern struct dentry * lookup_hash(struct qstr *, struct dentry *); #define user_path_walk(name,nd) __user_walk(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, nd) #define user_path_walk_link(name,nd) __user_walk(name, LOOKUP_POSITIVE, nd) @@ -1788,7 +1817,7 @@ extern void inode_init_once(struct inode *); extern void iput(struct inode *); -@@ -1499,6 +1524,8 @@ extern struct file_operations generic_ro +@@ -1499,6 +1525,8 @@ extern struct file_operations generic_ro extern int vfs_readlink(struct dentry *, char *, int, const char *); extern int vfs_follow_link(struct nameidata *, const char *); @@ -1797,8 +1826,8 @@ extern int page_readlink(struct dentry *, char *, int); extern int page_follow_link(struct dentry *, struct nameidata *); extern struct inode_operations page_symlink_inode_operations; ---- linux/include/linux/fs_struct.h~vfs_intent-2.4.20-hp 2001-07-14 06:10:44.000000000 +0800 -+++ linux-root/include/linux/fs_struct.h 2003-08-08 15:58:57.000000000 +0800 +--- linux-2.4.20-hp4-pnnl13/include/linux/fs_struct.h~vfs_intent-2.4.20-hp 2001-07-14 02:10:44.000000000 +0400 ++++ linux-2.4.20-hp4-pnnl13-alexey/include/linux/fs_struct.h 2003-09-14 17:33:51.000000000 +0400 @@ -34,10 +34,12 @@ static inline void set_fs_root(struct fs write_lock(&fs->lock); old_root = fs->root; @@ -1825,8 +1854,8 @@ dput(old_pwd); mntput(old_pwdmnt); } ---- linux/kernel/ksyms.c~vfs_intent-2.4.20-hp 2003-08-08 15:58:55.000000000 +0800 -+++ linux-root/kernel/ksyms.c 2003-08-08 15:58:57.000000000 +0800 +--- linux-2.4.20-hp4-pnnl13/kernel/ksyms.c~vfs_intent-2.4.20-hp 2003-09-14 17:33:50.000000000 +0400 ++++ linux-2.4.20-hp4-pnnl13-alexey/kernel/ksyms.c 2003-09-14 17:33:51.000000000 +0400 @@ -296,6 +296,7 @@ EXPORT_SYMBOL(read_cache_page); EXPORT_SYMBOL(set_page_dirty); EXPORT_SYMBOL(vfs_readlink); @@ -1835,8 +1864,8 @@ EXPORT_SYMBOL(page_readlink); EXPORT_SYMBOL(page_follow_link); EXPORT_SYMBOL(page_symlink_inode_operations); ---- linux/kernel/fork.c~vfs_intent-2.4.20-hp 2003-05-29 03:14:31.000000000 +0800 -+++ linux-root/kernel/fork.c 2003-08-08 15:58:57.000000000 +0800 +--- linux-2.4.20-hp4-pnnl13/kernel/fork.c~vfs_intent-2.4.20-hp 2003-09-13 15:19:27.000000000 +0400 ++++ linux-2.4.20-hp4-pnnl13-alexey/kernel/fork.c 2003-09-14 17:33:51.000000000 +0400 @@ -388,10 +388,13 @@ static inline struct fs_struct *__copy_f fs->umask = old->umask; read_lock(&old->lock); @@ -1851,8 +1880,8 @@ fs->altrootmnt = mntget(old->altrootmnt); fs->altroot = dget(old->altroot); } else { ---- linux/kernel/exit.c~vfs_intent-2.4.20-hp 2003-05-29 03:14:31.000000000 +0800 -+++ linux-root/kernel/exit.c 2003-08-08 15:58:57.000000000 +0800 +--- linux-2.4.20-hp4-pnnl13/kernel/exit.c~vfs_intent-2.4.20-hp 2003-09-13 15:19:27.000000000 +0400 ++++ linux-2.4.20-hp4-pnnl13-alexey/kernel/exit.c 2003-09-14 17:33:51.000000000 +0400 @@ -239,11 +239,14 @@ static inline void __put_fs_struct(struc { /* No need to hold fs->lock if we are killing it */ diff --git a/lustre/kernel_patches/patches/vfs_intent_2.4.20_chaos.patch b/lustre/kernel_patches/patches/vfs_intent_2.4.20_chaos.patch deleted file mode 100644 index 3d6dd56..0000000 --- a/lustre/kernel_patches/patches/vfs_intent_2.4.20_chaos.patch +++ /dev/null @@ -1,1716 +0,0 @@ - fs/dcache.c | 19 ++ - fs/exec.c | 15 +- - fs/namei.c | 324 ++++++++++++++++++++++++++++++++++++++-------- - fs/namespace.c | 28 ++- - fs/open.c | 126 +++++++++++++++-- - fs/proc/base.c | 3 - fs/stat.c | 26 ++- - include/linux/dcache.h | 54 +++++++ - include/linux/fs.h | 30 +++- - include/linux/fs_struct.h | 4 - kernel/exit.c | 3 - kernel/fork.c | 3 - kernel/ksyms.c | 1 - 13 files changed, 538 insertions(+), 98 deletions(-) - ---- kernel-2.4.20-6chaos_18_7/fs/exec.c~vfs_intent_2.4.20_chaos Thu Jun 19 10:06:09 2003 -+++ kernel-2.4.20-6chaos_18_7-shaver/fs/exec.c Wed Jul 16 04:21:21 2003 -@@ -113,8 +113,9 @@ asmlinkage long sys_uselib(const char * - struct file * file; - struct nameidata nd; - int error; -+ struct lookup_intent it = { .it_op = IT_OPEN, .it_flags = O_RDONLY }; - -- error = user_path_walk(library, &nd); -+ error = user_path_walk_it(library, &nd, &it); - if (error) - goto out; - -@@ -126,7 +127,8 @@ asmlinkage long sys_uselib(const char * - if (error) - goto exit; - -- file = dentry_open(nd.dentry, nd.mnt, O_RDONLY); -+ file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &it); -+ intent_release(&it); - error = PTR_ERR(file); - if (IS_ERR(file)) - goto out; -@@ -381,8 +383,9 @@ struct file *open_exec(const char *name) - struct inode *inode; - struct file *file; - int err = 0; -+ struct lookup_intent it = { .it_op = IT_OPEN, .it_flags = O_RDONLY }; - -- err = path_lookup(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd); -+ err = path_lookup_it(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd, &it); - file = ERR_PTR(err); - if (!err) { - inode = nd.dentry->d_inode; -@@ -394,7 +397,8 @@ struct file *open_exec(const char *name) - err = -EACCES; - file = ERR_PTR(err); - if (!err) { -- file = dentry_open(nd.dentry, nd.mnt, O_RDONLY); -+ file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &it); -+ intent_release(&it); - if (!IS_ERR(file)) { - err = deny_write_access(file); - if (err) { -@@ -406,6 +410,7 @@ out: - return file; - } - } -+ intent_release(&it); - path_release(&nd); - } - goto out; -@@ -1134,7 +1139,7 @@ int do_coredump(long signr, struct pt_re - goto close_fail; - if (!file->f_op->write) - goto close_fail; -- if (do_truncate(file->f_dentry, 0) != 0) -+ if (do_truncate(file->f_dentry, 0, 0) != 0) - goto close_fail; - - retval = binfmt->core_dump(signr, regs, file); ---- kernel-2.4.20-6chaos_18_7/fs/dcache.c~vfs_intent_2.4.20_chaos Thu May 15 20:14:24 2003 -+++ kernel-2.4.20-6chaos_18_7-shaver/fs/dcache.c Wed Jul 16 04:21:21 2003 -@@ -186,6 +186,13 @@ int d_invalidate(struct dentry * dentry) - spin_unlock(&dcache_lock); - return 0; - } -+ -+ /* network invalidation by Lustre */ -+ if (dentry->d_flags & DCACHE_LUSTRE_INVALID) { -+ spin_unlock(&dcache_lock); -+ return 0; -+ } -+ - /* - * Check whether to do a partial shrink_dcache - * to get rid of unused child entries. -@@ -839,13 +846,19 @@ void d_delete(struct dentry * dentry) - * Adds a dentry to the hash according to its name. - */ - --void d_rehash(struct dentry * entry) -+void __d_rehash(struct dentry * entry, int lock) - { - struct list_head *list = d_hash(entry->d_parent, entry->d_name.hash); - if (!list_empty(&entry->d_hash)) BUG(); -- spin_lock(&dcache_lock); -+ if (lock) spin_lock(&dcache_lock); - list_add(&entry->d_hash, list); -- spin_unlock(&dcache_lock); -+ if (lock) spin_unlock(&dcache_lock); -+} -+EXPORT_SYMBOL(__d_rehash); -+ -+void d_rehash(struct dentry * entry) -+{ -+ __d_rehash(entry, 1); - } - - #define do_switch(x,y) do { \ ---- kernel-2.4.20-6chaos_18_7/fs/namespace.c~vfs_intent_2.4.20_chaos Thu May 15 20:14:25 2003 -+++ kernel-2.4.20-6chaos_18_7-shaver/fs/namespace.c Wed Jul 16 04:21:21 2003 -@@ -99,6 +99,7 @@ static void detach_mnt(struct vfsmount * - { - old_nd->dentry = mnt->mnt_mountpoint; - old_nd->mnt = mnt->mnt_parent; -+ UNPIN(old_nd->dentry, old_nd->mnt, 1); - mnt->mnt_parent = mnt; - mnt->mnt_mountpoint = mnt->mnt_root; - list_del_init(&mnt->mnt_child); -@@ -110,6 +111,7 @@ static void attach_mnt(struct vfsmount * - { - mnt->mnt_parent = mntget(nd->mnt); - mnt->mnt_mountpoint = dget(nd->dentry); -+ PIN(nd->dentry, nd->mnt, 1); - list_add(&mnt->mnt_hash, mount_hashtable+hash(nd->mnt, nd->dentry)); - list_add(&mnt->mnt_child, &nd->mnt->mnt_mounts); - nd->dentry->d_mounted++; -@@ -485,14 +487,17 @@ static int do_loopback(struct nameidata - { - struct nameidata old_nd; - struct vfsmount *mnt = NULL; -+ struct lookup_intent it = { .it_op = IT_GETATTR }; - int err = mount_is_safe(nd); - if (err) - return err; - if (!old_name || !*old_name) - return -EINVAL; -- err = path_lookup(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd); -- if (err) -+ err = path_lookup_it(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd, &it); -+ if (err) { -+ intent_release(&it); - return err; -+ } - - down_write(¤t->namespace->sem); - err = -EINVAL; -@@ -515,6 +520,7 @@ static int do_loopback(struct nameidata - } - - up_write(¤t->namespace->sem); -+ intent_release(&it); - path_release(&old_nd); - return err; - } -@@ -698,6 +704,7 @@ long do_mount(char * dev_name, char * di - unsigned long flags, void *data_page) - { - struct nameidata nd; -+ struct lookup_intent it = { .it_op = IT_GETATTR }; - int retval = 0; - int mnt_flags = 0; - -@@ -722,10 +729,11 @@ long do_mount(char * dev_name, char * di - flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV); - - /* ... and get the mountpoint */ -- retval = path_lookup(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd); -- if (retval) -+ retval = path_lookup_it(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd, &it); -+ if (retval) { -+ intent_release(&it); - return retval; -- -+ } - if (flags & MS_REMOUNT) - retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags, - data_page); -@@ -736,6 +744,8 @@ long do_mount(char * dev_name, char * di - else - retval = do_add_mount(&nd, type_page, flags, mnt_flags, - dev_name, data_page); -+ -+ intent_release(&it); - path_release(&nd); - return retval; - } -@@ -901,6 +911,8 @@ asmlinkage long sys_pivot_root(const cha - { - struct vfsmount *tmp; - struct nameidata new_nd, old_nd, parent_nd, root_parent, user_nd; -+ struct lookup_intent new_it = { .it_op = IT_GETATTR }; -+ struct lookup_intent old_it = { .it_op = IT_GETATTR }; - int error; - - if (!capable(CAP_SYS_ADMIN)) -@@ -908,14 +920,14 @@ asmlinkage long sys_pivot_root(const cha - - lock_kernel(); - -- error = __user_walk(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd); -+ error = __user_walk_it(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd, &new_it); - if (error) - goto out0; - error = -EINVAL; - if (!check_mnt(new_nd.mnt)) - goto out1; - -- error = __user_walk(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd); -+ error = __user_walk_it(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd, &old_it); - if (error) - goto out1; - -@@ -970,8 +982,10 @@ out2: - up(&old_nd.dentry->d_inode->i_zombie); - up_write(¤t->namespace->sem); - path_release(&user_nd); -+ intent_release(&old_it); - path_release(&old_nd); - out1: -+ intent_release(&new_it); - path_release(&new_nd); - out0: - unlock_kernel(); ---- kernel-2.4.20-6chaos_18_7/fs/namei.c~vfs_intent_2.4.20_chaos Thu May 15 20:14:25 2003 -+++ kernel-2.4.20-6chaos_18_7-shaver/fs/namei.c Wed Jul 16 04:21:21 2003 -@@ -94,6 +94,13 @@ - * XEmacs seems to be relying on it... - */ - -+void intent_release(struct lookup_intent *it) -+{ -+ if (it && it->it_op_release) -+ it->it_op_release(it); -+ -+} -+ - /* In order to reduce some races, while at the same time doing additional - * checking and hopefully speeding things up, we copy filenames to the - * kernel data space before using them.. -@@ -260,10 +267,19 @@ void path_release(struct nameidata *nd) - * Internal lookup() using the new generic dcache. - * SMP-safe - */ --static struct dentry * cached_lookup(struct dentry * parent, struct qstr * name, int flags) -+static struct dentry *cached_lookup(struct dentry *parent, struct qstr *name, -+ int flags, struct lookup_intent *it) - { - struct dentry * dentry = d_lookup(parent, name); - -+ if (dentry && dentry->d_op && dentry->d_op->d_revalidate_it) { -+ if (!dentry->d_op->d_revalidate_it(dentry, flags, it) && -+ !d_invalidate(dentry)) { -+ dput(dentry); -+ dentry = NULL; -+ } -+ return dentry; -+ } else - if (dentry && dentry->d_op && dentry->d_op->d_revalidate) { - if (!dentry->d_op->d_revalidate(dentry, flags) && !d_invalidate(dentry)) { - dput(dentry); -@@ -281,11 +297,14 @@ static struct dentry * cached_lookup(str - * make sure that nobody added the entry to the dcache in the meantime.. - * SMP-safe - */ --static struct dentry * real_lookup(struct dentry * parent, struct qstr * name, int flags) -+static struct dentry *real_lookup(struct dentry *parent, struct qstr *name, -+ int flags, struct lookup_intent *it) - { - struct dentry * result; - struct inode *dir = parent->d_inode; - -+again: -+ - down(&dir->i_sem); - /* - * First re-do the cached lookup just in case it was created -@@ -300,6 +319,9 @@ static struct dentry * real_lookup(struc - result = ERR_PTR(-ENOMEM); - if (dentry) { - lock_kernel(); -+ if (dir->i_op->lookup_it) -+ result = dir->i_op->lookup_it(dir, dentry, it, flags); -+ else - result = dir->i_op->lookup(dir, dentry); - unlock_kernel(); - if (result) -@@ -321,6 +343,12 @@ static struct dentry * real_lookup(struc - dput(result); - result = ERR_PTR(-ENOENT); - } -+ } else if (result->d_op && result->d_op->d_revalidate_it) { -+ if (!result->d_op->d_revalidate_it(result, flags, it) && -+ !d_invalidate(result)) { -+ dput(result); -+ goto again; -+ } - } - return result; - } -@@ -334,7 +362,8 @@ int max_recursive_link = 5; - * Without that kind of total limit, nasty chains of consecutive - * symlinks can cause almost arbitrarily long lookups. - */ --static inline int do_follow_link(struct dentry *dentry, struct nameidata *nd) -+static inline int do_follow_link(struct dentry *dentry, struct nameidata *nd, -+ struct lookup_intent *it) - { - int err; - if (current->link_count >= max_recursive_link) -@@ -348,10 +377,18 @@ static inline int do_follow_link(struct - current->link_count++; - current->total_link_count++; - UPDATE_ATIME(dentry->d_inode); -+ nd->it = it; - err = dentry->d_inode->i_op->follow_link(dentry, nd); -+ if (!err && it != NULL && !(it->it_int_flags & IT_FL_FOLLOWED)) { -+ /* vfs_follow_link was never called */ -+ intent_release(it); -+ path_release(nd); -+ err = -ENOLINK; -+ } - current->link_count--; - return err; - loop: -+ intent_release(it); - path_release(nd); - return -ELOOP; - } -@@ -381,15 +418,26 @@ int follow_up(struct vfsmount **mnt, str - return __follow_up(mnt, dentry); - } - --static inline int __follow_down(struct vfsmount **mnt, struct dentry **dentry) -+static inline int __follow_down(struct vfsmount **mnt, struct dentry **dentry, -+ struct lookup_intent *it) - { - struct vfsmount *mounted; - - spin_lock(&dcache_lock); - mounted = lookup_mnt(*mnt, *dentry); - if (mounted) { -+ int opc = 0, mode = 0; - *mnt = mntget(mounted); - spin_unlock(&dcache_lock); -+ if (it) { -+ opc = it->it_op; -+ mode = it->it_mode; -+ } -+ intent_release(it); -+ if (it) { -+ it->it_op = opc; -+ it->it_mode = mode; -+ } - dput(*dentry); - mntput(mounted->mnt_parent); - *dentry = dget(mounted->mnt_root); -@@ -401,7 +449,7 @@ static inline int __follow_down(struct v - - int follow_down(struct vfsmount **mnt, struct dentry **dentry) - { -- return __follow_down(mnt,dentry); -+ return __follow_down(mnt,dentry,NULL); - } - - static inline void follow_dotdot(struct nameidata *nd) -@@ -437,7 +485,7 @@ static inline void follow_dotdot(struct - mntput(nd->mnt); - nd->mnt = parent; - } -- while (d_mountpoint(nd->dentry) && __follow_down(&nd->mnt, &nd->dentry)) -+ while (d_mountpoint(nd->dentry) && __follow_down(&nd->mnt, &nd->dentry, NULL)) - ; - } - -@@ -449,7 +497,8 @@ static inline void follow_dotdot(struct - * - * We expect 'base' to be positive and a directory. - */ --int link_path_walk(const char * name, struct nameidata *nd) -+int link_path_walk_it(const char *name, struct nameidata *nd, -+ struct lookup_intent *it) - { - struct dentry *dentry; - struct inode *inode; -@@ -526,19 +575,18 @@ int link_path_walk(const char * name, st - break; - } - /* This does the actual lookups.. */ -- dentry = cached_lookup(nd->dentry, &this, LOOKUP_CONTINUE); -+ dentry = cached_lookup(nd->dentry, &this, LOOKUP_CONTINUE, NULL); - if (!dentry) { - err = -EWOULDBLOCKIO; - if (atomic) - break; -- dentry = real_lookup(nd->dentry, &this, LOOKUP_CONTINUE); -+ dentry = real_lookup(nd->dentry, &this, LOOKUP_CONTINUE, NULL); - err = PTR_ERR(dentry); - if (IS_ERR(dentry)) - break; - } - /* Check mountpoints.. */ -- while (d_mountpoint(dentry) && __follow_down(&nd->mnt, &dentry)) -- ; -+ while (d_mountpoint(dentry) && __follow_down(&nd->mnt, &dentry, NULL)); - - err = -ENOENT; - inode = dentry->d_inode; -@@ -549,7 +597,7 @@ int link_path_walk(const char * name, st - goto out_dput; - - if (inode->i_op->follow_link) { -- err = do_follow_link(dentry, nd); -+ err = do_follow_link(dentry, nd, NULL); - dput(dentry); - if (err) - goto return_err; -@@ -565,7 +613,7 @@ int link_path_walk(const char * name, st - nd->dentry = dentry; - } - err = -ENOTDIR; -- if (!inode->i_op->lookup) -+ if (!inode->i_op->lookup && !inode->i_op->lookup_it) - break; - continue; - /* here ends the main loop */ -@@ -592,22 +640,22 @@ last_component: - if (err < 0) - break; - } -- dentry = cached_lookup(nd->dentry, &this, 0); -+ dentry = cached_lookup(nd->dentry, &this, 0, it); - if (!dentry) { - err = -EWOULDBLOCKIO; - if (atomic) - break; -- dentry = real_lookup(nd->dentry, &this, 0); -+ dentry = real_lookup(nd->dentry, &this, 0, it); - err = PTR_ERR(dentry); - if (IS_ERR(dentry)) - break; - } -- while (d_mountpoint(dentry) && __follow_down(&nd->mnt, &dentry)) -+ while (d_mountpoint(dentry) && __follow_down(&nd->mnt, &dentry, it)) - ; - inode = dentry->d_inode; - if ((lookup_flags & LOOKUP_FOLLOW) - && inode && inode->i_op && inode->i_op->follow_link) { -- err = do_follow_link(dentry, nd); -+ err = do_follow_link(dentry, nd, it); - dput(dentry); - if (err) - goto return_err; -@@ -621,7 +669,8 @@ last_component: - goto no_inode; - if (lookup_flags & LOOKUP_DIRECTORY) { - err = -ENOTDIR; -- if (!inode->i_op || !inode->i_op->lookup) -+ if (!inode->i_op || -+ (!inode->i_op->lookup && !inode->i_op->lookup_it)) - break; - } - goto return_base; -@@ -645,6 +694,23 @@ return_reval: - * Check the cached dentry for staleness. - */ - dentry = nd->dentry; -+ revalidate_again: -+ if (dentry && dentry->d_op && dentry->d_op->d_revalidate_it) { -+ err = -ESTALE; -+ if (!dentry->d_op->d_revalidate_it(dentry, 0, it)) { -+ struct dentry *new; -+ err = permission(dentry->d_parent->d_inode, -+ MAY_EXEC); -+ if (err) -+ break; -+ new = real_lookup(dentry->d_parent, -+ &dentry->d_name, 0, NULL); -+ d_invalidate(dentry); -+ dput(dentry); -+ dentry = new; -+ goto revalidate_again; -+ } -+ } else - if (dentry && dentry->d_op && dentry->d_op->d_revalidate) { - err = -ESTALE; - if (!dentry->d_op->d_revalidate(dentry, 0)) { -@@ -658,15 +724,28 @@ out_dput: - dput(dentry); - break; - } -+ if (err) -+ intent_release(it); - path_release(nd); - return_err: - return err; - } - -+int link_path_walk(const char * name, struct nameidata *nd) -+{ -+ return link_path_walk_it(name, nd, NULL); -+} -+ -+int path_walk_it(const char * name, struct nameidata *nd, struct lookup_intent *it) -+{ -+ current->total_link_count = 0; -+ return link_path_walk_it(name, nd, it); -+} -+ - int path_walk(const char * name, struct nameidata *nd) - { - current->total_link_count = 0; -- return link_path_walk(name, nd); -+ return link_path_walk_it(name, nd, NULL); - } - - /* SMP-safe */ -@@ -751,6 +830,17 @@ walk_init_root(const char *name, struct - } - - /* SMP-safe */ -+int path_lookup_it(const char *path, unsigned flags, struct nameidata *nd, -+ struct lookup_intent *it) -+{ -+ int error = 0; -+ if (path_init(path, flags, nd)) -+ error = path_walk_it(path, nd, it); -+ return error; -+} -+ -+ -+/* SMP-safe */ - int path_lookup(const char *path, unsigned flags, struct nameidata *nd) - { - int error = 0; -@@ -765,6 +855,7 @@ int path_init(const char *name, unsigned - { - nd->last_type = LAST_ROOT; /* if there are only slashes... */ - nd->flags = flags; -+ nd->it = NULL; - if (*name=='/') - return walk_init_root(name,nd); - read_lock(¤t->fs->lock); -@@ -779,7 +870,8 @@ int path_init(const char *name, unsigned - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --struct dentry * lookup_hash(struct qstr *name, struct dentry * base) -+struct dentry * lookup_hash_it(struct qstr *name, struct dentry * base, -+ struct lookup_intent *it) - { - struct dentry * dentry; - struct inode *inode; -@@ -802,13 +894,16 @@ struct dentry * lookup_hash(struct qstr - goto out; - } - -- dentry = cached_lookup(base, name, 0); -+ dentry = cached_lookup(base, name, 0, it); - if (!dentry) { - struct dentry *new = d_alloc(base, name); - dentry = ERR_PTR(-ENOMEM); - if (!new) - goto out; - lock_kernel(); -+ if (inode->i_op->lookup_it) -+ dentry = inode->i_op->lookup_it(inode, new, it, 0); -+ else - dentry = inode->i_op->lookup(inode, new); - unlock_kernel(); - if (!dentry) -@@ -820,6 +915,12 @@ out: - return dentry; - } - -+struct dentry * lookup_hash(struct qstr *name, struct dentry * base) -+{ -+ return lookup_hash_it(name, base, NULL); -+} -+ -+ - /* SMP-safe */ - struct dentry * lookup_one_len(const char * name, struct dentry * base, int len) - { -@@ -841,7 +942,7 @@ struct dentry * lookup_one_len(const cha - } - this.hash = end_name_hash(hash); - -- return lookup_hash(&this, base); -+ return lookup_hash_it(&this, base, NULL); - access: - return ERR_PTR(-EACCES); - } -@@ -872,6 +973,23 @@ int __user_walk(const char *name, unsign - return err; - } - -+int __user_walk_it(const char *name, unsigned flags, struct nameidata *nd, -+ struct lookup_intent *it) -+{ -+ char *tmp; -+ int err; -+ -+ tmp = getname(name); -+ err = PTR_ERR(tmp); -+ if (!IS_ERR(tmp)) { -+ err = 0; -+ if (path_init(tmp, flags, nd)) -+ err = path_walk_it(tmp, nd, it); -+ putname(tmp); -+ } -+ return err; -+} -+ - /* - * It's inline, so penalty for filesystems that don't use sticky bit is - * minimal. -@@ -969,7 +1087,8 @@ static inline int lookup_flags(unsigned - return retval; - } - --int vfs_create(struct inode *dir, struct dentry *dentry, int mode) -+static int vfs_create_it(struct inode *dir, struct dentry *dentry, int mode, -+ struct lookup_intent *it) - { - int error; - -@@ -982,12 +1101,15 @@ int vfs_create(struct inode *dir, struct - goto exit_lock; - - error = -EACCES; /* shouldn't it be ENOSYS? */ -- if (!dir->i_op || !dir->i_op->create) -+ if (!dir->i_op || (!dir->i_op->create && !dir->i_op->create_it)) - goto exit_lock; - - DQUOT_INIT(dir); - lock_kernel(); -- error = dir->i_op->create(dir, dentry, mode); -+ if (dir->i_op->create_it) -+ error = dir->i_op->create_it(dir, dentry, mode, it); -+ else -+ error = dir->i_op->create(dir, dentry, mode); - unlock_kernel(); - exit_lock: - up(&dir->i_zombie); -@@ -996,6 +1118,11 @@ exit_lock: - return error; - } - -+int vfs_create(struct inode *dir, struct dentry *dentry, int mode) -+{ -+ return vfs_create_it(dir, dentry, mode, NULL); -+} -+ - /* - * open_namei() - * -@@ -1010,7 +1137,8 @@ exit_lock: - * for symlinks (where the permissions are checked later). - * SMP-safe - */ --int open_namei(const char * pathname, int flag, int mode, struct nameidata *nd) -+int open_namei_it(const char *pathname, int flag, int mode, -+ struct nameidata *nd, struct lookup_intent *it) - { - int acc_mode, error = 0; - struct inode *inode; -@@ -1024,7 +1152,7 @@ int open_namei(const char * pathname, in - * The simplest case - just a plain lookup. - */ - if (!(flag & O_CREAT)) { -- error = path_lookup(pathname, lookup_flags(flag), nd); -+ error = path_lookup_it(pathname, lookup_flags(flag), nd, it); - if (error) - return error; - dentry = nd->dentry; -@@ -1034,6 +1162,10 @@ int open_namei(const char * pathname, in - /* - * Create - we need to know the parent. - */ -+ if (it) { -+ it->it_mode = mode; -+ it->it_op |= IT_CREAT; -+ } - error = path_lookup(pathname, LOOKUP_PARENT, nd); - if (error) - return error; -@@ -1049,7 +1181,7 @@ int open_namei(const char * pathname, in - - dir = nd->dentry; - down(&dir->d_inode->i_sem); -- dentry = lookup_hash(&nd->last, nd->dentry); -+ dentry = lookup_hash_it(&nd->last, nd->dentry, it); - - do_last: - error = PTR_ERR(dentry); -@@ -1058,10 +1190,11 @@ do_last: - goto exit; - } - -+ it->it_mode = mode; - /* Negative dentry, just create the file */ - if (!dentry->d_inode) { -- error = vfs_create(dir->d_inode, dentry, -- mode & ~current->fs->umask); -+ error = vfs_create_it(dir->d_inode, dentry, -+ mode & ~current->fs->umask, it); - up(&dir->d_inode->i_sem); - dput(nd->dentry); - nd->dentry = dentry; -@@ -1086,7 +1219,7 @@ do_last: - error = -ELOOP; - if (flag & O_NOFOLLOW) - goto exit_dput; -- while (__follow_down(&nd->mnt,&dentry) && d_mountpoint(dentry)); -+ while (__follow_down(&nd->mnt,&dentry,it) && d_mountpoint(dentry)); - } - error = -ENOENT; - if (!dentry->d_inode) -@@ -1165,7 +1298,7 @@ ok: - if (!error) { - DQUOT_INIT(inode); - -- error = do_truncate(dentry, 0); -+ error = do_truncate(dentry, 0, 1); - } - put_write_access(inode); - if (error) -@@ -1177,8 +1310,10 @@ ok: - return 0; - - exit_dput: -+ intent_release(it); - dput(dentry); - exit: -+ intent_release(it); - path_release(nd); - return error; - -@@ -1197,7 +1332,16 @@ do_link: - * are done. Procfs-like symlinks just set LAST_BIND. - */ - UPDATE_ATIME(dentry->d_inode); -+ nd->it = it; - error = dentry->d_inode->i_op->follow_link(dentry, nd); -+ if (error) { -+ intent_release(it); -+ } else if (it != NULL && !(it->it_int_flags & IT_FL_FOLLOWED)) { -+ /* vfs_follow_link was never called */ -+ intent_release(it); -+ path_release(nd); -+ error = -ENOLINK; -+ } - dput(dentry); - if (error) - return error; -@@ -1219,13 +1363,20 @@ do_link: - } - dir = nd->dentry; - down(&dir->d_inode->i_sem); -- dentry = lookup_hash(&nd->last, nd->dentry); -+ dentry = lookup_hash_it(&nd->last, nd->dentry, it); - putname(nd->last.name); - goto do_last; - } - -+int open_namei(const char *pathname, int flag, int mode, struct nameidata *nd) -+{ -+ return open_namei_it(pathname, flag, mode, nd, NULL); -+} -+ -+ - /* SMP-safe */ --static struct dentry *lookup_create(struct nameidata *nd, int is_dir) -+static struct dentry *lookup_create(struct nameidata *nd, int is_dir, -+ struct lookup_intent *it) - { - struct dentry *dentry; - -@@ -1233,7 +1384,7 @@ static struct dentry *lookup_create(stru - dentry = ERR_PTR(-EEXIST); - if (nd->last_type != LAST_NORM) - goto fail; -- dentry = lookup_hash(&nd->last, nd->dentry); -+ dentry = lookup_hash_it(&nd->last, nd->dentry, it); - if (IS_ERR(dentry)) - goto fail; - if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode) -@@ -1289,7 +1440,16 @@ asmlinkage long sys_mknod(const char * f - error = path_lookup(tmp, LOOKUP_PARENT, &nd); - if (error) - goto out; -- dentry = lookup_create(&nd, 0); -+ -+ if (nd.dentry->d_inode->i_op->mknod_raw) { -+ struct inode_operations *op = nd.dentry->d_inode->i_op; -+ error = op->mknod_raw(&nd, mode, dev); -+ /* the file system wants to use normal vfs path now */ -+ if (error != -EOPNOTSUPP) -+ goto out2; -+ } -+ -+ dentry = lookup_create(&nd, 0, NULL); - error = PTR_ERR(dentry); - - mode &= ~current->fs->umask; -@@ -1310,6 +1470,7 @@ asmlinkage long sys_mknod(const char * f - dput(dentry); - } - up(&nd.dentry->d_inode->i_sem); -+out2: - path_release(&nd); - out: - putname(tmp); -@@ -1357,7 +1518,14 @@ asmlinkage long sys_mkdir(const char * p - error = path_lookup(tmp, LOOKUP_PARENT, &nd); - if (error) - goto out; -- dentry = lookup_create(&nd, 1); -+ if (nd.dentry->d_inode->i_op->mkdir_raw) { -+ struct inode_operations *op = nd.dentry->d_inode->i_op; -+ error = op->mkdir_raw(&nd, mode); -+ /* the file system wants to use normal vfs path now */ -+ if (error != -EOPNOTSUPP) -+ goto out2; -+ } -+ dentry = lookup_create(&nd, 1, NULL); - error = PTR_ERR(dentry); - if (!IS_ERR(dentry)) { - error = vfs_mkdir(nd.dentry->d_inode, dentry, -@@ -1365,6 +1533,7 @@ asmlinkage long sys_mkdir(const char * p - dput(dentry); - } - up(&nd.dentry->d_inode->i_sem); -+out2: - path_release(&nd); - out: - putname(tmp); -@@ -1465,8 +1634,16 @@ asmlinkage long sys_rmdir(const char * p - error = -EBUSY; - goto exit1; - } -+ if (nd.dentry->d_inode->i_op->rmdir_raw) { -+ struct inode_operations *op = nd.dentry->d_inode->i_op; -+ -+ error = op->rmdir_raw(&nd); -+ /* the file system wants to use normal vfs path now */ -+ if (error != -EOPNOTSUPP) -+ goto exit1; -+ } - down(&nd.dentry->d_inode->i_sem); -- dentry = lookup_hash(&nd.last, nd.dentry); -+ dentry = lookup_hash_it(&nd.last, nd.dentry, NULL); - error = PTR_ERR(dentry); - if (!IS_ERR(dentry)) { - error = vfs_rmdir(nd.dentry->d_inode, dentry); -@@ -1524,8 +1701,15 @@ asmlinkage long sys_unlink(const char * - error = -EISDIR; - if (nd.last_type != LAST_NORM) - goto exit1; -+ if (nd.dentry->d_inode->i_op->unlink_raw) { -+ struct inode_operations *op = nd.dentry->d_inode->i_op; -+ error = op->unlink_raw(&nd); -+ /* the file system wants to use normal vfs path now */ -+ if (error != -EOPNOTSUPP) -+ goto exit1; -+ } - down(&nd.dentry->d_inode->i_sem); -- dentry = lookup_hash(&nd.last, nd.dentry); -+ dentry = lookup_hash_it(&nd.last, nd.dentry, NULL); - error = PTR_ERR(dentry); - if (!IS_ERR(dentry)) { - /* Why not before? Because we want correct error value */ -@@ -1592,15 +1776,23 @@ asmlinkage long sys_symlink(const char * - error = path_lookup(to, LOOKUP_PARENT, &nd); - if (error) - goto out; -- dentry = lookup_create(&nd, 0); -+ if (nd.dentry->d_inode->i_op->symlink_raw) { -+ struct inode_operations *op = nd.dentry->d_inode->i_op; -+ error = op->symlink_raw(&nd, from); -+ /* the file system wants to use normal vfs path now */ -+ if (error != -EOPNOTSUPP) -+ goto out2; -+ } -+ dentry = lookup_create(&nd, 0, NULL); - error = PTR_ERR(dentry); - if (!IS_ERR(dentry)) { - error = vfs_symlink(nd.dentry->d_inode, dentry, from); - dput(dentry); - } - up(&nd.dentry->d_inode->i_sem); -+ out2: - path_release(&nd); --out: -+ out: - putname(to); - } - putname(from); -@@ -1676,7 +1868,14 @@ asmlinkage long sys_link(const char * ol - error = -EXDEV; - if (old_nd.mnt != nd.mnt) - goto out_release; -- new_dentry = lookup_create(&nd, 0); -+ if (nd.dentry->d_inode->i_op->link_raw) { -+ struct inode_operations *op = nd.dentry->d_inode->i_op; -+ error = op->link_raw(&old_nd, &nd); -+ /* the file system wants to use normal vfs path now */ -+ if (error != -EOPNOTSUPP) -+ goto out_release; -+ } -+ new_dentry = lookup_create(&nd, 0, NULL); - error = PTR_ERR(new_dentry); - if (!IS_ERR(new_dentry)) { - error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry); -@@ -1720,7 +1919,7 @@ exit: - * locking]. - */ - int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry, -- struct inode *new_dir, struct dentry *new_dentry) -+ struct inode *new_dir, struct dentry *new_dentry) - { - int error; - struct inode *target; -@@ -1799,7 +1998,7 @@ out_unlock: - } - - int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry, -- struct inode *new_dir, struct dentry *new_dentry) -+ struct inode *new_dir, struct dentry *new_dentry) - { - int error; - -@@ -1887,9 +2086,18 @@ static inline int do_rename(const char * - if (newnd.last_type != LAST_NORM) - goto exit2; - -+ if (old_dir->d_inode->i_op->rename_raw) { -+ lock_kernel(); -+ error = old_dir->d_inode->i_op->rename_raw(&oldnd, &newnd); -+ unlock_kernel(); -+ /* the file system wants to use normal vfs path now */ -+ if (error != -EOPNOTSUPP) -+ goto exit2; -+ } -+ - double_lock(new_dir, old_dir); - -- old_dentry = lookup_hash(&oldnd.last, old_dir); -+ old_dentry = lookup_hash_it(&oldnd.last, old_dir, NULL); - error = PTR_ERR(old_dentry); - if (IS_ERR(old_dentry)) - goto exit3; -@@ -1905,16 +2113,16 @@ static inline int do_rename(const char * - if (newnd.last.name[newnd.last.len]) - goto exit4; - } -- new_dentry = lookup_hash(&newnd.last, new_dir); -+ new_dentry = lookup_hash_it(&newnd.last, new_dir, NULL); - error = PTR_ERR(new_dentry); - if (IS_ERR(new_dentry)) - goto exit4; - -+ - lock_kernel(); - error = vfs_rename(old_dir->d_inode, old_dentry, - new_dir->d_inode, new_dentry); - unlock_kernel(); -- - dput(new_dentry); - exit4: - dput(old_dentry); -@@ -1965,20 +2173,28 @@ out: - } - - static inline int --__vfs_follow_link(struct nameidata *nd, const char *link) -+__vfs_follow_link(struct nameidata *nd, const char *link, -+ struct lookup_intent *it) - { - int res = 0; - char *name; - if (IS_ERR(link)) - goto fail; - -+ if (it == NULL) -+ it = nd->it; -+ else if (it != nd->it) -+ printk("it != nd->it: tell phil@clusterfs.com\n"); -+ if (it != NULL) -+ it->it_int_flags |= IT_FL_FOLLOWED; -+ - if (*link == '/') { - path_release(nd); - if (!walk_init_root(link, nd)) - /* weird __emul_prefix() stuff did it */ - goto out; - } -- res = link_path_walk(link, nd); -+ res = link_path_walk_it(link, nd, it); - out: - if (current->link_count || res || nd->last_type!=LAST_NORM) - return res; -@@ -2002,7 +2218,13 @@ fail: - - int vfs_follow_link(struct nameidata *nd, const char *link) - { -- return __vfs_follow_link(nd, link); -+ return __vfs_follow_link(nd, link, NULL); -+} -+ -+int vfs_follow_link_it(struct nameidata *nd, const char *link, -+ struct lookup_intent *it) -+{ -+ return __vfs_follow_link(nd, link, it); - } - - /* get the link contents into pagecache */ -@@ -2044,7 +2266,7 @@ int page_follow_link(struct dentry *dent - { - struct page *page = NULL; - char *s = page_getlink(dentry, &page); -- int res = __vfs_follow_link(nd, s); -+ int res = __vfs_follow_link(nd, s, NULL); - if (page) { - kunmap(page); - page_cache_release(page); ---- kernel-2.4.20-6chaos_18_7/fs/open.c~vfs_intent_2.4.20_chaos Tue Jun 24 09:11:51 2003 -+++ kernel-2.4.20-6chaos_18_7-shaver/fs/open.c Wed Jul 16 04:21:21 2003 -@@ -19,6 +19,8 @@ - #include - - #define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m)) -+extern int path_walk_it(const char *name, struct nameidata *nd, -+ struct lookup_intent *it); - - int vfs_statfs(struct super_block *sb, struct statfs *buf) - { -@@ -95,9 +97,10 @@ void fd_install(unsigned int fd, struct - write_unlock(&files->file_lock); - } - --int do_truncate(struct dentry *dentry, loff_t length) -+int do_truncate(struct dentry *dentry, loff_t length, int called_from_open) - { - struct inode *inode = dentry->d_inode; -+ struct inode_operations *op = dentry->d_inode->i_op; - int error; - struct iattr newattrs; - -@@ -108,7 +111,13 @@ int do_truncate(struct dentry *dentry, l - down(&inode->i_sem); - newattrs.ia_size = length; - newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME; -- error = notify_change(dentry, &newattrs); -+ if (called_from_open) -+ newattrs.ia_valid |= ATTR_FROM_OPEN; -+ if (op->setattr_raw) { -+ newattrs.ia_valid |= ATTR_RAW; -+ error = op->setattr_raw(inode, &newattrs); -+ } else -+ error = notify_change(dentry, &newattrs); - up(&inode->i_sem); - return error; - } -@@ -118,12 +127,13 @@ static inline long do_sys_truncate(const - struct nameidata nd; - struct inode * inode; - int error; -+ struct lookup_intent it = { .it_op = IT_GETATTR }; - - error = -EINVAL; - if (length < 0) /* sorry, but loff_t says... */ - goto out; - -- error = user_path_walk(path, &nd); -+ error = user_path_walk_it(path, &nd, &it); - if (error) - goto out; - inode = nd.dentry->d_inode; -@@ -163,11 +173,13 @@ static inline long do_sys_truncate(const - error = locks_verify_truncate(inode, NULL, length); - if (!error) { - DQUOT_INIT(inode); -- error = do_truncate(nd.dentry, length); -+ intent_release(&it); -+ error = do_truncate(nd.dentry, length, 0); - } - put_write_access(inode); - - dput_and_out: -+ intent_release(&it); - path_release(&nd); - out: - return error; -@@ -215,7 +227,7 @@ static inline long do_sys_ftruncate(unsi - - error = locks_verify_truncate(inode, file, length); - if (!error) -- error = do_truncate(dentry, length); -+ error = do_truncate(dentry, length, 0); - out_putf: - fput(file); - out: -@@ -260,11 +272,13 @@ asmlinkage long sys_utime(char * filenam - struct inode * inode; - struct iattr newattrs; - -- error = user_path_walk(filename, &nd); -+ error = user_path_walk_it(filename, &nd, NULL); - if (error) - goto out; - inode = nd.dentry->d_inode; - -+ /* this is safe without a Lustre lock because it only depends -+ on the super block */ - error = -EROFS; - if (IS_RDONLY(inode)) - goto dput_and_out; -@@ -279,11 +293,25 @@ asmlinkage long sys_utime(char * filenam - goto dput_and_out; - - newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET; -- } else { -+ } -+ -+ if (inode->i_op->setattr_raw) { -+ struct inode_operations *op = nd.dentry->d_inode->i_op; -+ -+ newattrs.ia_valid |= ATTR_RAW; -+ error = op->setattr_raw(inode, &newattrs); -+ /* the file system wants to use normal vfs path now */ -+ if (error != -EOPNOTSUPP) -+ goto dput_and_out; -+ } -+ -+ error = -EPERM; -+ if (!times) { - if (current->fsuid != inode->i_uid && - (error = permission(inode,MAY_WRITE)) != 0) - goto dput_and_out; - } -+ - error = notify_change(nd.dentry, &newattrs); - dput_and_out: - path_release(&nd); -@@ -304,12 +332,14 @@ asmlinkage long sys_utimes(char * filena - struct inode * inode; - struct iattr newattrs; - -- error = user_path_walk(filename, &nd); -+ error = user_path_walk_it(filename, &nd, NULL); - - if (error) - goto out; - inode = nd.dentry->d_inode; - -+ /* this is safe without a Lustre lock because it only depends -+ on the super block */ - error = -EROFS; - if (IS_RDONLY(inode)) - goto dput_and_out; -@@ -324,7 +354,20 @@ asmlinkage long sys_utimes(char * filena - newattrs.ia_atime = times[0].tv_sec; - newattrs.ia_mtime = times[1].tv_sec; - newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET; -- } else { -+ } -+ -+ if (inode->i_op->setattr_raw) { -+ struct inode_operations *op = nd.dentry->d_inode->i_op; -+ -+ newattrs.ia_valid |= ATTR_RAW; -+ error = op->setattr_raw(inode, &newattrs); -+ /* the file system wants to use normal vfs path now */ -+ if (error != -EOPNOTSUPP) -+ goto dput_and_out; -+ } -+ -+ error = -EPERM; -+ if (!utimes) { - if (current->fsuid != inode->i_uid && - (error = permission(inode,MAY_WRITE)) != 0) - goto dput_and_out; -@@ -347,6 +390,7 @@ asmlinkage long sys_access(const char * - int old_fsuid, old_fsgid; - kernel_cap_t old_cap; - int res; -+ struct lookup_intent it = { .it_op = IT_GETATTR }; - - if (mode & ~S_IRWXO) /* where's F_OK, X_OK, W_OK, R_OK? */ - return -EINVAL; -@@ -364,13 +408,14 @@ asmlinkage long sys_access(const char * - else - current->cap_effective = current->cap_permitted; - -- res = user_path_walk(filename, &nd); -+ res = user_path_walk_it(filename, &nd, &it); - if (!res) { - res = permission(nd.dentry->d_inode, mode); - /* SuS v2 requires we report a read only fs too */ - if(!res && (mode & S_IWOTH) && IS_RDONLY(nd.dentry->d_inode) - && !special_file(nd.dentry->d_inode->i_mode)) - res = -EROFS; -+ intent_release(&it); - path_release(&nd); - } - -@@ -385,8 +430,9 @@ asmlinkage long sys_chdir(const char * f - { - int error; - struct nameidata nd; -+ struct lookup_intent it = { .it_op = IT_GETATTR }; - -- error = __user_walk(filename,LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY,&nd); -+ error = __user_walk_it(filename,LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY,&nd, &it); - if (error) - goto out; - -@@ -397,6 +443,7 @@ asmlinkage long sys_chdir(const char * f - set_fs_pwd(current->fs, nd.mnt, nd.dentry); - - dput_and_out: -+ intent_release(&it); - path_release(&nd); - out: - return error; -@@ -436,9 +483,10 @@ asmlinkage long sys_chroot(const char * - { - int error; - struct nameidata nd; -+ struct lookup_intent it = { .it_op = IT_GETATTR }; - -- error = __user_walk(filename, LOOKUP_POSITIVE | LOOKUP_FOLLOW | -- LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd); -+ error = __user_walk_it(filename, LOOKUP_POSITIVE | LOOKUP_FOLLOW | -+ LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd, &it); - if (error) - goto out; - -@@ -454,6 +502,7 @@ asmlinkage long sys_chroot(const char * - set_fs_altroot(); - error = 0; - dput_and_out: -+ intent_release(&it); - path_release(&nd); - out: - return error; -@@ -508,6 +557,18 @@ asmlinkage long sys_chmod(const char * f - if (IS_RDONLY(inode)) - goto dput_and_out; - -+ if (inode->i_op->setattr_raw) { -+ struct inode_operations *op = nd.dentry->d_inode->i_op; -+ -+ newattrs.ia_mode = mode; -+ newattrs.ia_valid = ATTR_MODE | ATTR_CTIME; -+ newattrs.ia_valid |= ATTR_RAW; -+ error = op->setattr_raw(inode, &newattrs); -+ /* the file system wants to use normal vfs path now */ -+ if (error != -EOPNOTSUPP) -+ goto dput_and_out; -+ } -+ - error = -EPERM; - if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) - goto dput_and_out; -@@ -538,6 +599,20 @@ static int chown_common(struct dentry * - error = -EROFS; - if (IS_RDONLY(inode)) - goto out; -+ -+ if (inode->i_op->setattr_raw) { -+ struct inode_operations *op = dentry->d_inode->i_op; -+ -+ newattrs.ia_uid = user; -+ newattrs.ia_gid = group; -+ newattrs.ia_valid = ATTR_UID | ATTR_GID | ATTR_CTIME; -+ newattrs.ia_valid |= ATTR_RAW; -+ error = op->setattr_raw(inode, &newattrs); -+ /* the file system wants to use normal vfs path now */ -+ if (error != -EOPNOTSUPP) -+ return error; -+ } -+ - error = -EPERM; - if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) - goto out; -@@ -642,8 +717,9 @@ struct file *filp_open(const char * file - { - int namei_flags, error; - struct nameidata nd; -- -- flags &= ~O_DIRECT; -+ struct lookup_intent it = { .it_op = IT_OPEN, .it_flags = flags }; -+ -+ //flags &= ~O_DIRECT; - - namei_flags = flags; - if ((namei_flags+1) & O_ACCMODE) -@@ -651,14 +727,15 @@ struct file *filp_open(const char * file - if (namei_flags & O_TRUNC) - namei_flags |= 2; - -- error = open_namei(filename, namei_flags, mode, &nd); -- if (!error) -- return dentry_open(nd.dentry, nd.mnt, flags); -+ error = open_namei_it(filename, namei_flags, mode, &nd, &it); -+ if (error) -+ return ERR_PTR(error); - -- return ERR_PTR(error); -+ return dentry_open_it(nd.dentry, nd.mnt, flags, &it); - } - --struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags) -+struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt, -+ int flags, struct lookup_intent *it) - { - struct file * f; - struct inode *inode; -@@ -695,12 +772,15 @@ struct file *dentry_open(struct dentry * - } - - if (f->f_op && f->f_op->open) { -+ f->f_it = it; - error = f->f_op->open(inode,f); -+ f->f_it = NULL; - if (error) - goto cleanup_all; - } - f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC); - -+ intent_release(it); - return f; - - cleanup_all: -@@ -715,11 +795,17 @@ cleanup_all: - cleanup_file: - put_filp(f); - cleanup_dentry: -+ intent_release(it); - dput(dentry); - mntput(mnt); - return ERR_PTR(error); - } - -+struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags) -+{ -+ return dentry_open_it(dentry, mnt, flags, NULL); -+} -+ - /* - * Find an empty file descriptor entry, and mark it busy. - */ ---- kernel-2.4.20-6chaos_18_7/fs/stat.c~vfs_intent_2.4.20_chaos Thu May 15 20:14:25 2003 -+++ kernel-2.4.20-6chaos_18_7-shaver/fs/stat.c Wed Jul 16 04:21:21 2003 -@@ -17,21 +17,23 @@ - * Revalidate the inode. This is required for proper NFS attribute caching. - */ - static __inline__ int --do_revalidate(struct dentry *dentry) -+do_revalidate(struct dentry *dentry, struct lookup_intent *it) - { - struct inode * inode = dentry->d_inode; -- if (inode->i_op && inode->i_op->revalidate) -+ if (inode->i_op && inode->i_op->revalidate_it) -+ return inode->i_op->revalidate_it(dentry, it); -+ else if (inode->i_op && inode->i_op->revalidate) - return inode->i_op->revalidate(dentry); - return 0; - } - --static int do_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) -+static int do_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat, struct lookup_intent *it) - { - int res = 0; - unsigned int blocks, indirect; - struct inode *inode = dentry->d_inode; - -- res = do_revalidate(dentry); -+ res = do_revalidate(dentry, it); - if (res) - return res; - -@@ -104,10 +106,12 @@ int vfs_stat(char *name, struct kstat *s - { - struct nameidata nd; - int error; -+ struct lookup_intent it = { .it_op = IT_GETATTR }; - -- error = user_path_walk(name, &nd); -+ error = user_path_walk_it(name, &nd, &it); - if (!error) { -- error = do_getattr(nd.mnt, nd.dentry, stat); -+ error = do_getattr(nd.mnt, nd.dentry, stat, &it); -+ intent_release(&it); - path_release(&nd); - } - return error; -@@ -117,10 +121,12 @@ int vfs_lstat(char *name, struct kstat * - { - struct nameidata nd; - int error; -+ struct lookup_intent it = { .it_op = IT_GETATTR }; - -- error = user_path_walk_link(name, &nd); -+ error = user_path_walk_link_it(name, &nd, &it); - if (!error) { -- error = do_getattr(nd.mnt, nd.dentry, stat); -+ error = do_getattr(nd.mnt, nd.dentry, stat, &it); -+ intent_release(&it); - path_release(&nd); - } - return error; -@@ -132,7 +138,7 @@ int vfs_fstat(unsigned int fd, struct ks - int error = -EBADF; - - if (f) { -- error = do_getattr(f->f_vfsmnt, f->f_dentry, stat); -+ error = do_getattr(f->f_vfsmnt, f->f_dentry, stat, NULL); - fput(f); - } - return error; -@@ -279,7 +285,7 @@ asmlinkage long sys_readlink(const char - - error = -EINVAL; - if (inode->i_op && inode->i_op->readlink && -- !(error = do_revalidate(nd.dentry))) { -+ !(error = do_revalidate(nd.dentry, NULL))) { - UPDATE_ATIME(inode); - error = inode->i_op->readlink(nd.dentry, buf, bufsiz); - } ---- kernel-2.4.20-6chaos_18_7/fs/proc/base.c~vfs_intent_2.4.20_chaos Mon Jun 23 05:49:00 2003 -+++ kernel-2.4.20-6chaos_18_7-shaver/fs/proc/base.c Wed Jul 16 04:21:21 2003 -@@ -465,6 +465,9 @@ static int proc_pid_follow_link(struct d - - error = inode->u.proc_i.op.proc_get_link(inode, &nd->dentry, &nd->mnt); - nd->last_type = LAST_BIND; -+ -+ if (nd->it != NULL) -+ nd->it->it_int_flags |= IT_FL_FOLLOWED; - out: - return error; - } ---- kernel-2.4.20-6chaos_18_7/include/linux/dcache.h~vfs_intent_2.4.20_chaos Tue Jun 24 10:31:16 2003 -+++ kernel-2.4.20-6chaos_18_7-shaver/include/linux/dcache.h Wed Jul 16 04:22:30 2003 -@@ -6,6 +6,45 @@ - #include - #include - #include -+#include -+ -+#define IT_OPEN 0x0001 -+#define IT_CREAT 0x0002 -+#define IT_READDIR 0x0004 -+#define IT_GETATTR 0x0008 -+#define IT_LOOKUP 0x0010 -+#define IT_UNLINK 0x0020 -+#define IT_GETXATTR 0x0040 -+#define IT_EXEC 0x0080 -+#define IT_PIN 0x0100 -+ -+#define IT_FL_LOCKED 0x0001 -+#define IT_FL_FOLLOWED 0x0002 /* set by vfs_follow_link */ -+ -+#define INTENT_MAGIC 0x19620323 -+ -+struct lookup_intent { -+ int it_op; -+ void (*it_op_release)(struct lookup_intent *); -+ int it_magic; -+ int it_mode; -+ int it_flags; -+ int it_disposition; -+ int it_status; -+ int it_int_flags; -+ __u64 it_lock_handle[2]; -+ int it_lock_mode; -+ void *it_data; -+}; -+ -+static inline void intent_init(struct lookup_intent *it, int op, int flags) -+{ -+ memset(it, 0, sizeof(*it)); -+ it->it_magic = INTENT_MAGIC; -+ it->it_op = op; -+ it->it_flags = flags; -+} -+ - - /* - * linux/include/linux/dcache.h -@@ -96,8 +135,22 @@ struct dentry_operations { - int (*d_delete)(struct dentry *); - void (*d_release)(struct dentry *); - void (*d_iput)(struct dentry *, struct inode *); -+ int (*d_revalidate_it)(struct dentry *, int, struct lookup_intent *); -+ void (*d_pin)(struct dentry *, struct vfsmount * , int); -+ void (*d_unpin)(struct dentry *, struct vfsmount *, int); - }; - -+#define PIN(de,mnt,flag) if (de->d_op && de->d_op->d_pin) \ -+ de->d_op->d_pin(de, mnt, flag); -+#define UNPIN(de,mnt,flag) if (de->d_op && de->d_op->d_unpin) \ -+ de->d_op->d_unpin(de, mnt, flag); -+ -+ -+/* defined in fs/namei.c */ -+extern void intent_release(struct lookup_intent *it); -+/* defined in fs/dcache.c */ -+extern void __d_rehash(struct dentry * entry, int lock); -+ - /* the dentry parameter passed to d_hash and d_compare is the parent - * directory of the entries to be compared. It is used in case these - * functions need any directory specific information for determining -@@ -129,6 +182,7 @@ d_iput: no no yes - * s_nfsd_free_path semaphore will be down - */ - #define DCACHE_REFERENCED 0x0008 /* Recently used, don't discard. */ -+#define DCACHE_LUSTRE_INVALID 0x0010 /* Lustre invalidated */ - - extern spinlock_t dcache_lock; - ---- kernel-2.4.20-6chaos_18_7/include/linux/fs.h~vfs_intent_2.4.20_chaos Wed Jul 16 04:21:20 2003 -+++ kernel-2.4.20-6chaos_18_7-shaver/include/linux/fs.h Wed Jul 16 04:21:21 2003 -@@ -337,6 +337,9 @@ extern void set_bh_page(struct buffer_he - #define ATTR_MTIME_SET 256 - #define ATTR_FORCE 512 /* Not a change, but a change it */ - #define ATTR_ATTR_FLAG 1024 -+#define ATTR_RAW 0x0800 /* file system, not vfs will massage attrs */ -+#define ATTR_FROM_OPEN 0x1000 /* called from open path, ie O_TRUNC */ -+#define ATTR_CTIME_SET 0x2000 - - /* - * This is the Inode Attributes structure, used for notify_change(). It -@@ -574,6 +577,7 @@ struct file { - - /* needed for tty driver, and maybe others */ - void *private_data; -+ struct lookup_intent *f_it; - - /* preallocated helper kiobuf to speedup O_DIRECT */ - struct kiobuf *f_iobuf; -@@ -701,6 +705,7 @@ struct nameidata { - struct qstr last; - unsigned int flags; - int last_type; -+ struct lookup_intent *it; - }; - - /* -@@ -821,7 +826,8 @@ extern int vfs_symlink(struct inode *, s - extern int vfs_link(struct dentry *, struct inode *, struct dentry *); - extern int vfs_rmdir(struct inode *, struct dentry *); - extern int vfs_unlink(struct inode *, struct dentry *); --extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *); -+int vfs_rename(struct inode *old_dir, struct dentry *old_dentry, -+ struct inode *new_dir, struct dentry *new_dentry); - - /* - * File types -@@ -881,21 +887,32 @@ struct file_operations { - - struct inode_operations { - int (*create) (struct inode *,struct dentry *,int); -+ int (*create_it) (struct inode *,struct dentry *,int, struct lookup_intent *); - struct dentry * (*lookup) (struct inode *,struct dentry *); -+ struct dentry * (*lookup_it) (struct inode *,struct dentry *, struct lookup_intent *, int flags); - int (*link) (struct dentry *,struct inode *,struct dentry *); -+ int (*link_raw) (struct nameidata *,struct nameidata *); - int (*unlink) (struct inode *,struct dentry *); -+ int (*unlink_raw) (struct nameidata *); - int (*symlink) (struct inode *,struct dentry *,const char *); -+ int (*symlink_raw) (struct nameidata *,const char *); - int (*mkdir) (struct inode *,struct dentry *,int); -+ int (*mkdir_raw) (struct nameidata *,int); - int (*rmdir) (struct inode *,struct dentry *); -+ int (*rmdir_raw) (struct nameidata *); - int (*mknod) (struct inode *,struct dentry *,int,int); -+ int (*mknod_raw) (struct nameidata *,int,dev_t); - int (*rename) (struct inode *, struct dentry *, - struct inode *, struct dentry *); -+ int (*rename_raw) (struct nameidata *, struct nameidata *); - int (*readlink) (struct dentry *, char *,int); - int (*follow_link) (struct dentry *, struct nameidata *); - void (*truncate) (struct inode *); - int (*permission) (struct inode *, int); - int (*revalidate) (struct dentry *); -+ int (*revalidate_it) (struct dentry *, struct lookup_intent *); - int (*setattr) (struct dentry *, struct iattr *); -+ int (*setattr_raw) (struct inode *, struct iattr *); - int (*getattr) (struct dentry *, struct iattr *); - int (*setxattr) (struct dentry *, const char *, void *, size_t, int); - ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t); -@@ -1093,10 +1110,14 @@ static inline int get_lease(struct inode - - asmlinkage long sys_open(const char *, int, int); - asmlinkage long sys_close(unsigned int); /* yes, it's really unsigned */ --extern int do_truncate(struct dentry *, loff_t start); -+extern int do_truncate(struct dentry *, loff_t start, int called_from_open); - - extern struct file *filp_open(const char *, int, int); - extern struct file * dentry_open(struct dentry *, struct vfsmount *, int); -+extern int open_namei_it(const char *filename, int namei_flags, int mode, -+ struct nameidata *nd, struct lookup_intent *it); -+extern struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt, -+ int flags, struct lookup_intent *it); - extern int filp_close(struct file *, fl_owner_t id); - extern char * getname(const char *); - -@@ -1387,6 +1408,7 @@ typedef int (*read_actor_t)(read_descrip - extern loff_t default_llseek(struct file *file, loff_t offset, int origin); - - extern int FASTCALL(__user_walk(const char *, unsigned, struct nameidata *)); -+extern int FASTCALL(__user_walk_it(const char *, unsigned, struct nameidata *, struct lookup_intent *it)); - extern int FASTCALL(path_init(const char *, unsigned, struct nameidata *)); - extern int FASTCALL(path_walk(const char *, struct nameidata *)); - extern int FASTCALL(path_lookup(const char *, unsigned, struct nameidata *)); -@@ -1398,6 +1420,8 @@ extern struct dentry * lookup_one_len(co - extern struct dentry * lookup_hash(struct qstr *, struct dentry *); - #define user_path_walk(name,nd) __user_walk(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, nd) - #define user_path_walk_link(name,nd) __user_walk(name, LOOKUP_POSITIVE, nd) -+#define user_path_walk_it(name,nd,it) __user_walk_it(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, nd, it) -+#define user_path_walk_link_it(name,nd,it) __user_walk_it(name, LOOKUP_POSITIVE, nd, it) - - extern void inode_init_once(struct inode *); - extern void iput(struct inode *); -@@ -1497,6 +1521,8 @@ extern struct file_operations generic_ro - - extern int vfs_readlink(struct dentry *, char *, int, const char *); - extern int vfs_follow_link(struct nameidata *, const char *); -+extern int vfs_follow_link_it(struct nameidata *, const char *, -+ struct lookup_intent *it); - extern int page_readlink(struct dentry *, char *, int); - extern int page_follow_link(struct dentry *, struct nameidata *); - extern struct inode_operations page_symlink_inode_operations; ---- kernel-2.4.20-6chaos_18_7/include/linux/fs_struct.h~vfs_intent_2.4.20_chaos Tue Jun 24 10:31:16 2003 -+++ kernel-2.4.20-6chaos_18_7-shaver/include/linux/fs_struct.h Wed Jul 16 04:21:21 2003 -@@ -37,10 +37,12 @@ static inline void set_fs_root(struct fs - write_lock(&fs->lock); - old_root = fs->root; - old_rootmnt = fs->rootmnt; -+ PIN(dentry, mnt, 1); - fs->rootmnt = mntget(mnt); - fs->root = dget(dentry); - write_unlock(&fs->lock); - if (old_root) { -+ UNPIN(old_root, old_rootmnt, 1); - dput(old_root); - mntput(old_rootmnt); - } -@@ -60,10 +62,12 @@ static inline void set_fs_pwd(struct fs_ - write_lock(&fs->lock); - old_pwd = fs->pwd; - old_pwdmnt = fs->pwdmnt; -+ PIN(dentry, mnt, 0); - fs->pwdmnt = mntget(mnt); - fs->pwd = dget(dentry); - write_unlock(&fs->lock); - if (old_pwd) { -+ UNPIN(old_pwd, old_pwdmnt, 0); - dput(old_pwd); - mntput(old_pwdmnt); - } ---- kernel-2.4.20-6chaos_18_7/kernel/ksyms.c~vfs_intent_2.4.20_chaos Wed Jul 16 04:21:20 2003 -+++ kernel-2.4.20-6chaos_18_7-shaver/kernel/ksyms.c Wed Jul 16 04:21:21 2003 -@@ -299,6 +299,7 @@ EXPORT_SYMBOL(read_cache_page); - EXPORT_SYMBOL(set_page_dirty); - EXPORT_SYMBOL(vfs_readlink); - EXPORT_SYMBOL(vfs_follow_link); -+EXPORT_SYMBOL(vfs_follow_link_it); - EXPORT_SYMBOL(page_readlink); - EXPORT_SYMBOL(page_follow_link); - EXPORT_SYMBOL(page_symlink_inode_operations); ---- kernel-2.4.20-6chaos_18_7/kernel/fork.c~vfs_intent_2.4.20_chaos Thu Jun 19 10:06:09 2003 -+++ kernel-2.4.20-6chaos_18_7-shaver/kernel/fork.c Wed Jul 16 04:21:21 2003 -@@ -385,10 +385,13 @@ static inline struct fs_struct *__copy_f - fs->umask = old->umask; - read_lock(&old->lock); - fs->rootmnt = mntget(old->rootmnt); -+ PIN(old->pwd, old->pwdmnt, 0); -+ PIN(old->root, old->rootmnt, 1); - fs->root = dget(old->root); - fs->pwdmnt = mntget(old->pwdmnt); - fs->pwd = dget(old->pwd); - if (old->altroot) { -+ PIN(old->altroot, old->altrootmnt, 1); - fs->altrootmnt = mntget(old->altrootmnt); - fs->altroot = dget(old->altroot); - } else { ---- kernel-2.4.20-6chaos_18_7/kernel/exit.c~vfs_intent_2.4.20_chaos Thu Jun 19 10:06:09 2003 -+++ kernel-2.4.20-6chaos_18_7-shaver/kernel/exit.c Wed Jul 16 04:21:21 2003 -@@ -241,11 +241,14 @@ static inline void __put_fs_struct(struc - { - /* No need to hold fs->lock if we are killing it */ - if (atomic_dec_and_test(&fs->count)) { -+ UNPIN(fs->pwd, fs->pwdmnt, 0); -+ UNPIN(fs->root, fs->rootmnt, 1); - dput(fs->root); - mntput(fs->rootmnt); - dput(fs->pwd); - mntput(fs->pwdmnt); - if (fs->altroot) { -+ UNPIN(fs->altroot, fs->altrootmnt, 1); - dput(fs->altroot); - mntput(fs->altrootmnt); - } - -_ diff --git a/lustre/kernel_patches/patches/vfs_races_2.5.72_rev1.patch b/lustre/kernel_patches/patches/vfs_races_2.5.72_rev1.patch index f1eeb01..1dfed66 100644 --- a/lustre/kernel_patches/patches/vfs_races_2.5.72_rev1.patch +++ b/lustre/kernel_patches/patches/vfs_races_2.5.72_rev1.patch @@ -1,10 +1,9 @@ fs/dcache.c | 24 ++++++++++++++++++++---- - fs/namei.c | 4 +++- include/linux/dcache.h | 2 ++ - 3 files changed, 25 insertions(+), 5 deletions(-) + 2 files changed, 22 insertions(+), 4 deletions(-) ---- linux-2.5.72/fs/dcache.c~vfs_races_2.5.72_rev1 2003-06-16 22:19:41.000000000 -0600 -+++ linux-2.5.72-braam/fs/dcache.c 2003-06-25 08:33:08.000000000 -0600 +--- linux-2.6.0-test1/fs/dcache.c~vfs_races_2.5.72_rev1 2003-07-24 15:52:47.000000000 +0400 ++++ linux-2.6.0-test1-alexey/fs/dcache.c 2003-09-13 16:21:16.000000000 +0400 @@ -212,7 +212,14 @@ int d_invalidate(struct dentry * dentry) spin_unlock(&dcache_lock); return 0; @@ -21,7 +20,7 @@ * Check whether to do a partial shrink_dcache * to get rid of unused child entries. */ -@@ -1132,14 +1139,23 @@ void d_delete(struct dentry * dentry) +@@ -1135,14 +1142,23 @@ void d_delete(struct dentry * dentry) * Adds a dentry to the hash according to its name. */ @@ -48,29 +47,9 @@ } #define do_switch(x,y) do { \ ---- linux-2.5.72/fs/namei.c~vfs_races_2.5.72_rev1 2003-06-25 08:33:06.000000000 -0600 -+++ linux-2.5.72-braam/fs/namei.c 2003-06-25 08:50:18.000000000 -0600 -@@ -368,6 +368,8 @@ static struct dentry * real_lookup(struc - struct dentry * result; - struct inode *dir = parent->d_inode; - -+ again: -+ - down(&dir->i_sem); - /* - * First re-do the cached lookup just in case it was created -@@ -415,7 +417,7 @@ static struct dentry * real_lookup(struc - if (!result->d_op->d_revalidate_it(result, flags, nd) && - !d_invalidate(result)) { - dput(result); -- result = ERR_PTR(-ENOENT); -+ goto again; - } - } - return result; ---- linux-2.5.72/include/linux/dcache.h~vfs_races_2.5.72_rev1 2003-06-25 08:25:04.000000000 -0600 -+++ linux-2.5.72-braam/include/linux/dcache.h 2003-06-25 08:33:08.000000000 -0600 -@@ -180,6 +180,8 @@ d_iput: no no yes +--- linux-2.6.0-test1/include/linux/dcache.h~vfs_races_2.5.72_rev1 2003-09-13 16:21:05.000000000 +0400 ++++ linux-2.6.0-test1-alexey/include/linux/dcache.h 2003-09-13 16:21:16.000000000 +0400 +@@ -156,6 +156,8 @@ d_iput: no no yes #define DCACHE_REFERENCED 0x0008 /* Recently used, don't discard. */ #define DCACHE_UNHASHED 0x0010 diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index 667d8c2..848893b 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -109,11 +109,6 @@ void ll_options(char *options, char **ost, char **mds, int *flags) ll_set_opt("nolock", this_char, LL_SBI_NOLCK))) continue; - if (!(*flags & LL_SBI_READAHEAD) && - ((*flags) = (*flags) | - ll_set_opt("readahead", this_char, - LL_SBI_READAHEAD))) - continue; } EXIT; } @@ -155,6 +150,7 @@ int ll_fill_super(struct super_block *sb, void *data, int silent) generate_random_uuid(uuid); class_uuid_unparse(uuid, &sbi->ll_sb_uuid); + sbi->ll_flags |= LL_SBI_READAHEAD; ll_options(data, &osc, &mdc, &sbi->ll_flags); if (!osc) { @@ -380,8 +376,6 @@ void ll_clear_inode(struct inode *inode) * I don't believe it is possible to get e.g. ATTR_MTIME_SET and ATTR_SIZE * at the same time. */ -#define OST_ATTR (ATTR_MTIME | ATTR_MTIME_SET | ATTR_CTIME | \ - ATTR_ATIME | ATTR_ATIME_SET | ATTR_SIZE) int ll_setattr_raw(struct inode *inode, struct iattr *attr) { struct lov_stripe_md *lsm = ll_i2info(inode)->lli_smd; @@ -405,6 +399,12 @@ int ll_setattr_raw(struct inode *inode, struct iattr *attr) attr->ia_valid |= ATTR_MTIME | ATTR_CTIME; } + /* POSIX: check before ATTR_*TIME_SET set (from inode_change_ok) */ + if (ia_valid & (ATTR_MTIME_SET | ATTR_ATIME_SET)) { + if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER)) + RETURN(-EPERM); + } + /* We mark all of the fields "set" so MDS/OST does not re-set them */ if (attr->ia_valid & ATTR_CTIME) { attr->ia_ctime = CURRENT_TIME; @@ -429,7 +429,7 @@ int ll_setattr_raw(struct inode *inode, struct iattr *attr) /* If only OST attributes being set on objects, don't do MDS RPC. * In that case, we need to check permissions and update the local * inode ourselves so we can call obdo_from_inode() always. */ - if (ia_valid & (lsm ? ~(OST_ATTR | ATTR_FROM_OPEN | ATTR_RAW) : ~0)) { + if (ia_valid & (lsm ? ~(ATTR_SIZE | ATTR_FROM_OPEN | ATTR_RAW) : ~0)) { struct lustre_md md; ll_prepare_mdc_op_data(&op_data, inode, NULL, NULL, 0, 0); @@ -448,10 +448,14 @@ int ll_setattr_raw(struct inode *inode, struct iattr *attr) ptlrpc_req_finished(request); RETURN(rc); } + + /* Won't invoke vmtruncate as we already cleared ATTR_SIZE, + * but needed to set timestamps backwards on utime. */ + inode_setattr(inode, attr); ll_update_inode(inode, md.body, md.lsm); ptlrpc_req_finished(request); - if (!md.lsm || !S_ISREG(inode->i_mode)) { + if (!lsm || !S_ISREG(inode->i_mode)) { CDEBUG(D_INODE, "no lsm: not setting attrs on OST\n"); RETURN(0); } @@ -657,14 +661,20 @@ void ll_update_inode(struct inode *inode, struct mds_body *body, LBUG(); } } + if (lli->lli_smd != lsm) + obd_free_memmd(ll_i2obdexp(inode), &lsm); } if (body->valid & OBD_MD_FLID) inode->i_ino = body->ino; if (body->valid & OBD_MD_FLATIME) LTIME_S(inode->i_atime) = body->atime; - if (body->valid & OBD_MD_FLMTIME) + if (body->valid & OBD_MD_FLMTIME && + body->mtime > LTIME_S(inode->i_mtime)) { + CDEBUG(D_INODE, "setting ino %lu mtime from %lu to %u\n", + inode->i_ino, LTIME_S(inode->i_mtime), body->mtime); LTIME_S(inode->i_mtime) = body->mtime; + } if (body->valid & OBD_MD_FLCTIME && body->ctime > LTIME_S(inode->i_ctime)) LTIME_S(inode->i_ctime) = body->ctime; @@ -686,12 +696,15 @@ void ll_update_inode(struct inode *inode, struct mds_body *body, #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) inode->i_rdev = body->rdev; #else - inode->i_rdev = to_kdev_t(body->rdev); + inode->i_rdev = old_encode_dev(body->rdev); #endif if (body->valid & OBD_MD_FLSIZE) inode->i_size = body->size; if (body->valid & OBD_MD_FLBLOCKS) inode->i_blocks = body->blocks; + + if (body->valid & OBD_MD_FLSIZE) + set_bit(LLI_F_HAVE_MDS_SIZE_LOCK, &lli->lli_flags); } void ll_read_inode2(struct inode *inode, void *opaque) @@ -743,6 +756,99 @@ void ll_read_inode2(struct inode *inode, void *opaque) } } +int ll_iocontrol(struct inode *inode, struct file *file, + unsigned int cmd, unsigned long arg) +{ + struct ll_sb_info *sbi = ll_i2sbi(inode); + struct ptlrpc_request *req = NULL; + int rc, flags = 0; + ENTRY; + + switch(cmd) { + case EXT3_IOC_GETFLAGS: { + struct ll_fid fid; + unsigned long valid = OBD_MD_FLFLAGS; + struct mds_body *body; + + ll_inode2fid(&fid, inode); + rc = mdc_getattr(sbi->ll_mdc_exp, &fid, valid, 0, &req); + if (rc) { + CERROR("failure %d inode %lu\n", rc, inode->i_ino); + RETURN(-abs(rc)); + } + + body = lustre_msg_buf(req->rq_repmsg, 0, sizeof(*body)); + + if (body->flags & S_APPEND) + flags |= EXT3_APPEND_FL; + if (body->flags & S_IMMUTABLE) + flags |= EXT3_IMMUTABLE_FL; + if (body->flags & S_NOATIME) + flags |= EXT3_NOATIME_FL; + + ptlrpc_req_finished (req); + + RETURN( put_user(flags, (int *)arg) ); + } + case EXT3_IOC_SETFLAGS: { + struct mdc_op_data op_data; + struct iattr attr; + struct obdo oa; + struct lov_stripe_md *lsm = ll_i2info(inode)->lli_smd; + + if ( get_user( flags, (int *)arg ) ) + RETURN( -EFAULT ); + + ll_prepare_mdc_op_data(&op_data, inode, NULL, NULL, 0, 0); + + memset(&attr, 0x0, sizeof(attr)); + attr.ia_attr_flags = flags; + attr.ia_valid |= ATTR_ATTR_FLAG; + + rc = mdc_setattr(sbi->ll_mdc_exp, &op_data, + &attr, NULL, 0, NULL, 0, &req); + if (rc) { + ptlrpc_req_finished(req); + if (rc != -EPERM && rc != -EACCES) + CERROR("mdc_setattr fails: rc = %d\n", rc); + RETURN(rc); + } + ptlrpc_req_finished(req); + + memset(&oa, 0x0, sizeof(oa)); + oa.o_id = lsm->lsm_object_id; + oa.o_flags = flags; + oa.o_valid = OBD_MD_FLID | OBD_MD_FLFLAGS; + + rc = obd_setattr(sbi->ll_osc_exp, &oa, lsm, NULL); + if (rc) { + if (rc != -EPERM && rc != -EACCES) + CERROR("mdc_setattr fails: rc = %d\n", rc); + RETURN(rc); + } + + if (flags & EXT3_APPEND_FL) + inode->i_flags |= S_APPEND; + else + inode->i_flags &= ~S_APPEND; + if (flags & EXT3_IMMUTABLE_FL) + inode->i_flags |= S_IMMUTABLE; + else + inode->i_flags &= ~S_IMMUTABLE; + if (flags & EXT3_NOATIME_FL) + inode->i_flags |= S_NOATIME; + else + inode->i_flags &= ~S_NOATIME; + + RETURN(0); + } + default: + RETURN(-ENOSYS); + } + + RETURN(0); +} + void ll_umount_begin(struct super_block *sb) { struct ll_sb_info *sbi = ll_s2sbi(sb); @@ -782,3 +888,30 @@ void ll_umount_begin(struct super_block *sb) EXIT; } + +int ll_prep_inode(struct obd_export *exp, struct inode **inode, + struct ptlrpc_request *req, int offset,struct super_block *sb) +{ + struct lustre_md md; + int rc = 0; + + rc = mdc_req2lustre_md(req, offset, exp, &md); + if (rc) + RETURN(rc); + + if (*inode) { + ll_update_inode(*inode, md.body, md.lsm); + } else { + LASSERT(sb); + *inode = ll_iget(sb, md.body->ino, &md); + if (!*inode) { + /* free the lsm if we allocated one above */ + if (md.lsm != NULL) + obd_free_memmd(exp, &md.lsm); + rc = -ENOMEM; + CERROR("new_inode -fatal: rc %d\n", rc); + } + } + + RETURN(rc); +} diff --git a/lustre/obdfilter/filter_internal.h b/lustre/obdfilter/filter_internal.h index 81f2c66..6c575a5 100644 --- a/lustre/obdfilter/filter_internal.h +++ b/lustre/obdfilter/filter_internal.h @@ -39,7 +39,7 @@ #define FILTER_LR_MAX_CLIENT_WORDS (FILTER_LR_MAX_CLIENTS/sizeof(unsigned long)) #define FILTER_SUBDIR_COUNT 32 /* set to zero for no subdirs */ -#define FILTER_GROUPS 2 /* must be at least 2; not dynamic yet */ +#define FILTER_GROUPS 2 /* must be at least 3; not dynamic yet */ #define FILTER_MOUNT_RECOV 2 #define FILTER_RECOVERY_TIMEOUT (obd_timeout * 5 * HZ / 2) /* *waves hands* */ diff --git a/lustre/obdfilter/filter_io.c b/lustre/obdfilter/filter_io.c index a8d77c5..43f16f4 100644 --- a/lustre/obdfilter/filter_io.c +++ b/lustre/obdfilter/filter_io.c @@ -374,7 +374,6 @@ void flip_into_page_cache(struct inode *inode, struct page *new_page) { struct page *old_page; int rc; - ENTRY; do { /* the dlm is protecting us from read/write concurrency, so we @@ -412,8 +411,6 @@ void flip_into_page_cache(struct inode *inode, struct page *new_page) rc = 0; #endif } while (rc != 0); - - EXIT; } /* XXX needs to trickle its oa down */ -- 1.8.3.1