From: pschwan Date: Fri, 14 Jun 2002 17:57:38 +0000 (+0000) Subject: - We allow the intent policy function to abort lock enqueue X-Git-Tag: 0.4.2~149 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=aafdea31fbe20537bf30b0320f2f879a8f90d09e;p=fs%2Flustre-release.git - We allow the intent policy function to abort lock enqueue - Return -ENOENT from getattr, not -EEXIST - add page.c to obdfilter build - new kernel patches --- diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c index 3434c5b..25d2214 100644 --- a/lustre/ldlm/ldlm_lock.c +++ b/lustre/ldlm/ldlm_lock.c @@ -127,8 +127,10 @@ static int ldlm_intent_policy(struct ldlm_lock *lock, void *req_cookie, RETURN(-EINVAL); } rc = mds_getattr_name_p(2, req); - if (rc) - LBUG(); + if (rc) { + req->rq_status = rc; + RETURN(rc); + } break; case IT_READDIR|IT_OPEN: LBUG(); @@ -490,6 +492,12 @@ ldlm_error_t ldlm_local_lock_enqueue(struct lustre_handle *lockh, res = lock->l_resource; *flags |= LDLM_FL_LOCK_CHANGED; } + if (rc < 0) { + /* Abort. */ + ldlm_resource_put(lock->l_resource); + ldlm_lock_free(lock); + RETURN(rc); + } } lock->l_cookie = cookie; diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c index b994925..93c9e19 100644 --- a/lustre/ldlm/ldlm_lockd.c +++ b/lustre/ldlm/ldlm_lockd.c @@ -135,9 +135,7 @@ static int _ldlm_enqueue(struct obd_device *obddev, struct ptlrpc_service *svc, GOTO(out, err); flags = dlm_req->lock_flags; - err = ldlm_local_lock_enqueue(&lockh, - cookie, cookielen, - &flags, + err = ldlm_local_lock_enqueue(&lockh, cookie, cookielen, &flags, callback, callback); if (err != ELDLM_OK) GOTO(out, err); @@ -165,9 +163,8 @@ static int _ldlm_enqueue(struct obd_device *obddev, struct ptlrpc_service *svc, if (ptlrpc_reply(svc, req)) LBUG(); - if (!err) { + if (!err) ldlm_reprocess_all(lock->l_resource); - } return 0; } diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c index e1fa112..b2742b5 100644 --- a/lustre/mds/handler.c +++ b/lustre/mds/handler.c @@ -355,7 +355,7 @@ static int mds_getattr_name(int offset, struct ptlrpc_request *req) /* now a normal case for intent locking */ rc = 0; } else { - rc = -EEXIST; + rc = -ENOENT; } EXIT; diff --git a/lustre/obdfilter/Makefile.am b/lustre/obdfilter/Makefile.am index f4c98f7..280efc3 100644 --- a/lustre/obdfilter/Makefile.am +++ b/lustre/obdfilter/Makefile.am @@ -8,9 +8,11 @@ MODULE = obdfilter modulefs_DATA = obdfilter.o EXTRA_PROGRAMS = obdfilter -LINX=simple.c -simple.c: +LINX=page.c simple.c +simple.c: test -e simple.c || ln -sf $(top_srcdir)/lib/simple.c +page.c: + test -e page.c || ln -sf $(top_srcdir)/lib/page.c EXT2C = filter.c obdfilter_SOURCES = filter.c $(LINX) diff --git a/lustre/patches/intent-lock.patch b/lustre/patches/intent-lock.patch index a476fc3..95dfbfe 100644 --- a/lustre/patches/intent-lock.patch +++ b/lustre/patches/intent-lock.patch @@ -1,30 +1,66 @@ ---- linux/include/linux/fs.h.lustre-orig Wed May 22 08:29:48 2002 -+++ linux/include/linux/fs.h Tue Jun 4 09:24:48 2002 -@@ -314,8 +314,8 @@ - #include - #include - #include --#include - #include -+#include - #include +--- lum-pristine/include/linux/dcache.h Thu Nov 22 14:46:18 2001 ++++ lum/include/linux/dcache.h Fri Jun 14 03:03:17 2002 +@@ -6,6 +6,32 @@ + #include + #include ++#define IT_OPEN (1) ++#define IT_CREAT (1<<1) ++#define IT_MKDIR (1<<2) ++#define IT_LINK (1<<3) ++#define IT_SYMLINK (1<<4) ++#define IT_UNLINK (1<<5) ++#define IT_RMDIR (1<<6) ++#define IT_RENAME (1<<7) ++#define IT_RENAME2 (1<<8) ++#define IT_READDIR (1<<9) ++#define IT_GETATTR (1<<10) ++#define IT_SETATTR (1<<11) ++#define IT_READLINK (1<<12) ++#define IT_MKNOD (1<<13) ++ ++struct lookup_intent { ++ int it_op; ++ int it_mode; ++ int it_disposition; ++ int it_status; ++ struct iattr *it_iattr; ++ __u64 it_lock_handle[2]; ++ int it_lock_mode; ++ void *it_data; ++}; ++ /* -@@ -506,8 +506,8 @@ - struct proc_inode_info proc_i; - struct socket socket_i; - struct usbdev_inode_info usbdev_i; -- struct hostfs_inode_info hostfs_i; - struct jffs2_inode_info jffs2_i; -+ struct hostfs_inode_info hostfs_i; - void *generic_ip; - } u; + * linux/include/linux/dcache.h + * +@@ -79,17 +105,20 @@ + struct dentry_operations *d_op; + struct super_block * d_sb; /* The root of the dentry tree */ + unsigned long d_vfs_flags; ++ struct lookup_intent *d_it; + void * d_fsdata; /* fs-specific data */ + unsigned char d_iname[DNAME_INLINE_LEN]; /* small names */ + }; + + struct dentry_operations { + int (*d_revalidate)(struct dentry *, int); ++ int (*d_revalidate2)(struct dentry *, int, struct lookup_intent *); + int (*d_hash) (struct dentry *, struct qstr *); + int (*d_compare) (struct dentry *, struct qstr *, struct qstr *); + int (*d_delete)(struct dentry *); + void (*d_release)(struct dentry *); + void (*d_iput)(struct dentry *, struct inode *); ++ void (*d_intent_release)(struct dentry *); }; + + /* the dentry parameter passed to d_hash and d_compare is the parent +--- lum-pristine/include/linux/fs.h Fri Jun 14 13:54:00 2002 ++++ lum/include/linux/fs.h Fri Jun 14 03:04:28 2002 @@ -536,6 +536,7 @@ /* needed for tty driver, and maybe others */ void *private_data; -+ struct lookup_intent *f_intent; ++ struct lookup_intent *f_intent; /* preallocated helper kiobuf to speedup O_DIRECT */ struct kiobuf *f_iobuf; @@ -34,8 +70,8 @@ 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, -+ struct lookup_intent *it); ++ struct inode *new_dir, struct dentry *new_dentry, ++ struct lookup_intent *it); /* * File types @@ -43,22 +79,20 @@ struct inode_operations { int (*create) (struct inode *,struct dentry *,int); struct dentry * (*lookup) (struct inode *,struct dentry *); -+ struct dentry * (*lookup2) (struct inode *,struct dentry *, struct lookup_intent *); ++ struct dentry * (*lookup2) (struct inode *,struct dentry *, struct lookup_intent *); int (*link) (struct dentry *,struct inode *,struct dentry *); int (*unlink) (struct inode *,struct dentry *); int (*symlink) (struct inode *,struct dentry *,const char *); -@@ -855,6 +859,10 @@ - int (*revalidate) (struct dentry *); - int (*setattr) (struct dentry *, 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); -+ ssize_t (*listxattr) (struct dentry *, char *, size_t); -+ int (*removexattr) (struct dentry *, const char *); - }; +@@ -986,7 +990,7 @@ + extern struct vfsmount *kern_mount(struct file_system_type *); + extern int may_umount(struct vfsmount *); + extern long do_mount(char *, char *, char *, unsigned long, void *); +- ++struct vfsmount *do_kern_mount(char *type, int flags, char *name, void *data); + #define kern_umount mntput - struct seq_file; -@@ -1307,6 +1315,7 @@ + extern int vfs_statfs(struct super_block *, struct statfs *); +@@ -1307,6 +1311,7 @@ extern loff_t default_llseek(struct file *file, loff_t offset, int origin); extern int FASTCALL(__user_walk(const char *, unsigned, struct nameidata *)); @@ -66,7 +100,7 @@ extern int FASTCALL(path_init(const char *, unsigned, struct nameidata *)); extern int FASTCALL(path_walk(const char *, struct nameidata *)); extern int FASTCALL(link_path_walk(const char *, struct nameidata *)); -@@ -1317,6 +1326,8 @@ +@@ -1317,6 +1322,8 @@ 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) @@ -75,69 +109,17 @@ extern void iput(struct inode *); extern void force_delete(struct inode *); ---- linux/include/linux/dcache.h.lustre-orig Wed May 22 08:29:48 2002 -+++ linux/include/linux/dcache.h Tue Jun 4 09:24:45 2002 -@@ -6,6 +6,28 @@ - #include - #include - -+#define IT_OPEN (1) -+#define IT_CREAT (1<<1) -+#define IT_MKDIR (1<<2) -+#define IT_LINK (1<<3) -+#define IT_SYMLINK (1<<4) -+#define IT_UNLINK (1<<5) -+#define IT_RMDIR (1<<6) -+#define IT_RENAME (1<<7) -+#define IT_READDIR (1<<8) -+#define IT_GETATTR (1<<9) -+#define IT_SETATTR (1<<10) -+#define IT_READLINK (1<<11) -+ -+struct lookup_intent { -+ int it_op; -+ int it_mode; -+ int it_disposition; -+ int it_status; -+ struct iattr *it_iattr; -+ void *it_data; -+}; -+ - /* - * linux/include/linux/dcache.h - * -@@ -79,17 +101,20 @@ - struct dentry_operations *d_op; - struct super_block * d_sb; /* The root of the dentry tree */ - unsigned long d_vfs_flags; -+ struct lookup_intent *d_it; - void * d_fsdata; /* fs-specific data */ - unsigned char d_iname[DNAME_INLINE_LEN]; /* small names */ - }; - - struct dentry_operations { - int (*d_revalidate)(struct dentry *, int); -+ int (*d_revalidate2)(struct dentry *, int, struct lookup_intent *); - int (*d_hash) (struct dentry *, struct qstr *); - int (*d_compare) (struct dentry *, struct qstr *, struct qstr *); - int (*d_delete)(struct dentry *); - void (*d_release)(struct dentry *); - void (*d_iput)(struct dentry *, struct inode *); -+ void (*d_intent_rel)(struct dentry *); - }; - - /* the dentry parameter passed to d_hash and d_compare is the parent ---- linux/fs/namei.c.lustre-orig Wed May 22 08:29:48 2002 -+++ linux/fs/namei.c Mon Jun 3 16:14:56 2002 +--- lum-pristine/fs/namei.c Mon Feb 25 14:38:09 2002 ++++ lum/fs/namei.c Fri Jun 14 13:49:06 2002 @@ -94,6 +94,14 @@ * XEmacs seems to be relying on it... */ +void intent_release(struct dentry *de) +{ -+ if (de->d_op && de->d_op->d_intent_rel) -+ de->d_op->d_intent_rel(de); -+ de->d_it = NULL; ++ if (de->d_op && de->d_op->d_intent_release) ++ de->d_op->d_intent_release(de); ++ de->d_it = NULL; +} + + @@ -153,13 +135,13 @@ { struct dentry * dentry = d_lookup(parent, name); -+ if (dentry && dentry->d_op && dentry->d_op->d_revalidate2) { -+ if (!dentry->d_op->d_revalidate2(dentry, flags, it) && !d_invalidate(dentry)) { -+ dput(dentry); -+ dentry = NULL; -+ } -+ return dentry; -+ } ++ if (dentry && dentry->d_op && dentry->d_op->d_revalidate2) { ++ if (!dentry->d_op->d_revalidate2(dentry, flags, it) && !d_invalidate(dentry)) { ++ dput(dentry); ++ dentry = NULL; ++ } ++ return dentry; ++ } + if (dentry && dentry->d_op && dentry->d_op->d_revalidate) { if (!dentry->d_op->d_revalidate(dentry, flags) && !d_invalidate(dentry)) { @@ -177,9 +159,9 @@ result = ERR_PTR(-ENOMEM); if (dentry) { lock_kernel(); -+ if (dir->i_op->lookup2) -+ result = dir->i_op->lookup2(dir, dentry, it); -+ else ++ if (dir->i_op->lookup2) ++ result = dir->i_op->lookup2(dir, dentry, it); ++ else result = dir->i_op->lookup(dir, dentry); unlock_kernel(); if (result) @@ -187,12 +169,12 @@ result = ERR_PTR(-ENOENT); } } -+ if (result->d_op && result->d_op->d_revalidate2) { -+ if (!result->d_op->d_revalidate2(result, flags, it) && !d_invalidate(result)) { -+ dput(result); -+ result = ERR_PTR(-ENOENT); -+ } -+ } ++ if (result->d_op && result->d_op->d_revalidate2) { ++ if (!result->d_op->d_revalidate2(result, flags, it) && !d_invalidate(result)) { ++ dput(result); ++ result = ERR_PTR(-ENOENT); ++ } ++ } return result; } @@ -210,10 +192,10 @@ } /* This does the actual lookups.. */ - dentry = cached_lookup(nd->dentry, &this, LOOKUP_CONTINUE); -+ dentry = cached_lookup(nd->dentry, &this, LOOKUP_CONTINUE, NULL); ++ dentry = cached_lookup(nd->dentry, &this, LOOKUP_CONTINUE, NULL); if (!dentry) { - dentry = real_lookup(nd->dentry, &this, LOOKUP_CONTINUE); -+ dentry = real_lookup(nd->dentry, &this, LOOKUP_CONTINUE, NULL); ++ dentry = real_lookup(nd->dentry, &this, LOOKUP_CONTINUE, NULL); err = PTR_ERR(dentry); if (IS_ERR(dentry)) break; @@ -222,7 +204,7 @@ } err = -ENOTDIR; - if (!inode->i_op->lookup) -+ if (!inode->i_op->lookup && !inode->i_op->lookup2) ++ if (!inode->i_op->lookup && !inode->i_op->lookup2) break; continue; /* here ends the main loop */ @@ -231,10 +213,10 @@ break; } - dentry = cached_lookup(nd->dentry, &this, 0); -+ dentry = cached_lookup(nd->dentry, &this, 0, it); ++ dentry = cached_lookup(nd->dentry, &this, 0, it); if (!dentry) { - dentry = real_lookup(nd->dentry, &this, 0); -+ dentry = real_lookup(nd->dentry, &this, 0, it); ++ dentry = real_lookup(nd->dentry, &this, 0, it); err = PTR_ERR(dentry); if (IS_ERR(dentry)) break; @@ -243,431 +225,460 @@ 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->lookup2)) ++ if (!inode->i_op || (!inode->i_op->lookup && ++ !inode->i_op->lookup2)) break; } goto return_base; -@@ -636,12 +662,24 @@ +@@ -626,6 +652,7 @@ + else if (this.len == 2 && this.name[1] == '.') + nd->last_type = LAST_DOTDOT; + return_base: ++ nd->dentry->d_it = it; + return 0; + out_dput: + dput(dentry); +@@ -633,15 +660,29 @@ + } + path_release(nd); + return_err: ++ if (!err) ++ nd->dentry->d_it = it; return err; } +int link_path_walk(const char * name, struct nameidata *nd) +{ -+ return link_path_walk_it(name, nd, NULL); ++ 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); ++ 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); ++ return link_path_walk_it(name, nd, NULL); } + /* SMP-safe */ /* returns 1 if everything is done */ static int __emul_lookup_dentry(const char *name, struct nameidata *nd) -@@ -742,7 +780,8 @@ +@@ -742,7 +783,8 @@ * 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 lookup_intent *it) { struct dentry * dentry; struct inode *inode; -@@ -765,13 +804,16 @@ +@@ -765,13 +807,16 @@ goto out; } - dentry = cached_lookup(base, name, 0); -+ dentry = cached_lookup(base, name, 0, it); ++ 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->lookup2) -+ dentry = inode->i_op->lookup2(inode, new, it); -+ else ++ if (inode->i_op->lookup2) ++ dentry = inode->i_op->lookup2(inode, new, it); ++ else dentry = inode->i_op->lookup(inode, new); unlock_kernel(); if (!dentry) -@@ -783,6 +825,12 @@ +@@ -783,6 +828,12 @@ return dentry; } +struct dentry * lookup_hash(struct qstr *name, struct dentry * base) +{ -+ return lookup_hash_it(name, base, NULL); ++ return lookup_hash_it(name, base, NULL); +} + + /* SMP-safe */ struct dentry * lookup_one_len(const char * name, struct dentry * base, int len) { -@@ -804,7 +852,7 @@ +@@ -804,7 +855,7 @@ } this.hash = end_name_hash(hash); - return lookup_hash(&this, base); -+ return lookup_hash_it(&this, base, NULL); ++ return lookup_hash_it(&this, base, NULL); access: return ERR_PTR(-EACCES); } -@@ -836,6 +884,22 @@ +@@ -836,6 +887,22 @@ return err; } +int __user_walk_it(const char *name, unsigned flags, struct nameidata *nd, struct lookup_intent *it) +{ -+ char *tmp; -+ int err; ++ 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; ++ 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. -@@ -970,7 +1034,8 @@ +@@ -970,7 +1037,8 @@ * 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) ++ struct lookup_intent *it) { int acc_mode, error = 0; struct inode *inode; -@@ -984,8 +1049,9 @@ +@@ -984,17 +1052,21 @@ * The simplest case - just a plain lookup. */ if (!(flag & O_CREAT)) { + if (path_init(pathname, lookup_flags(flag), nd)) - error = path_walk(pathname, nd); -+ error = path_walk_it(pathname, nd, it); ++ error = path_walk_it(pathname, nd, it); if (error) return error; dentry = nd->dentry; -@@ -995,6 +1061,8 @@ ++ dentry->d_it = it; + goto ok; + } + /* * Create - we need to know the parent. */ -+ if (it) -+ it->it_op |= IT_CREAT; ++ if (it) ++ it->it_op |= IT_CREAT; if (path_init(pathname, LOOKUP_PARENT, nd)) error = path_walk(pathname, nd); if (error) -@@ -1011,7 +1079,7 @@ +@@ -1011,7 +1083,7 @@ 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); ++ dentry = lookup_hash_it(&nd->last, nd->dentry, it); do_last: error = PTR_ERR(dentry); -@@ -1022,6 +1090,7 @@ +@@ -1022,6 +1094,7 @@ /* Negative dentry, just create the file */ if (!dentry->d_inode) { -+ dentry->d_it = it; ++ dentry->d_it = it; error = vfs_create(dir->d_inode, dentry, mode & ~current->fs->umask); up(&dir->d_inode->i_sem); -@@ -1181,13 +1250,20 @@ +@@ -1136,9 +1209,11 @@ + if (flag & FMODE_WRITE) + DQUOT_INIT(inode); + ++ intent_release(dentry); + return 0; + + exit_dput: ++ intent_release(dentry); + dput(dentry); + exit: + path_release(nd); +@@ -1181,13 +1256,20 @@ } dir = nd->dentry; down(&dir->d_inode->i_sem); - dentry = lookup_hash(&nd->last, nd->dentry); -+ dentry = lookup_hash_it(&nd->last, nd->dentry, NULL); ++ dentry = lookup_hash_it(&nd->last, nd->dentry, NULL); 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); ++ 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 lookup_intent *it) { struct dentry *dentry; -@@ -1195,7 +1271,7 @@ +@@ -1195,7 +1277,7 @@ 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); ++ 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) -@@ -1241,6 +1317,7 @@ +@@ -1241,6 +1323,7 @@ char * tmp; struct dentry * dentry; struct nameidata nd; -+ struct lookup_intent it = { IT_CREAT , mode }; ++ struct lookup_intent it = { IT_MKNOD , mode }; if (S_ISDIR(mode)) return -EPERM; -@@ -1252,11 +1329,12 @@ +@@ -1252,11 +1335,12 @@ error = path_walk(tmp, &nd); if (error) goto out; - dentry = lookup_create(&nd, 0); -+ dentry = lookup_create(&nd, 0, &it); ++ dentry = lookup_create(&nd, 0, &it); error = PTR_ERR(dentry); mode &= ~current->fs->umask; if (!IS_ERR(dentry)) { -+ dentry->d_it = ⁢ ++ dentry->d_it = ⁢ switch (mode & S_IFMT) { case 0: case S_IFREG: error = vfs_create(nd.dentry->d_inode,dentry,mode); -@@ -1272,6 +1350,7 @@ +@@ -1272,6 +1356,7 @@ } dput(dentry); } -+ intent_release(dentry); ++ intent_release(dentry); up(&nd.dentry->d_inode->i_sem); path_release(&nd); out: -@@ -1310,6 +1389,7 @@ +@@ -1310,6 +1395,7 @@ { int error = 0; char * tmp; -+ struct lookup_intent it = { IT_MKDIR, mode }; ++ struct lookup_intent it = { IT_MKDIR, mode }; tmp = getname(pathname); error = PTR_ERR(tmp); -@@ -1321,13 +1401,15 @@ +@@ -1321,13 +1407,15 @@ error = path_walk(tmp, &nd); if (error) goto out; - dentry = lookup_create(&nd, 1); -+ dentry = lookup_create(&nd, 1, &it); ++ dentry = lookup_create(&nd, 1, &it); error = PTR_ERR(dentry); if (!IS_ERR(dentry)) { -+ dentry->d_it = ⁢ ++ dentry->d_it = ⁢ error = vfs_mkdir(nd.dentry->d_inode, dentry, mode & ~current->fs->umask); dput(dentry); } -+ intent_release(dentry); ++ intent_release(dentry); up(&nd.dentry->d_inode->i_sem); path_release(&nd); out: -@@ -1407,6 +1489,7 @@ +@@ -1407,6 +1495,7 @@ char * name; struct dentry *dentry; struct nameidata nd; -+ struct lookup_intent it = { IT_RMDIR, 0 }; ++ struct lookup_intent it = { IT_RMDIR, 0 }; name = getname(pathname); if(IS_ERR(name)) -@@ -1429,10 +1512,12 @@ +@@ -1429,10 +1518,12 @@ goto exit1; } down(&nd.dentry->d_inode->i_sem); - dentry = lookup_hash(&nd.last, nd.dentry); -+ dentry = lookup_hash_it(&nd.last, nd.dentry, &it); ++ dentry = lookup_hash_it(&nd.last, nd.dentry, &it); error = PTR_ERR(dentry); if (!IS_ERR(dentry)) { -+ dentry->d_it = ⁢ ++ dentry->d_it = ⁢ error = vfs_rmdir(nd.dentry->d_inode, dentry); -+ intent_release(dentry); ++ intent_release(dentry); dput(dentry); } up(&nd.dentry->d_inode->i_sem); -@@ -1476,6 +1561,7 @@ +@@ -1476,6 +1567,7 @@ char * name; struct dentry *dentry; struct nameidata nd; -+ struct lookup_intent it = { IT_UNLINK, 0 }; ++ struct lookup_intent it = { IT_UNLINK, 0 }; name = getname(pathname); if(IS_ERR(name)) -@@ -1489,14 +1575,16 @@ +@@ -1489,14 +1581,16 @@ if (nd.last_type != LAST_NORM) goto exit1; down(&nd.dentry->d_inode->i_sem); - dentry = lookup_hash(&nd.last, nd.dentry); -+ dentry = lookup_hash_it(&nd.last, nd.dentry, &it); ++ dentry = lookup_hash_it(&nd.last, nd.dentry, &it); error = PTR_ERR(dentry); if (!IS_ERR(dentry)) { -+ dentry->d_it = ⁢ ++ dentry->d_it = ⁢ /* Why not before? Because we want correct error value */ if (nd.last.name[nd.last.len]) goto slashes; error = vfs_unlink(nd.dentry->d_inode, dentry); exit2: -+ intent_release(dentry); ++ intent_release(dentry); dput(dentry); } up(&nd.dentry->d_inode->i_sem); -@@ -1543,6 +1631,7 @@ +@@ -1543,6 +1637,7 @@ int error = 0; char * from; char * to; -+ struct lookup_intent it = { IT_SYMLINK, 0 }; ++ struct lookup_intent it = { IT_SYMLINK, 0 }; from = getname(oldname); if(IS_ERR(from)) -@@ -1557,12 +1646,14 @@ +@@ -1557,12 +1652,14 @@ error = path_walk(to, &nd); if (error) goto out; - dentry = lookup_create(&nd, 0); -+ dentry = lookup_create(&nd, 0, &it); ++ dentry = lookup_create(&nd, 0, &it); error = PTR_ERR(dentry); if (!IS_ERR(dentry)) { -+ dentry->d_it = ⁢ ++ dentry->d_it = ⁢ error = vfs_symlink(nd.dentry->d_inode, dentry, from); dput(dentry); } -+ intent_release(dentry); ++ intent_release(dentry); up(&nd.dentry->d_inode->i_sem); path_release(&nd); out: -@@ -1626,6 +1717,7 @@ +@@ -1626,6 +1723,7 @@ int error; char * from; char * to; -+ struct lookup_intent it = { IT_LINK, 0 }; ++ struct lookup_intent it = { IT_LINK, 0 }; from = getname(oldname); if(IS_ERR(from)) -@@ -1648,12 +1740,14 @@ +@@ -1648,12 +1746,14 @@ error = -EXDEV; if (old_nd.mnt != nd.mnt) goto out_release; - new_dentry = lookup_create(&nd, 0); -+ new_dentry = lookup_create(&nd, 0, &it); ++ new_dentry = lookup_create(&nd, 0, &it); error = PTR_ERR(new_dentry); if (!IS_ERR(new_dentry)) { -+ new_dentry->d_it = ⁢ ++ new_dentry->d_it = ⁢ error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry); dput(new_dentry); } -+ intent_release(new_dentry); ++ intent_release(new_dentry); up(&nd.dentry->d_inode->i_sem); out_release: path_release(&nd); -@@ -1694,7 +1788,8 @@ +@@ -1694,7 +1794,8 @@ * 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, -+ struct lookup_intent *it) ++ struct inode *new_dir, struct dentry *new_dentry, ++ struct lookup_intent *it) { int error; struct inode *target; -@@ -1748,12 +1843,14 @@ +@@ -1748,12 +1849,14 @@ } else double_down(&old_dir->i_zombie, &new_dir->i_zombie); -+ new_dentry->d_it = it; ++ new_dentry->d_it = it; if (IS_DEADDIR(old_dir)||IS_DEADDIR(new_dir)) error = -ENOENT; else if (d_mountpoint(old_dentry)||d_mountpoint(new_dentry)) error = -EBUSY; else error = old_dir->i_op->rename(old_dir, old_dentry, new_dir, new_dentry); -+ intent_release(new_dentry); ++ intent_release(new_dentry); if (target) { if (!error) target->i_flags |= S_DEAD; -@@ -1775,7 +1872,8 @@ +@@ -1775,7 +1878,8 @@ } 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, -+ struct lookup_intent *it) ++ struct inode *new_dir, struct dentry *new_dentry, ++ struct lookup_intent *it) { int error; -@@ -1802,10 +1900,12 @@ +@@ -1802,10 +1906,12 @@ DQUOT_INIT(old_dir); DQUOT_INIT(new_dir); double_down(&old_dir->i_zombie, &new_dir->i_zombie); -+ new_dentry->d_it = it; ++ new_dentry->d_it = it; if (d_mountpoint(old_dentry)||d_mountpoint(new_dentry)) error = -EBUSY; else error = old_dir->i_op->rename(old_dir, old_dentry, new_dir, new_dentry); -+ intent_release(new_dentry); ++ intent_release(new_dentry); double_up(&old_dir->i_zombie, &new_dir->i_zombie); if (error) return error; -@@ -1817,13 +1917,14 @@ +@@ -1817,13 +1923,14 @@ } int vfs_rename(struct inode *old_dir, struct dentry *old_dentry, - struct inode *new_dir, struct dentry *new_dentry) -+ struct inode *new_dir, struct dentry *new_dentry, -+ struct lookup_intent *it) ++ struct inode *new_dir, struct dentry *new_dentry, ++ struct lookup_intent *it) { int error; if (S_ISDIR(old_dentry->d_inode->i_mode)) - error = vfs_rename_dir(old_dir,old_dentry,new_dir,new_dentry); -+ error = vfs_rename_dir(old_dir,old_dentry,new_dir,new_dentry, it); ++ error = vfs_rename_dir(old_dir,old_dentry,new_dir,new_dentry, it); else - error = vfs_rename_other(old_dir,old_dentry,new_dir,new_dentry); -+ error = vfs_rename_other(old_dir,old_dentry,new_dir,new_dentry, it); ++ error = vfs_rename_other(old_dir,old_dentry,new_dir,new_dentry, it); if (!error) { if (old_dir == new_dir) inode_dir_notify(old_dir, DN_RENAME); -@@ -1841,6 +1942,7 @@ +@@ -1841,6 +1948,7 @@ struct dentry * old_dir, * new_dir; struct dentry * old_dentry, *new_dentry; struct nameidata oldnd, newnd; -+ struct lookup_intent it = {IT_RENAME, 0}; ++ struct lookup_intent it = {IT_RENAME, 0}; if (path_init(oldname, LOOKUP_PARENT, &oldnd)) error = path_walk(oldname, &oldnd); -@@ -1868,7 +1970,9 @@ +@@ -1868,7 +1976,9 @@ double_lock(new_dir, old_dir); - old_dentry = lookup_hash(&oldnd.last, old_dir); -+ it.it_op = IT_RENAME; -+ it.it_mode = 0; -+ old_dentry = lookup_hash_it(&oldnd.last, old_dir, &it); ++ it.it_op = IT_RENAME; ++ it.it_mode = 0; ++ old_dentry = lookup_hash_it(&oldnd.last, old_dir, &it); error = PTR_ERR(old_dentry); if (IS_ERR(old_dentry)) goto exit3; -@@ -1884,14 +1988,14 @@ +@@ -1884,14 +1994,15 @@ 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, &it); ++ it.it_op = IT_RENAME2; ++ new_dentry = lookup_hash_it(&newnd.last, new_dir, &it); error = PTR_ERR(new_dentry); if (IS_ERR(new_dentry)) goto exit4; @@ -675,37 +686,266 @@ lock_kernel(); error = vfs_rename(old_dir->d_inode, old_dentry, - new_dir->d_inode, new_dentry); -+ new_dir->d_inode, new_dentry, &it); ++ new_dir->d_inode, new_dentry, &it); unlock_kernel(); dput(new_dentry); ---- linux/fs/open.c.lustre-orig Wed May 22 08:29:48 2002 -+++ linux/fs/open.c Wed May 22 08:29:48 2002 -@@ -630,10 +630,15 @@ +--- lum-pristine/fs/open.c Fri Oct 12 16:48:42 2001 ++++ lum/fs/open.c Thu Jun 13 20:22:44 2002 +@@ -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); ++extern void intent_release(struct dentry *de); + + int vfs_statfs(struct super_block *sb, struct statfs *buf) + { +@@ -94,14 +96,19 @@ + struct nameidata nd; + struct inode * inode; + int error; ++ struct lookup_intent it; ++ ++ it.it_op = IT_SETATTR; ++ + + 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; ++ nd.dentry->d_it = ⁢ + inode = nd.dentry->d_inode; + + /* For directories it's -EISDIR, for other non-regulars - -EINVAL */ +@@ -144,6 +151,7 @@ + put_write_access(inode); + + dput_and_out: ++ intent_release(nd.dentry); + path_release(&nd); + out: + return error; +@@ -235,10 +243,14 @@ + struct nameidata nd; + struct inode * inode; + struct iattr newattrs; ++ struct lookup_intent it; ++ ++ it.it_op = IT_SETATTR; + +- error = user_path_walk(filename, &nd); ++ error = user_path_walk_it(filename, &nd, &it); + if (error) + goto out; ++ nd.dentry->d_it = ⁢ + inode = nd.dentry->d_inode; + + error = -EROFS; +@@ -262,6 +274,7 @@ + } + error = notify_change(nd.dentry, &newattrs); + dput_and_out: ++ intent_release(nd.dentry); + path_release(&nd); + out: + return error; +@@ -279,11 +292,15 @@ + struct nameidata nd; + struct inode * inode; + struct iattr newattrs; ++ struct lookup_intent it; ++ ++ it.it_op = IT_SETATTR; + +- error = user_path_walk(filename, &nd); ++ error = user_path_walk_it(filename, &nd, &it); + + if (error) + goto out; ++ nd.dentry->d_it = ⁢ + inode = nd.dentry->d_inode; + + error = -EROFS; +@@ -306,6 +323,7 @@ + } + error = notify_change(nd.dentry, &newattrs); + dput_and_out: ++ intent_release(nd.dentry); + path_release(&nd); + out: + return error; +@@ -322,6 +340,9 @@ + int old_fsuid, old_fsgid; + kernel_cap_t old_cap; + int res; ++ struct lookup_intent it; ++ ++ it.it_op = IT_GETATTR; + + if (mode & ~S_IRWXO) /* where's F_OK, X_OK, W_OK, R_OK? */ + return -EINVAL; +@@ -339,7 +360,7 @@ + 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 */ +@@ -361,6 +382,9 @@ + int error; + struct nameidata nd; + char *name; ++ struct lookup_intent it; ++ ++ it.it_op = IT_GETATTR; + + name = getname(filename); + error = PTR_ERR(name); +@@ -369,11 +393,12 @@ + + error = 0; + if (path_init(name,LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY,&nd)) +- error = path_walk(name, &nd); ++ error = path_walk_it(name, &nd, &it); + putname(name); + if (error) + goto out; + ++ nd.dentry->d_it = ⁢ + error = permission(nd.dentry->d_inode,MAY_EXEC); + if (error) + goto dput_and_out; +@@ -381,6 +406,7 @@ + set_fs_pwd(current->fs, nd.mnt, nd.dentry); + + dput_and_out: ++ intent_release(nd.dentry); + path_release(&nd); + out: + return error; +@@ -421,6 +447,9 @@ + int error; + struct nameidata nd; + char *name; ++ struct lookup_intent it; ++ ++ it.it_op = IT_GETATTR; + + name = getname(filename); + error = PTR_ERR(name); +@@ -429,11 +458,12 @@ + + path_init(name, LOOKUP_POSITIVE | LOOKUP_FOLLOW | + LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd); +- error = path_walk(name, &nd); ++ error = path_walk_it(name, &nd, &it); + putname(name); + if (error) + goto out; + ++ nd.dentry->d_it = ⁢ + error = permission(nd.dentry->d_inode,MAY_EXEC); + if (error) + goto dput_and_out; +@@ -446,6 +476,7 @@ + set_fs_altroot(); + error = 0; + dput_and_out: ++ intent_release(nd.dentry); + path_release(&nd); + out: + return error; +@@ -490,12 +521,15 @@ + struct inode * inode; + int error; + struct iattr newattrs; ++ struct lookup_intent it; + +- error = user_path_walk(filename, &nd); ++ it.it_op = IT_SETATTR; ++ error = user_path_walk_it(filename, &nd, &it); + if (error) + goto out; + inode = nd.dentry->d_inode; + ++ nd.dentry->d_it = ⁢ + error = -EROFS; + if (IS_RDONLY(inode)) + goto dput_and_out; +@@ -511,6 +545,7 @@ + error = notify_change(nd.dentry, &newattrs); + + dput_and_out: ++ intent_release(nd.dentry); + path_release(&nd); + out: + return error; +@@ -580,10 +615,15 @@ + { + struct nameidata nd; + int error; ++ struct lookup_intent it; ++ ++ it.it_op = IT_SETATTR; + +- error = user_path_walk(filename, &nd); ++ error = user_path_walk_it(filename, &nd, &it); + if (!error) { ++ nd.dentry->d_it = ⁢ + error = chown_common(nd.dentry, user, group); ++ intent_release(nd.dentry); + path_release(&nd); + } + return error; +@@ -593,10 +633,15 @@ + { + struct nameidata nd; + int error; ++ struct lookup_intent it; + +- error = user_path_walk_link(filename, &nd); ++ it.it_op = IT_SETATTR; ++ ++ error = user_path_walk_link_it(filename, &nd, &it); + if (!error) { ++ nd.dentry->d_it = ⁢ + error = chown_common(nd.dentry, user, group); ++ intent_release(nd.dentry); + path_release(&nd); + } + return error; +@@ -630,10 +675,15 @@ * for the internal routines (ie open_namei()/follow_link() etc). 00 is * used by symlinks. */ +extern int open_namei_it(const char *filename, int namei_flags, int mode, -+ struct nameidata *nd, struct lookup_intent *it); ++ struct nameidata *nd, struct lookup_intent *it); +struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt, int flags, struct lookup_intent *it); + struct file *filp_open(const char * filename, int flags, int mode) { int namei_flags, error; struct nameidata nd; -+ struct lookup_intent it = {IT_OPEN, 0}; ++ struct lookup_intent it = {IT_OPEN, 0}; namei_flags = flags; if ((namei_flags+1) & O_ACCMODE) -@@ -641,14 +646,14 @@ +@@ -641,14 +691,14 @@ if (namei_flags & O_TRUNC) namei_flags |= 2; - error = open_namei(filename, namei_flags, mode, &nd); -+ error = open_namei_it(filename, namei_flags, mode, &nd, &it); ++ error = open_namei_it(filename, namei_flags, mode, &nd, &it); if (!error) - return dentry_open(nd.dentry, nd.mnt, flags); -+ return dentry_open_it(nd.dentry, nd.mnt, flags, &it); ++ return dentry_open_it(nd.dentry, nd.mnt, flags, &it); return ERR_PTR(error); } @@ -715,21 +955,19 @@ { struct file * f; struct inode *inode; -@@ -690,6 +695,7 @@ - goto cleanup_all; - } - f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC); -+ f->f_intent = it; - - return f; - -@@ -710,6 +716,13 @@ +@@ -705,11 +755,19 @@ + cleanup_file: + put_filp(f); + cleanup_dentry: ++ intent_release(dentry); + 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); ++ return dentry_open_it(dentry, mnt, flags, NULL); + +} + @@ -737,3 +975,152 @@ /* * Find an empty file descriptor entry, and mark it busy. */ +--- lum-pristine/fs/stat.c Thu Sep 13 19:04:43 2001 ++++ lum/fs/stat.c Fri Jun 14 01:51:11 2002 +@@ -13,6 +13,8 @@ + + #include + ++extern void intent_release(struct dentry *de); ++ + /* + * Revalidate the inode. This is required for proper NFS attribute caching. + */ +@@ -135,13 +137,15 @@ + asmlinkage long sys_stat(char * filename, struct __old_kernel_stat * statbuf) + { + struct nameidata nd; ++ struct lookup_intent it = {IT_GETATTR, 0}; + int error; + +- error = user_path_walk(filename, &nd); ++ error = user_path_walk_it(filename, &nd, &it); + if (!error) { + error = do_revalidate(nd.dentry); + if (!error) + error = cp_old_stat(nd.dentry->d_inode, statbuf); ++ intent_release(nd.dentry); + path_release(&nd); + } + return error; +@@ -151,13 +155,15 @@ + asmlinkage long sys_newstat(char * filename, struct stat * statbuf) + { + struct nameidata nd; ++ struct lookup_intent it = {IT_GETATTR, 0}; + int error; + +- error = user_path_walk(filename, &nd); ++ error = user_path_walk_it(filename, &nd, &it); + if (!error) { + error = do_revalidate(nd.dentry); + if (!error) + error = cp_new_stat(nd.dentry->d_inode, statbuf); ++ intent_release(nd.dentry); + path_release(&nd); + } + return error; +@@ -172,13 +178,15 @@ + asmlinkage long sys_lstat(char * filename, struct __old_kernel_stat * statbuf) + { + struct nameidata nd; ++ struct lookup_intent it = {IT_GETATTR, 0}; + int error; + +- error = user_path_walk_link(filename, &nd); ++ error = user_path_walk_link_it(filename, &nd, &it); + if (!error) { + error = do_revalidate(nd.dentry); + if (!error) + error = cp_old_stat(nd.dentry->d_inode, statbuf); ++ intent_release(nd.dentry); + path_release(&nd); + } + return error; +@@ -189,13 +197,15 @@ + asmlinkage long sys_newlstat(char * filename, struct stat * statbuf) + { + struct nameidata nd; ++ struct lookup_intent it = {IT_GETATTR, 0}; + int error; + +- error = user_path_walk_link(filename, &nd); ++ error = user_path_walk_link_it(filename, &nd, &it); + if (!error) { + error = do_revalidate(nd.dentry); + if (!error) + error = cp_new_stat(nd.dentry->d_inode, statbuf); ++ intent_release(nd.dentry); + path_release(&nd); + } + return error; +@@ -247,20 +257,22 @@ + { + struct nameidata nd; + int error; ++ struct lookup_intent it; ++ it.it_op = IT_READLINK; + + if (bufsiz <= 0) + return -EINVAL; + +- error = user_path_walk_link(path, &nd); ++ error = user_path_walk_link_it(path, &nd, &it); + if (!error) { + struct inode * inode = nd.dentry->d_inode; +- + error = -EINVAL; + if (inode->i_op && inode->i_op->readlink && + !(error = do_revalidate(nd.dentry))) { + UPDATE_ATIME(inode); + error = inode->i_op->readlink(nd.dentry, buf, bufsiz); + } ++ intent_release(nd.dentry); + path_release(&nd); + } + return error; +@@ -333,12 +345,15 @@ + { + struct nameidata nd; + int error; ++ struct lookup_intent it; ++ it.it_op = IT_GETATTR; + +- error = user_path_walk(filename, &nd); ++ error = user_path_walk_it(filename, &nd, &it); + if (!error) { + error = do_revalidate(nd.dentry); + if (!error) + error = cp_new_stat64(nd.dentry->d_inode, statbuf); ++ intent_release(nd.dentry); + path_release(&nd); + } + return error; +@@ -348,12 +363,15 @@ + { + struct nameidata nd; + int error; ++ struct lookup_intent it; ++ it.it_op = IT_GETATTR; + +- error = user_path_walk_link(filename, &nd); ++ error = user_path_walk_link_it(filename, &nd, &it); + if (!error) { + error = do_revalidate(nd.dentry); + if (!error) + error = cp_new_stat64(nd.dentry->d_inode, statbuf); ++ intent_release(nd.dentry); + path_release(&nd); + } + return error; +@@ -363,6 +381,10 @@ + { + struct file * f; + int err = -EBADF; ++ struct lookup_intent it; ++ ++ memset(&it, 0, sizeof(it)); ++ it.it_op = IT_GETATTR; + + f = fget(fd); + if (f) { diff --git a/lustre/patches/patch-2.4.18 b/lustre/patches/patch-2.4.18 index 3a60de9..6c258a5 100644 --- a/lustre/patches/patch-2.4.18 +++ b/lustre/patches/patch-2.4.18 @@ -1,5 +1,5 @@ ---- lum-pristine/drivers/block/blkpg.c Mon Feb 25 12:37:57 2002 -+++ lum/drivers/block/blkpg.c Fri Jun 7 12:49:14 2002 +--- lum-pristine/drivers/block/blkpg.c Mon Feb 25 14:37:57 2002 ++++ lum/drivers/block/blkpg.c Fri Jun 7 14:49:14 2002 @@ -294,3 +294,38 @@ } @@ -39,8 +39,8 @@ +EXPORT_SYMBOL(dev_set_rdonly); +EXPORT_SYMBOL(dev_check_rdonly); +EXPORT_SYMBOL(dev_clear_rdonly); ---- lum-pristine/drivers/block/loop.c Fri Dec 21 10:41:53 2001 -+++ lum/drivers/block/loop.c Fri Jun 7 12:49:14 2002 +--- lum-pristine/drivers/block/loop.c Fri Dec 21 12:41:53 2001 ++++ lum/drivers/block/loop.c Fri Jun 7 14:49:14 2002 @@ -471,6 +471,11 @@ spin_unlock_irq(&lo->lo_lock); @@ -53,8 +53,8 @@ if (lo->lo_flags & LO_FLAGS_READ_ONLY) goto err; } else if (rw == READA) { ---- lum-pristine/drivers/ide/ide-disk.c Fri Dec 21 10:41:54 2001 -+++ lum/drivers/ide/ide-disk.c Fri Jun 7 12:49:14 2002 +--- lum-pristine/drivers/ide/ide-disk.c Fri Dec 21 12:41:54 2001 ++++ lum/drivers/ide/ide-disk.c Fri Jun 7 14:49:14 2002 @@ -367,6 +367,12 @@ */ static ide_startstop_t do_rw_disk (ide_drive_t *drive, struct request *rq, unsigned long block) @@ -68,8 +68,8 @@ if (IDE_CONTROL_REG) OUT_BYTE(drive->ctl,IDE_CONTROL_REG); OUT_BYTE(0x00, IDE_FEATURE_REG); ---- lum-pristine/fs/ext3/Makefile Fri Dec 21 10:41:55 2001 -+++ lum/fs/ext3/Makefile Fri Jun 7 12:49:13 2002 +--- lum-pristine/fs/ext3/Makefile Fri Dec 21 12:41:55 2001 ++++ lum/fs/ext3/Makefile Fri Jun 7 14:49:13 2002 @@ -9,6 +9,8 @@ O_TARGET := ext3.o @@ -79,8 +79,8 @@ obj-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \ ioctl.o namei.o super.o symlink.o obj-m := $(O_TARGET) ---- lum-pristine/fs/ext3/super.c Mon Feb 25 12:38:08 2002 -+++ lum/fs/ext3/super.c Fri Jun 7 12:49:14 2002 +--- lum-pristine/fs/ext3/super.c Mon Feb 25 14:38:08 2002 ++++ lum/fs/ext3/super.c Fri Jun 7 14:49:14 2002 @@ -1744,7 +1744,7 @@ unregister_filesystem(&ext3_fs_type); } @@ -90,8 +90,8 @@ MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others"); MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions"); ---- lum-pristine/fs/jbd/commit.c Mon Feb 25 12:38:08 2002 -+++ lum/fs/jbd/commit.c Fri Jun 7 12:49:14 2002 +--- lum-pristine/fs/jbd/commit.c Mon Feb 25 14:38:08 2002 ++++ lum/fs/jbd/commit.c Fri Jun 7 14:49:14 2002 @@ -475,7 +475,7 @@ transaction's t_log_list queue, and metadata buffers are on the t_iobuf_list queue. @@ -155,8 +155,8 @@ jbd_debug(3, "JBD: commit phase 7\n"); J_ASSERT(commit_transaction->t_sync_datalist == NULL); ---- lum-pristine/fs/jbd/journal.c Mon Feb 25 12:38:08 2002 -+++ lum/fs/jbd/journal.c Fri Jun 7 12:49:14 2002 +--- lum-pristine/fs/jbd/journal.c Mon Feb 25 14:38:08 2002 ++++ lum/fs/jbd/journal.c Fri Jun 7 14:49:14 2002 @@ -58,6 +58,7 @@ #endif EXPORT_SYMBOL(journal_flush); @@ -165,8 +165,8 @@ EXPORT_SYMBOL(journal_init_dev); EXPORT_SYMBOL(journal_init_inode); ---- lum-pristine/fs/jbd/transaction.c Mon Feb 25 12:38:08 2002 -+++ lum/fs/jbd/transaction.c Fri Jun 7 12:49:14 2002 +--- lum-pristine/fs/jbd/transaction.c Mon Feb 25 14:38:08 2002 ++++ lum/fs/jbd/transaction.c Fri Jun 7 14:49:14 2002 @@ -57,6 +57,7 @@ transaction->t_state = T_RUNNING; transaction->t_tid = journal->j_transaction_sequence++; @@ -266,8 +266,8 @@ /* * If the handle is marked SYNC, we need to set another commit * going! We also want to force a commit if the current ---- lum-pristine/include/linux/blkdev.h Mon Nov 26 06:29:17 2001 -+++ lum/include/linux/blkdev.h Wed Jun 12 19:25:22 2002 +--- lum-pristine/include/linux/blkdev.h Mon Nov 26 08:29:17 2001 ++++ lum/include/linux/blkdev.h Fri Jun 14 03:07:40 2002 @@ -228,4 +228,8 @@ return retval; } @@ -277,8 +277,8 @@ +int dev_check_rdonly(kdev_t); +void dev_clear_rdonly(int); #endif ---- lum-pristine/include/linux/jbd.h Mon Feb 25 12:38:13 2002 -+++ lum/include/linux/jbd.h Wed Jun 12 19:23:11 2002 +--- lum-pristine/include/linux/jbd.h Mon Feb 25 14:38:13 2002 ++++ lum/include/linux/jbd.h Fri Jun 14 13:22:24 2002 @@ -249,6 +249,13 @@ return bh->b_private; } @@ -326,8 +326,8 @@ extern void journal_lock_updates (journal_t *); extern void journal_unlock_updates (journal_t *); ---- lum-pristine/kernel/ksyms.c Mon Feb 25 12:38:13 2002 -+++ lum/kernel/ksyms.c Fri Jun 7 12:49:13 2002 +--- lum-pristine/kernel/ksyms.c Mon Feb 25 14:38:13 2002 ++++ lum/kernel/ksyms.c Fri Jun 7 14:49:13 2002 @@ -271,6 +271,11 @@ EXPORT_SYMBOL(lock_may_write); EXPORT_SYMBOL(dcache_readdir); @@ -340,9 +340,9 @@ /* for stackable file systems (lofs, wrapfs, cryptfs, etc.) */ EXPORT_SYMBOL(default_llseek); EXPORT_SYMBOL(dentry_open); ---- lum-pristine/include/linux/dcache.h Thu Nov 22 12:46:18 2001 -+++ lum/include/linux/dcache.h Wed Jun 12 19:21:33 2002 -@@ -6,6 +6,31 @@ +--- lum-pristine/include/linux/dcache.h Thu Nov 22 14:46:18 2001 ++++ lum/include/linux/dcache.h Fri Jun 14 03:03:17 2002 +@@ -6,6 +6,32 @@ #include #include @@ -359,6 +359,7 @@ +#define IT_GETATTR (1<<10) +#define IT_SETATTR (1<<11) +#define IT_READLINK (1<<12) ++#define IT_MKNOD (1<<13) + +struct lookup_intent { + int it_op; @@ -374,7 +375,7 @@ /* * linux/include/linux/dcache.h * -@@ -79,17 +104,20 @@ +@@ -79,17 +105,20 @@ struct dentry_operations *d_op; struct super_block * d_sb; /* The root of the dentry tree */ unsigned long d_vfs_flags; @@ -395,8 +396,8 @@ }; /* the dentry parameter passed to d_hash and d_compare is the parent ---- lum-pristine/include/linux/fs.h Thu Jun 13 14:07:26 2002 -+++ lum/include/linux/fs.h Wed Jun 12 19:21:56 2002 +--- lum-pristine/include/linux/fs.h Fri Jun 14 13:54:00 2002 ++++ lum/include/linux/fs.h Fri Jun 14 03:04:28 2002 @@ -536,6 +536,7 @@ /* needed for tty driver, and maybe others */ @@ -450,8 +451,8 @@ extern void iput(struct inode *); extern void force_delete(struct inode *); ---- lum-pristine/fs/namei.c Mon Feb 25 12:38:09 2002 -+++ lum/fs/namei.c Wed Jun 12 19:18:36 2002 +--- lum-pristine/fs/namei.c Mon Feb 25 14:38:09 2002 ++++ lum/fs/namei.c Fri Jun 14 13:49:06 2002 @@ -94,6 +94,14 @@ * XEmacs seems to be relying on it... */ @@ -571,7 +572,20 @@ break; } goto return_base; -@@ -636,12 +662,24 @@ +@@ -626,6 +652,7 @@ + else if (this.len == 2 && this.name[1] == '.') + nd->last_type = LAST_DOTDOT; + return_base: ++ nd->dentry->d_it = it; + return 0; + out_dput: + dput(dentry); +@@ -633,15 +660,29 @@ + } + path_release(nd); + return_err: ++ if (!err) ++ nd->dentry->d_it = it; return err; } @@ -597,7 +611,7 @@ /* SMP-safe */ /* returns 1 if everything is done */ static int __emul_lookup_dentry(const char *name, struct nameidata *nd) -@@ -742,7 +780,8 @@ +@@ -742,7 +783,8 @@ * needs parent already locked. Doesn't follow mounts. * SMP-safe. */ @@ -607,7 +621,7 @@ { struct dentry * dentry; struct inode *inode; -@@ -765,13 +804,16 @@ +@@ -765,13 +807,16 @@ goto out; } @@ -625,7 +639,7 @@ dentry = inode->i_op->lookup(inode, new); unlock_kernel(); if (!dentry) -@@ -783,6 +825,12 @@ +@@ -783,6 +828,12 @@ return dentry; } @@ -638,7 +652,7 @@ /* SMP-safe */ struct dentry * lookup_one_len(const char * name, struct dentry * base, int len) { -@@ -804,7 +852,7 @@ +@@ -804,7 +855,7 @@ } this.hash = end_name_hash(hash); @@ -647,7 +661,7 @@ access: return ERR_PTR(-EACCES); } -@@ -836,6 +884,22 @@ +@@ -836,6 +887,22 @@ return err; } @@ -670,7 +684,7 @@ /* * It's inline, so penalty for filesystems that don't use sticky bit is * minimal. -@@ -970,7 +1034,8 @@ +@@ -970,7 +1037,8 @@ * for symlinks (where the permissions are checked later). * SMP-safe */ @@ -680,7 +694,7 @@ { int acc_mode, error = 0; struct inode *inode; -@@ -984,8 +1049,9 @@ +@@ -984,17 +1052,21 @@ * The simplest case - just a plain lookup. */ if (!(flag & O_CREAT)) { @@ -691,7 +705,10 @@ if (error) return error; dentry = nd->dentry; -@@ -995,6 +1061,8 @@ ++ dentry->d_it = it; + goto ok; + } + /* * Create - we need to know the parent. */ @@ -700,7 +717,7 @@ if (path_init(pathname, LOOKUP_PARENT, nd)) error = path_walk(pathname, nd); if (error) -@@ -1011,7 +1079,7 @@ +@@ -1011,7 +1083,7 @@ dir = nd->dentry; down(&dir->d_inode->i_sem); @@ -709,7 +726,7 @@ do_last: error = PTR_ERR(dentry); -@@ -1022,6 +1090,7 @@ +@@ -1022,6 +1094,7 @@ /* Negative dentry, just create the file */ if (!dentry->d_inode) { @@ -717,7 +734,19 @@ error = vfs_create(dir->d_inode, dentry, mode & ~current->fs->umask); up(&dir->d_inode->i_sem); -@@ -1181,13 +1250,20 @@ +@@ -1136,9 +1209,11 @@ + if (flag & FMODE_WRITE) + DQUOT_INIT(inode); + ++ intent_release(dentry); + return 0; + + exit_dput: ++ intent_release(dentry); + dput(dentry); + exit: + path_release(nd); +@@ -1181,13 +1256,20 @@ } dir = nd->dentry; down(&dir->d_inode->i_sem); @@ -740,7 +769,7 @@ { struct dentry *dentry; -@@ -1195,7 +1271,7 @@ +@@ -1195,7 +1277,7 @@ dentry = ERR_PTR(-EEXIST); if (nd->last_type != LAST_NORM) goto fail; @@ -749,15 +778,15 @@ if (IS_ERR(dentry)) goto fail; if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode) -@@ -1241,6 +1317,7 @@ +@@ -1241,6 +1323,7 @@ char * tmp; struct dentry * dentry; struct nameidata nd; -+ struct lookup_intent it = { IT_CREAT , mode }; ++ struct lookup_intent it = { IT_MKNOD , mode }; if (S_ISDIR(mode)) return -EPERM; -@@ -1252,11 +1329,12 @@ +@@ -1252,11 +1335,12 @@ error = path_walk(tmp, &nd); if (error) goto out; @@ -771,7 +800,7 @@ switch (mode & S_IFMT) { case 0: case S_IFREG: error = vfs_create(nd.dentry->d_inode,dentry,mode); -@@ -1272,6 +1350,7 @@ +@@ -1272,6 +1356,7 @@ } dput(dentry); } @@ -779,7 +808,7 @@ up(&nd.dentry->d_inode->i_sem); path_release(&nd); out: -@@ -1310,6 +1389,7 @@ +@@ -1310,6 +1395,7 @@ { int error = 0; char * tmp; @@ -787,7 +816,7 @@ tmp = getname(pathname); error = PTR_ERR(tmp); -@@ -1321,13 +1401,15 @@ +@@ -1321,13 +1407,15 @@ error = path_walk(tmp, &nd); if (error) goto out; @@ -804,7 +833,7 @@ up(&nd.dentry->d_inode->i_sem); path_release(&nd); out: -@@ -1407,6 +1489,7 @@ +@@ -1407,6 +1495,7 @@ char * name; struct dentry *dentry; struct nameidata nd; @@ -812,7 +841,7 @@ name = getname(pathname); if(IS_ERR(name)) -@@ -1429,10 +1512,12 @@ +@@ -1429,10 +1518,12 @@ goto exit1; } down(&nd.dentry->d_inode->i_sem); @@ -826,7 +855,7 @@ dput(dentry); } up(&nd.dentry->d_inode->i_sem); -@@ -1476,6 +1561,7 @@ +@@ -1476,6 +1567,7 @@ char * name; struct dentry *dentry; struct nameidata nd; @@ -834,7 +863,7 @@ name = getname(pathname); if(IS_ERR(name)) -@@ -1489,14 +1575,16 @@ +@@ -1489,14 +1581,16 @@ if (nd.last_type != LAST_NORM) goto exit1; down(&nd.dentry->d_inode->i_sem); @@ -852,7 +881,7 @@ dput(dentry); } up(&nd.dentry->d_inode->i_sem); -@@ -1543,6 +1631,7 @@ +@@ -1543,6 +1637,7 @@ int error = 0; char * from; char * to; @@ -860,7 +889,7 @@ from = getname(oldname); if(IS_ERR(from)) -@@ -1557,12 +1646,14 @@ +@@ -1557,12 +1652,14 @@ error = path_walk(to, &nd); if (error) goto out; @@ -876,7 +905,7 @@ up(&nd.dentry->d_inode->i_sem); path_release(&nd); out: -@@ -1626,6 +1717,7 @@ +@@ -1626,6 +1723,7 @@ int error; char * from; char * to; @@ -884,7 +913,7 @@ from = getname(oldname); if(IS_ERR(from)) -@@ -1648,12 +1740,14 @@ +@@ -1648,12 +1746,14 @@ error = -EXDEV; if (old_nd.mnt != nd.mnt) goto out_release; @@ -900,7 +929,7 @@ up(&nd.dentry->d_inode->i_sem); out_release: path_release(&nd); -@@ -1694,7 +1788,8 @@ +@@ -1694,7 +1794,8 @@ * locking]. */ int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry, @@ -910,7 +939,7 @@ { int error; struct inode *target; -@@ -1748,12 +1843,14 @@ +@@ -1748,12 +1849,14 @@ } else double_down(&old_dir->i_zombie, &new_dir->i_zombie); @@ -925,7 +954,7 @@ if (target) { if (!error) target->i_flags |= S_DEAD; -@@ -1775,7 +1872,8 @@ +@@ -1775,7 +1878,8 @@ } int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry, @@ -935,7 +964,7 @@ { int error; -@@ -1802,10 +1900,12 @@ +@@ -1802,10 +1906,12 @@ DQUOT_INIT(old_dir); DQUOT_INIT(new_dir); double_down(&old_dir->i_zombie, &new_dir->i_zombie); @@ -948,7 +977,7 @@ double_up(&old_dir->i_zombie, &new_dir->i_zombie); if (error) return error; -@@ -1817,13 +1917,14 @@ +@@ -1817,13 +1923,14 @@ } int vfs_rename(struct inode *old_dir, struct dentry *old_dentry, @@ -966,7 +995,7 @@ if (!error) { if (old_dir == new_dir) inode_dir_notify(old_dir, DN_RENAME); -@@ -1841,6 +1942,7 @@ +@@ -1841,6 +1948,7 @@ struct dentry * old_dir, * new_dir; struct dentry * old_dentry, *new_dentry; struct nameidata oldnd, newnd; @@ -974,7 +1003,7 @@ if (path_init(oldname, LOOKUP_PARENT, &oldnd)) error = path_walk(oldname, &oldnd); -@@ -1868,7 +1970,9 @@ +@@ -1868,7 +1976,9 @@ double_lock(new_dir, old_dir); @@ -985,7 +1014,7 @@ error = PTR_ERR(old_dentry); if (IS_ERR(old_dentry)) goto exit3; -@@ -1884,14 +1988,15 @@ +@@ -1884,14 +1994,15 @@ if (newnd.last.name[newnd.last.len]) goto exit4; } @@ -1003,8 +1032,8 @@ unlock_kernel(); dput(new_dentry); ---- lum-pristine/fs/open.c Fri Oct 12 14:48:42 2001 -+++ lum/fs/open.c Fri Jun 7 12:49:14 2002 +--- lum-pristine/fs/open.c Fri Oct 12 16:48:42 2001 ++++ lum/fs/open.c Thu Jun 13 20:22:44 2002 @@ -19,6 +19,8 @@ #include @@ -1268,15 +1297,13 @@ { struct file * f; struct inode *inode; -@@ -690,6 +740,7 @@ - goto cleanup_all; - } - f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC); -+ f->f_intent = it; - - return f; - -@@ -710,6 +761,13 @@ +@@ -705,11 +755,19 @@ + cleanup_file: + put_filp(f); + cleanup_dentry: ++ intent_release(dentry); + dput(dentry); + mntput(mnt); return ERR_PTR(error); } @@ -1290,9 +1317,86 @@ /* * Find an empty file descriptor entry, and mark it busy. */ ---- lum-pristine/fs/stat.c Thu Sep 13 17:04:43 2001 -+++ lum/fs/stat.c Fri Jun 7 12:49:14 2002 -@@ -247,14 +247,16 @@ +--- lum-pristine/fs/stat.c Thu Sep 13 19:04:43 2001 ++++ lum/fs/stat.c Fri Jun 14 01:51:11 2002 +@@ -13,6 +13,8 @@ + + #include + ++extern void intent_release(struct dentry *de); ++ + /* + * Revalidate the inode. This is required for proper NFS attribute caching. + */ +@@ -135,13 +137,15 @@ + asmlinkage long sys_stat(char * filename, struct __old_kernel_stat * statbuf) + { + struct nameidata nd; ++ struct lookup_intent it = {IT_GETATTR, 0}; + int error; + +- error = user_path_walk(filename, &nd); ++ error = user_path_walk_it(filename, &nd, &it); + if (!error) { + error = do_revalidate(nd.dentry); + if (!error) + error = cp_old_stat(nd.dentry->d_inode, statbuf); ++ intent_release(nd.dentry); + path_release(&nd); + } + return error; +@@ -151,13 +155,15 @@ + asmlinkage long sys_newstat(char * filename, struct stat * statbuf) + { + struct nameidata nd; ++ struct lookup_intent it = {IT_GETATTR, 0}; + int error; + +- error = user_path_walk(filename, &nd); ++ error = user_path_walk_it(filename, &nd, &it); + if (!error) { + error = do_revalidate(nd.dentry); + if (!error) + error = cp_new_stat(nd.dentry->d_inode, statbuf); ++ intent_release(nd.dentry); + path_release(&nd); + } + return error; +@@ -172,13 +178,15 @@ + asmlinkage long sys_lstat(char * filename, struct __old_kernel_stat * statbuf) + { + struct nameidata nd; ++ struct lookup_intent it = {IT_GETATTR, 0}; + int error; + +- error = user_path_walk_link(filename, &nd); ++ error = user_path_walk_link_it(filename, &nd, &it); + if (!error) { + error = do_revalidate(nd.dentry); + if (!error) + error = cp_old_stat(nd.dentry->d_inode, statbuf); ++ intent_release(nd.dentry); + path_release(&nd); + } + return error; +@@ -189,13 +197,15 @@ + asmlinkage long sys_newlstat(char * filename, struct stat * statbuf) + { + struct nameidata nd; ++ struct lookup_intent it = {IT_GETATTR, 0}; + int error; + +- error = user_path_walk_link(filename, &nd); ++ error = user_path_walk_link_it(filename, &nd, &it); + if (!error) { + error = do_revalidate(nd.dentry); + if (!error) + error = cp_new_stat(nd.dentry->d_inode, statbuf); ++ intent_release(nd.dentry); + path_release(&nd); + } + return error; +@@ -247,20 +257,22 @@ { struct nameidata nd; int error; @@ -1307,11 +1411,17 @@ if (!error) { struct inode * inode = nd.dentry->d_inode; - -+ nd.dentry->d_it = ⁢ error = -EINVAL; if (inode->i_op && inode->i_op->readlink && !(error = do_revalidate(nd.dentry))) { -@@ -333,9 +335,12 @@ + UPDATE_ATIME(inode); + error = inode->i_op->readlink(nd.dentry, buf, bufsiz); + } ++ intent_release(nd.dentry); + path_release(&nd); + } + return error; +@@ -333,12 +345,15 @@ { struct nameidata nd; int error; @@ -1321,11 +1431,14 @@ - error = user_path_walk(filename, &nd); + error = user_path_walk_it(filename, &nd, &it); if (!error) { -+ nd.dentry->d_it = ⁢ error = do_revalidate(nd.dentry); if (!error) error = cp_new_stat64(nd.dentry->d_inode, statbuf); -@@ -348,9 +353,12 @@ ++ intent_release(nd.dentry); + path_release(&nd); + } + return error; +@@ -348,12 +363,15 @@ { struct nameidata nd; int error; @@ -1335,11 +1448,14 @@ - error = user_path_walk_link(filename, &nd); + error = user_path_walk_link_it(filename, &nd, &it); if (!error) { -+ nd.dentry->d_it = ⁢ error = do_revalidate(nd.dentry); if (!error) error = cp_new_stat64(nd.dentry->d_inode, statbuf); -@@ -363,11 +371,16 @@ ++ intent_release(nd.dentry); + path_release(&nd); + } + return error; +@@ -363,6 +381,10 @@ { struct file * f; int err = -EBADF; @@ -1350,9 +1466,3 @@ f = fget(fd); if (f) { - struct dentry * dentry = f->f_dentry; - -+ dentry->d_it = ⁢ - err = do_revalidate(dentry); - if (!err) - err = cp_new_stat64(dentry->d_inode, statbuf); diff --git a/lustre/tests/common.sh b/lustre/tests/common.sh index 3c65364..8753e66 100644 --- a/lustre/tests/common.sh +++ b/lustre/tests/common.sh @@ -205,7 +205,7 @@ setup_lustre() { do_insmod $LUSTRE/mds/mds_extN.o || \ echo "info: can't load mds_extN.o module, needs extN.o" do_insmod $LUSTRE/obdecho/obdecho.o || exit -1 - do_insmod $LUSTRE/obdext2/obdext2.o || exit -1 + #do_insmod $LUSTRE/obdext2/obdext2.o || exit -1 do_insmod $LUSTRE/obdfilter/obdfilter.o || exit -1 do_insmod $LUSTRE/ost/ost.o || exit -1 do_insmod $LUSTRE/osc/osc.o || exit -1 diff --git a/lustre/tests/intent-test.sh b/lustre/tests/intent-test.sh new file mode 100755 index 0000000..17d9bbc --- /dev/null +++ b/lustre/tests/intent-test.sh @@ -0,0 +1,93 @@ +#!/bin/bash -x + +mkdir /mnt/lustre/foo +mkdir /mnt/lustre/foo2 + +mkdir /mnt/lustre/foo + +umount /mnt/lustre +mount -t lustre_lite -o ost=5,mds=6 none /mnt/lustre + +mkdir /mnt/lustre/foo + +umount /mnt/lustre +mount -t lustre_lite -o ost=5,mds=6 none /mnt/lustre + +./mcreate /mnt/lustre/bar +./mcreate /mnt/lustre/bar + +umount /mnt/lustre +mount -t lustre_lite -o ost=5,mds=6 none /mnt/lustre + +./mcreate /mnt/lustre/bar + +umount /mnt/lustre +mount -t lustre_lite -o ost=5,mds=6 none /mnt/lustre + +ls -l /mnt/lustre/bar + +umount /mnt/lustre +mount -t lustre_lite -o ost=5,mds=6 none /mnt/lustre + +cat /mnt/lustre/bar +./mcreate /mnt/lustre/bar2 +cat /mnt/lustre/bar2 +./mcreate /mnt/lustre/bar3 + +umount /mnt/lustre +mount -t lustre_lite -o ost=5,mds=6 none /mnt/lustre + +./tchmod 777 /mnt/lustre/bar3 + +umount /mnt/lustre +mount -t lustre_lite -o ost=5,mds=6 none /mnt/lustre + +./mcreate /mnt/lustre/bar4 +./tchmod 777 /mnt/lustre/bar4 + +umount /mnt/lustre +mount -t lustre_lite -o ost=5,mds=6 none /mnt/lustre + +ls -l /mnt/lustre/bar4 +./tchmod 777 /mnt/lustre/bar4 + +umount /mnt/lustre +mount -t lustre_lite -o ost=5,mds=6 none /mnt/lustre + +cat /mnt/lustre/bar4 +./tchmod 777 /mnt/lustre/bar4 + +umount /mnt/lustre +mount -t lustre_lite -o ost=5,mds=6 none /mnt/lustre + +touch /mnt/lustre/bar +touch /mnt/lustre/bar2 + +touch /mnt/lustre/bar + +umount /mnt/lustre +mount -t lustre_lite -o ost=5,mds=6 none /mnt/lustre + +touch /mnt/lustre/bar + +exit; + +echo foo >> /mnt/lustre/bar + +umount /mnt/lustre +mount -t lustre_lite -o ost=5,mds=6 none /mnt/lustre + +ls /mnt/lustre + +umount /mnt/lustre +mount -t lustre_lite -o ost=5,mds=6 none /mnt/lustre + +mkdir /mnt/lustre/new +ls /mnt/lustre + +umount /mnt/lustre +mount -t lustre_lite -o ost=5,mds=6 none /mnt/lustre + +ls /mnt/lustre +mkdir /mnt/lustre/newer +ls /mnt/lustre