lustre/kernel_patches/patches/vfs_intent-2.4.21-suse2.patch

   1  fs/dcache.c               |   19 ++
   2  fs/exec.c                 |   17 +-
   3  fs/namei.c                |  295 +++++++++++++++++++++++++++++++++++++++-------
   4  fs/namespace.c            |   28 +++-
   5  fs/open.c                 |  172 +++++++++++++++++++-------
   6  fs/stat.c                 |   52 +++++---
   7  include/linux/dcache.h    |   60 +++++++++
   8  include/linux/fs.h        |   32 ++++
   9  include/linux/fs_struct.h |    4
  10  kernel/exit.c             |    3
  11  kernel/fork.c             |    3
  12  kernel/ksyms.c            |    1
  13  12 files changed, 558 insertions(+), 128 deletions(-)
  14
  15 Index: linux-2.4.21-x86_64/fs/dcache.c
  16 ===================================================================
  17 --- linux-2.4.21-x86_64.orig/fs/dcache.c        2003-10-28 10:33:59.000000000 -0800
  18 +++ linux-2.4.21-x86_64/fs/dcache.c     2004-04-12 19:57:36.000000000 -0700
  19 @@ -186,6 +186,13 @@
  20                 spin_unlock(&dcache_lock);
  21                 return 0;
  22         }
  23 +
  24 +       /* network invalidation by Lustre */
  25 +       if (dentry->d_flags & DCACHE_LUSTRE_INVALID) {
  26 +               spin_unlock(&dcache_lock);
  27 +               return 0;
  28 +       }
  29 +
  30         /*
  31          * Check whether to do a partial shrink_dcache
  32          * to get rid of unused child entries.
  33 @@ -838,13 +845,19 @@
  34   * Adds a dentry to the hash according to its name.
  35   */
  36
  37 -void d_rehash(struct dentry * entry)
  38 +void __d_rehash(struct dentry * entry, int lock)
  39  {
  40         struct list_head *list = d_hash(entry->d_parent, entry->d_name.hash);
  41         if (!list_empty(&entry->d_hash)) BUG();
  42 -       spin_lock(&dcache_lock);
  43 +       if (lock) spin_lock(&dcache_lock);
  44         list_add(&entry->d_hash, list);
  45 -       spin_unlock(&dcache_lock);
  46 +       if (lock) spin_unlock(&dcache_lock);
  47 +}
  48 +EXPORT_SYMBOL(__d_rehash);
  49 +
  50 +void d_rehash(struct dentry * entry)
  51 +{
  52 +       __d_rehash(entry, 1);
  53  }
  54
  55  #define do_switch(x,y) do { \
  56 Index: linux-2.4.21-x86_64/fs/exec.c
  57 ===================================================================
  58 --- linux-2.4.21-x86_64.orig/fs/exec.c  2003-10-28 10:34:17.000000000 -0800
  59 +++ linux-2.4.21-x86_64/fs/exec.c       2004-04-12 19:57:36.000000000 -0700
  60 @@ -112,8 +112,10 @@
  61         struct file * file;
  62         struct nameidata nd;
  63         int error;
  64 +       struct lookup_intent it = { .it_op = IT_OPEN,
  65 +                                   .it_flags = FMODE_READ|FMODE_EXEC };
  66
  67 -       error = user_path_walk(library, &nd);
  68 +       error = user_path_walk_it(library, &nd, &it);
  69         if (error)
  70                 goto out;
  71
  72 @@ -125,7 +127,8 @@
  73         if (error)
  74                 goto exit;
  75
  76 -       file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
  77 +       file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &it);
  78 +       intent_release(&it);
  79         error = PTR_ERR(file);
  80         if (IS_ERR(file))
  81                 goto out;
  82 @@ -382,8 +385,10 @@
  83         struct inode *inode;
  84         struct file *file;
  85         int err = 0;
  86 +       struct lookup_intent it = { .it_op = IT_OPEN,
  87 +                                   .it_flags = FMODE_READ|FMODE_EXEC };
  88
  89 -       err = path_lookup(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd);
  90 +       err = path_lookup_it(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd, &it);
  91         file = ERR_PTR(err);
  92         if (!err) {
  93                 inode = nd.dentry->d_inode;
  94 @@ -395,7 +400,8 @@
  95                                 err = -EACCES;
  96                         file = ERR_PTR(err);
  97                         if (!err) {
  98 -                               file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
  99 +                               file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &it);
 100 +                               intent_release(&it);
 101                                 if (!IS_ERR(file)) {
 102                                         err = deny_write_access(file);
 103                                         if (err) {
 104 @@ -407,6 +413,7 @@
 105                                 return file;
 106                         }
 107                 }
 108 +               intent_release(&it);
 109                 path_release(&nd);
 110         }
 111         goto out;
 112 @@ -1150,7 +1157,7 @@
 113                 goto close_fail;
 114         if (!file->f_op->write)
 115                 goto close_fail;
 116 -       if (do_truncate(file->f_dentry, 0) != 0)
 117 +       if (do_truncate(file->f_dentry, 0, 0) != 0)
 118                 goto close_fail;
 119
 120         retval = binfmt->core_dump(signr, regs, file);
 121 Index: linux-2.4.21-x86_64/fs/namei.c
 122 ===================================================================
 123 --- linux-2.4.21-x86_64.orig/fs/namei.c 2003-10-28 10:34:18.000000000 -0800
 124 +++ linux-2.4.21-x86_64/fs/namei.c      2004-04-12 19:58:44.000000000 -0700
 125 @@ -94,6 +94,13 @@
 126   * XEmacs seems to be relying on it...
 127   */
 128
 129 +void intent_release(struct lookup_intent *it)
 130 +{
 131 +       if (it && it->it_op_release)
 132 +               it->it_op_release(it);
 133 +
 134 +}
 135 +
 136  /* In order to reduce some races, while at the same time doing additional
 137   * checking and hopefully speeding things up, we copy filenames to the
 138   * kernel data space before using them..
 139 @@ -260,10 +267,19 @@
 140   * Internal lookup() using the new generic dcache.
 141   * SMP-safe
 142   */
 143 -static struct dentry * cached_lookup(struct dentry * parent, struct qstr * name, int flags)
 144 +static struct dentry *cached_lookup(struct dentry *parent, struct qstr *name,
 145 +                                   int flags, struct lookup_intent *it)
 146  {
 147         struct dentry * dentry = d_lookup(parent, name);
 148
 149 +       if (dentry && dentry->d_op && dentry->d_op->d_revalidate_it) {
 150 +               if (!dentry->d_op->d_revalidate_it(dentry, flags, it) &&
 151 +                   !d_invalidate(dentry)) {
 152 +                       dput(dentry);
 153 +                       dentry = NULL;
 154 +               }
 155 +               return dentry;
 156 +       } else
 157         if (dentry && dentry->d_op && dentry->d_op->d_revalidate) {
 158                 if (!dentry->d_op->d_revalidate(dentry, flags) && !d_invalidate(dentry)) {
 159                         dput(dentry);
 160 @@ -281,11 +297,15 @@
 161   * make sure that nobody added the entry to the dcache in the meantime..
 162   * SMP-safe
 163   */
 164 -static struct dentry * real_lookup(struct dentry * parent, struct qstr * name, int flags)
 165 +static struct dentry *real_lookup(struct dentry *parent, struct qstr *name,
 166 +                                 int flags, struct lookup_intent *it)
 167  {
 168         struct dentry * result;
 169         struct inode *dir = parent->d_inode;
 170 +       int counter = 0;
 171
 172 +again:
 173 +       counter++;
 174         down(&dir->i_sem);
 175         /*
 176          * First re-do the cached lookup just in case it was created
 177 @@ -300,6 +320,9 @@
 178                 result = ERR_PTR(-ENOMEM);
 179                 if (dentry) {
 180                         lock_kernel();
 181 +                       if (dir->i_op->lookup_it)
 182 +                               result = dir->i_op->lookup_it(dir, dentry, it, flags);
 183 +                       else
 184                         result = dir->i_op->lookup(dir, dentry);
 185                         unlock_kernel();
 186                         if (result)
 187 @@ -321,6 +344,15 @@
 188                         dput(result);
 189                         result = ERR_PTR(-ENOENT);
 190                 }
 191 +       } else if (result->d_op && result->d_op->d_revalidate_it) {
 192 +               if (!result->d_op->d_revalidate_it(result, flags, it) &&
 193 +                   !d_invalidate(result)) {
 194 +                       dput(result);
 195 +                       if (counter > 10)
 196 +                               result = ERR_PTR(-ESTALE);
 197 +                       if (!IS_ERR(result))
 198 +                               goto again;
 199 +               }
 200         }
 201         return result;
 202  }
 203 @@ -332,7 +364,8 @@
 204   * Without that kind of total limit, nasty chains of consecutive
 205   * symlinks can cause almost arbitrarily long lookups.
 206   */
 207 -static inline int do_follow_link(struct dentry *dentry, struct nameidata *nd)
 208 +static inline int do_follow_link(struct dentry *dentry, struct nameidata *nd,
 209 +                                struct lookup_intent *it)
 210  {
 211         int err;
 212         if (current->link_count >= 8)
 213 @@ -346,10 +379,12 @@
 214         current->link_count++;
 215         current->total_link_count++;
 216         UPDATE_ATIME(dentry->d_inode);
 217 +       nd->intent = it;
 218         err = dentry->d_inode->i_op->follow_link(dentry, nd);
 219         current->link_count--;
 220         return err;
 221  loop:
 222 +       intent_release(it);
 223         path_release(nd);
 224         return -ELOOP;
 225  }
 226 @@ -447,7 +482,8 @@
 227   *
 228   * We expect 'base' to be positive and a directory.
 229   */
 230 -static inline int __link_path_walk(const char * name, struct nameidata *nd)
 231 +static inline int __link_path_walk_it(const char * name, struct nameidata *nd,
 232 +                                       struct lookup_intent *it)
 233  {
 234         struct dentry *dentry;
 235         struct inode *inode;
 236 @@ -524,12 +560,12 @@
 237                                 break;
 238                 }
 239                 /* This does the actual lookups.. */
 240 -               dentry = cached_lookup(nd->dentry, &this, LOOKUP_CONTINUE);
 241 +               dentry = cached_lookup(nd->dentry, &this, LOOKUP_CONTINUE, NULL);
 242                 if (!dentry) {
 243                         err = -EWOULDBLOCKIO;
 244                         if (atomic)
 245                                 break;
 246 -                       dentry = real_lookup(nd->dentry, &this, LOOKUP_CONTINUE);
 247 +                       dentry = real_lookup(nd->dentry, &this, LOOKUP_CONTINUE, NULL);
 248                         err = PTR_ERR(dentry);
 249                         if (IS_ERR(dentry))
 250                                 break;
 251 @@ -547,7 +583,7 @@
 252                         goto out_dput;
 253
 254                 if (inode->i_op->follow_link) {
 255 -                       err = do_follow_link(dentry, nd);
 256 +                       err = do_follow_link(dentry, nd, NULL);
 257                         dput(dentry);
 258                         if (err)
 259                                 goto return_err;
 260 @@ -563,7 +599,7 @@
 261                         nd->dentry = dentry;
 262                 }
 263                 err = -ENOTDIR;
 264 -               if (!inode->i_op->lookup)
 265 +               if (!inode->i_op->lookup && !inode->i_op->lookup_it)
 266                         break;
 267                 continue;
 268                 /* here ends the main loop */
 269 @@ -590,12 +626,12 @@
 270                         if (err < 0)
 271                                 break;
 272                 }
 273 -               dentry = cached_lookup(nd->dentry, &this, 0);
 274 +               dentry = cached_lookup(nd->dentry, &this, 0, it);
 275                 if (!dentry) {
 276                         err = -EWOULDBLOCKIO;
 277                         if (atomic)
 278                                 break;
 279 -                       dentry = real_lookup(nd->dentry, &this, 0);
 280 +                       dentry = real_lookup(nd->dentry, &this, 0, it);
 281                         err = PTR_ERR(dentry);
 282                         if (IS_ERR(dentry))
 283                                 break;
 284 @@ -605,7 +641,7 @@
 285                 inode = dentry->d_inode;
 286                 if ((lookup_flags & LOOKUP_FOLLOW)
 287                     && inode && inode->i_op && inode->i_op->follow_link) {
 288 -                       err = do_follow_link(dentry, nd);
 289 +                       err = do_follow_link(dentry, nd, it);
 290                         dput(dentry);
 291                         if (err)
 292                                 goto return_err;
 293 @@ -619,7 +655,8 @@
 294                         goto no_inode;
 295                 if (lookup_flags & LOOKUP_DIRECTORY) {
 296                         err = -ENOTDIR;
 297 -                       if (!inode->i_op || !inode->i_op->lookup)
 298 +                       if (!inode->i_op ||
 299 +                           (!inode->i_op->lookup && !inode->i_op->lookup_it))
 300                                 break;
 301                 }
 302                 goto return_base;
 303 @@ -643,6 +680,27 @@
 304                  * Check the cached dentry for staleness.
 305                  */
 306                 dentry = nd->dentry;
 307 +               if (dentry && dentry->d_op && dentry->d_op->d_revalidate_it) {
 308 +                       err = -ESTALE;
 309 +                       if (!dentry->d_op->d_revalidate_it(dentry, 0, it)) {
 310 +                               struct dentry *new;
 311 +                               err = permission(dentry->d_parent->d_inode,
 312 +                                               MAY_EXEC);
 313 +                               if (err)
 314 +                                       break;
 315 +                               new = real_lookup(dentry->d_parent,
 316 +                                               &dentry->d_name, 0, NULL);
 317 +                               d_invalidate(dentry);
 318 +                               dput(dentry);
 319 +                               if (IS_ERR(new)) {
 320 +                                       err = PTR_ERR(new);
 321 +                                       break;
 322 +                               }
 323 +                               nd->dentry = new;
 324 +                       }
 325 +                       if (!nd->dentry->d_inode)
 326 +                               goto no_inode;
 327 +               } else
 328                 if (dentry && dentry->d_op && dentry->d_op->d_revalidate) {
 329                         err = -ESTALE;
 330                         if (!dentry->d_op->d_revalidate(dentry, lookup_flags & LOOKUP_PARENT)) {
 331 @@ -656,6 +714,8 @@
 332                 dput(dentry);
 333                 break;
 334         }
 335 +       if (err)
 336 +               intent_release(it);
 337         path_release(nd);
 338  return_err:
 339         return err;
 340 @@ -663,13 +723,13 @@
 341
 342  int link_path_walk(const char * name, struct nameidata *nd)
 343  {
 344 -       return __link_path_walk(name,nd);
 345 +       return __link_path_walk_it(name, nd, NULL);
 346  }
 347
 348  static inline int __path_walk(const char * name, struct nameidata *nd)
 349  {
 350         current->total_link_count = 0;
 351 -       return __link_path_walk(name, nd);
 352 +       return __link_path_walk_it(name, nd, NULL);
 353  }
 354
 355  int path_walk(const char * name, struct nameidata *nd)
 356 @@ -677,6 +737,12 @@
 357         return __path_walk(name, nd);
 358  }
 359
 360 +int path_walk_it(const char * name, struct nameidata *nd, struct lookup_intent *it)
 361 +{
 362 +       current->total_link_count = 0;
 363 +       return __link_path_walk_it(name, nd, it);
 364 +}
 365 +
 366  /* SMP-safe */
 367  /* returns 1 if everything is done */
 368  static int __emul_lookup_dentry(const char *name, struct nameidata *nd)
 369 @@ -759,6 +825,17 @@
 370  }
 371
 372  /* SMP-safe */
 373 +int path_lookup_it(const char *path, unsigned flags, struct nameidata *nd,
 374 +                  struct lookup_intent *it)
 375 +{
 376 +       int error = 0;
 377 +       if (path_init(path, flags, nd))
 378 +               error = path_walk_it(path, nd, it);
 379 +       return error;
 380 +}
 381 +
 382 +
 383 +/* SMP-safe */
 384  int path_lookup(const char *path, unsigned flags, struct nameidata *nd)
 385  {
 386         int error = 0;
 387 @@ -773,6 +850,7 @@
 388  {
 389         nd->last_type = LAST_ROOT; /* if there are only slashes... */
 390         nd->flags = flags;
 391 +       nd->intent = NULL;
 392         if (*name=='/')
 393                 return walk_init_root(name,nd);
 394         read_lock(&current->fs->lock);
 395 @@ -787,7 +865,8 @@
 396   * needs parent already locked. Doesn't follow mounts.
 397   * SMP-safe.
 398   */
 399 -struct dentry * lookup_hash(struct qstr *name, struct dentry * base)
 400 +struct dentry * lookup_hash_it(struct qstr *name, struct dentry * base,
 401 +                              struct lookup_intent *it)
 402  {
 403         struct dentry * dentry;
 404         struct inode *inode;
 405 @@ -810,13 +889,16 @@
 406                         goto out;
 407         }
 408
 409 -       dentry = cached_lookup(base, name, 0);
 410 +       dentry = cached_lookup(base, name, 0, it);
 411         if (!dentry) {
 412                 struct dentry *new = d_alloc(base, name);
 413                 dentry = ERR_PTR(-ENOMEM);
 414                 if (!new)
 415                         goto out;
 416                 lock_kernel();
 417 +               if (inode->i_op->lookup_it)
 418 +                       dentry = inode->i_op->lookup_it(inode, new, it, 0);
 419 +               else
 420                 dentry = inode->i_op->lookup(inode, new);
 421                 unlock_kernel();
 422                 if (!dentry)
 423 @@ -828,6 +910,12 @@
 424         return dentry;
 425  }
 426
 427 +struct dentry * lookup_hash(struct qstr *name, struct dentry * base)
 428 +{
 429 +       return lookup_hash_it(name, base, NULL);
 430 +}
 431 +
 432 +
 433  /* SMP-safe */
 434  struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
 435  {
 436 @@ -849,7 +937,7 @@
 437         }
 438         this.hash = end_name_hash(hash);
 439
 440 -       return lookup_hash(&this, base);
 441 +       return lookup_hash_it(&this, base, NULL);
 442  access:
 443         return ERR_PTR(-EACCES);
 444  }
 445 @@ -880,6 +968,23 @@
 446         return err;
 447  }
 448
 449 +int __user_walk_it(const char *name, unsigned flags, struct nameidata *nd,
 450 +                  struct lookup_intent *it)
 451 +{
 452 +       char *tmp;
 453 +       int err;
 454 +
 455 +       tmp = getname(name);
 456 +       err = PTR_ERR(tmp);
 457 +       if (!IS_ERR(tmp)) {
 458 +               err = 0;
 459 +               if (path_init(tmp, flags, nd))
 460 +                       err = path_walk_it(tmp, nd, it);
 461 +               putname(tmp);
 462 +       }
 463 +       return err;
 464 +}
 465 +
 466  /*
 467   * It's inline, so penalty for filesystems that don't use sticky bit is
 468   * minimal.
 469 @@ -977,7 +1082,8 @@
 470         return retval;
 471  }
 472
 473 -int vfs_create(struct inode *dir, struct dentry *dentry, int mode)
 474 +static int vfs_create_it(struct inode *dir, struct dentry *dentry, int mode,
 475 +                        struct lookup_intent *it)
 476  {
 477         int error;
 478
 479 @@ -990,12 +1096,15 @@
 480                 goto exit_lock;
 481
 482         error = -EACCES;        /* shouldn't it be ENOSYS? */
 483 -       if (!dir->i_op || !dir->i_op->create)
 484 +       if (!dir->i_op || (!dir->i_op->create && !dir->i_op->create_it))
 485                 goto exit_lock;
 486
 487         DQUOT_INIT(dir);
 488         lock_kernel();
 489 -       error = dir->i_op->create(dir, dentry, mode);
 490 +       if (dir->i_op->create_it)
 491 +               error = dir->i_op->create_it(dir, dentry, mode, it);
 492 +       else
 493 +               error = dir->i_op->create(dir, dentry, mode);
 494         unlock_kernel();
 495  exit_lock:
 496         up(&dir->i_zombie);
 497 @@ -1004,6 +1113,11 @@
 498         return error;
 499  }
 500
 501 +int vfs_create(struct inode *dir, struct dentry *dentry, int mode)
 502 +{
 503 +       return vfs_create_it(dir, dentry, mode, NULL);
 504 +}
 505 +
 506  /*
 507   *     open_namei()
 508   *
 509 @@ -1018,7 +1132,8 @@
 510   * for symlinks (where the permissions are checked later).
 511   * SMP-safe
 512   */
 513 -int open_namei(const char * pathname, int flag, int mode, struct nameidata *nd)
 514 +int open_namei_it(const char *pathname, int flag, int mode,
 515 +                 struct nameidata *nd, struct lookup_intent *it)
 516  {
 517         int acc_mode, error = 0;
 518         struct inode *inode;
 519 @@ -1028,11 +1143,14 @@
 520
 521         acc_mode = ACC_MODE(flag);
 522
 523 +       if (it)
 524 +               it->it_flags = flag;
 525 +
 526         /*
 527          * The simplest case - just a plain lookup.
 528          */
 529         if (!(flag & O_CREAT)) {
 530 -               error = path_lookup(pathname, lookup_flags(flag), nd);
 531 +               error = path_lookup_it(pathname, lookup_flags(flag), nd, it);
 532                 if (error)
 533                         return error;
 534                 dentry = nd->dentry;
 535 @@ -1042,6 +1160,10 @@
 536         /*
 537          * Create - we need to know the parent.
 538          */
 539 +       if (it) {
 540 +               it->it_create_mode = mode;
 541 +               it->it_op |= IT_CREAT;
 542 +       }
 543         error = path_lookup(pathname, LOOKUP_PARENT, nd);
 544         if (error)
 545                 return error;
 546 @@ -1057,7 +1179,7 @@
 547
 548         dir = nd->dentry;
 549         down(&dir->d_inode->i_sem);
 550 -       dentry = lookup_hash(&nd->last, nd->dentry);
 551 +       dentry = lookup_hash_it(&nd->last, nd->dentry, it);
 552
 553  do_last:
 554         error = PTR_ERR(dentry);
 555 @@ -1066,11 +1188,12 @@
 556                 goto exit;
 557         }
 558
 559 +       it->it_create_mode = mode;
 560         /* Negative dentry, just create the file */
 561         if (!dentry->d_inode) {
 562                 if (!IS_POSIXACL(dir->d_inode))
 563                         mode &= ~current->fs->umask;
 564 -               error = vfs_create(dir->d_inode, dentry, mode);
 565 +               error = vfs_create_it(dir->d_inode, dentry, mode, it);
 566                 up(&dir->d_inode->i_sem);
 567  #ifndef DENTRY_WASTE_RAM
 568                 if (error)
 569 @@ -1178,7 +1301,7 @@
 570                 if (!error) {
 571                         DQUOT_INIT(inode);
 572
 573 -                       error = do_truncate(dentry, 0);
 574 +                       error = do_truncate(dentry, 0, 1);
 575                 }
 576                 put_write_access(inode);
 577                 if (error)
 578 @@ -1190,8 +1313,10 @@
 579         return 0;
 580
 581  exit_dput:
 582 +       intent_release(it);
 583         dput(dentry);
 584  exit:
 585 +       intent_release(it);
 586         path_release(nd);
 587         return error;
 588
 589 @@ -1210,7 +1335,10 @@
 590          * are done. Procfs-like symlinks just set LAST_BIND.
 591          */
 592         UPDATE_ATIME(dentry->d_inode);
 593 +       nd->intent = it;
 594         error = dentry->d_inode->i_op->follow_link(dentry, nd);
 595 +       if (error)
 596 +               intent_release(it);
 597         dput(dentry);
 598         if (error)
 599                 return error;
 600 @@ -1232,13 +1360,20 @@
 601         }
 602         dir = nd->dentry;
 603         down(&dir->d_inode->i_sem);
 604 -       dentry = lookup_hash(&nd->last, nd->dentry);
 605 +       dentry = lookup_hash_it(&nd->last, nd->dentry, it);
 606         putname(nd->last.name);
 607         goto do_last;
 608  }
 609
 610 +int open_namei(const char *pathname, int flag, int mode, struct nameidata *nd)
 611 +{
 612 +       return open_namei_it(pathname, flag, mode, nd, NULL);
 613 +}
 614 +
 615 +
 616  /* SMP-safe */
 617 -struct dentry *lookup_create(struct nameidata *nd, int is_dir)
 618 +struct dentry *lookup_create(struct nameidata *nd, int is_dir,
 619 +                                   struct lookup_intent *it)
 620  {
 621         struct dentry *dentry;
 622
 623 @@ -1246,7 +1381,7 @@
 624         dentry = ERR_PTR(-EEXIST);
 625         if (nd->last_type != LAST_NORM)
 626                 goto fail;
 627 -       dentry = lookup_hash(&nd->last, nd->dentry);
 628 +       dentry = lookup_hash_it(&nd->last, nd->dentry, it);
 629         if (IS_ERR(dentry))
 630                 goto fail;
 631         if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode)
 632 @@ -1302,7 +1437,20 @@
 633         error = path_lookup(tmp, LOOKUP_PARENT, &nd);
 634         if (error)
 635                 goto out;
 636 -       dentry = lookup_create(&nd, 0);
 637 +
 638 +       if (nd.last_type != LAST_NORM) {
 639 +               error = -EEXIST;
 640 +               goto out2;
 641 +       }
 642 +       if (nd.dentry->d_inode->i_op->mknod_raw) {
 643 +               struct inode_operations *op = nd.dentry->d_inode->i_op;
 644 +               error = op->mknod_raw(&nd, mode, dev);
 645 +               /* the file system wants to use normal vfs path now */
 646 +               if (error != -EOPNOTSUPP)
 647 +                       goto out2;
 648 +       }
 649 +
 650 +       dentry = lookup_create(&nd, 0, NULL);
 651         error = PTR_ERR(dentry);
 652
 653         if (!IS_POSIXACL(nd.dentry->d_inode))
 654 @@ -1324,6 +1472,7 @@
 655                 dput(dentry);
 656         }
 657         up(&nd.dentry->d_inode->i_sem);
 658 +out2:
 659         path_release(&nd);
 660  out:
 661         putname(tmp);
 662 @@ -1371,7 +1520,18 @@
 663                 error = path_lookup(tmp, LOOKUP_PARENT, &nd);
 664                 if (error)
 665                         goto out;
 666 -               dentry = lookup_create(&nd, 1);
 667 +               if (nd.last_type != LAST_NORM) {
 668 +                       error = -EEXIST;
 669 +                       goto out2;
 670 +               }
 671 +               if (nd.dentry->d_inode->i_op->mkdir_raw) {
 672 +                       struct inode_operations *op = nd.dentry->d_inode->i_op;
 673 +                       error = op->mkdir_raw(&nd, mode);
 674 +                       /* the file system wants to use normal vfs path now */
 675 +                       if (error != -EOPNOTSUPP)
 676 +                               goto out2;
 677 +               }
 678 +               dentry = lookup_create(&nd, 1, NULL);
 679                 error = PTR_ERR(dentry);
 680                 if (!IS_ERR(dentry)) {
 681                         if (!IS_POSIXACL(nd.dentry->d_inode))
 682 @@ -1380,6 +1540,7 @@
 683                         dput(dentry);
 684                 }
 685                 up(&nd.dentry->d_inode->i_sem);
 686 +out2:
 687                 path_release(&nd);
 688  out:
 689                 putname(tmp);
 690 @@ -1480,8 +1641,16 @@
 691                         error = -EBUSY;
 692                         goto exit1;
 693         }
 694 +       if (nd.dentry->d_inode->i_op->rmdir_raw) {
 695 +               struct inode_operations *op = nd.dentry->d_inode->i_op;
 696 +
 697 +               error = op->rmdir_raw(&nd);
 698 +               /* the file system wants to use normal vfs path now */
 699 +               if (error != -EOPNOTSUPP)
 700 +                       goto exit1;
 701 +       }
 702         down(&nd.dentry->d_inode->i_sem);
 703 -       dentry = lookup_hash(&nd.last, nd.dentry);
 704 +       dentry = lookup_hash_it(&nd.last, nd.dentry, NULL);
 705         error = PTR_ERR(dentry);
 706         if (!IS_ERR(dentry)) {
 707                 error = vfs_rmdir(nd.dentry->d_inode, dentry);
 708 @@ -1539,8 +1708,15 @@
 709         error = -EISDIR;
 710         if (nd.last_type != LAST_NORM)
 711                 goto exit1;
 712 +       if (nd.dentry->d_inode->i_op->unlink_raw) {
 713 +               struct inode_operations *op = nd.dentry->d_inode->i_op;
 714 +               error = op->unlink_raw(&nd);
 715 +               /* the file system wants to use normal vfs path now */
 716 +               if (error != -EOPNOTSUPP)
 717 +                       goto exit1;
 718 +       }
 719         down(&nd.dentry->d_inode->i_sem);
 720 -       dentry = lookup_hash(&nd.last, nd.dentry);
 721 +       dentry = lookup_hash_it(&nd.last, nd.dentry, NULL);
 722         error = PTR_ERR(dentry);
 723         if (!IS_ERR(dentry)) {
 724                 /* Why not before? Because we want correct error value */
 725 @@ -1607,15 +1783,27 @@
 726                 error = path_lookup(to, LOOKUP_PARENT, &nd);
 727                 if (error)
 728                         goto out;
 729 -               dentry = lookup_create(&nd, 0);
 730 +               if (nd.last_type != LAST_NORM) {
 731 +                       error = -EEXIST;
 732 +                       goto out2;
 733 +               }
 734 +               if (nd.dentry->d_inode->i_op->symlink_raw) {
 735 +                       struct inode_operations *op = nd.dentry->d_inode->i_op;
 736 +                       error = op->symlink_raw(&nd, from);
 737 +                       /* the file system wants to use normal vfs path now */
 738 +                       if (error != -EOPNOTSUPP)
 739 +                               goto out2;
 740 +               }
 741 +               dentry = lookup_create(&nd, 0, NULL);
 742                 error = PTR_ERR(dentry);
 743                 if (!IS_ERR(dentry)) {
 744                         error = vfs_symlink(nd.dentry->d_inode, dentry, from);
 745                         dput(dentry);
 746                 }
 747                 up(&nd.dentry->d_inode->i_sem);
 748 +       out2:
 749                 path_release(&nd);
 750 -out:
 751 +       out:
 752                 putname(to);
 753         }
 754         putname(from);
 755 @@ -1691,7 +1879,18 @@
 756                 error = -EXDEV;
 757                 if (old_nd.mnt != nd.mnt)
 758                         goto out_release;
 759 -               new_dentry = lookup_create(&nd, 0);
 760 +               if (nd.last_type != LAST_NORM) {
 761 +                       error = -EEXIST;
 762 +                       goto out_release;
 763 +               }
 764 +               if (nd.dentry->d_inode->i_op->link_raw) {
 765 +                       struct inode_operations *op = nd.dentry->d_inode->i_op;
 766 +                       error = op->link_raw(&old_nd, &nd);
 767 +                       /* the file system wants to use normal vfs path now */
 768 +                       if (error != -EOPNOTSUPP)
 769 +                               goto out_release;
 770 +               }
 771 +               new_dentry = lookup_create(&nd, 0, NULL);
 772                 error = PTR_ERR(new_dentry);
 773                 if (!IS_ERR(new_dentry)) {
 774                         error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry);
 775 @@ -1735,7 +1934,7 @@
 776   *        locking].
 777   */
 778  int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry,
 779 -              struct inode *new_dir, struct dentry *new_dentry)
 780 +                  struct inode *new_dir, struct dentry *new_dentry)
 781  {
 782         int error;
 783         struct inode *target;
 784 @@ -1814,7 +2013,7 @@
 785  }
 786
 787  int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
 788 -              struct inode *new_dir, struct dentry *new_dentry)
 789 +                    struct inode *new_dir, struct dentry *new_dentry)
 790  {
 791         int error;
 792
 793 @@ -1902,9 +2101,18 @@
 794         if (newnd.last_type != LAST_NORM)
 795                 goto exit2;
 796
 797 +       if (old_dir->d_inode->i_op->rename_raw) {
 798 +               lock_kernel();
 799 +               error = old_dir->d_inode->i_op->rename_raw(&oldnd, &newnd);
 800 +               unlock_kernel();
 801 +               /* the file system wants to use normal vfs path now */
 802 +               if (error != -EOPNOTSUPP)
 803 +                       goto exit2;
 804 +       }
 805 +
 806         double_lock(new_dir, old_dir);
 807
 808 -       old_dentry = lookup_hash(&oldnd.last, old_dir);
 809 +       old_dentry = lookup_hash_it(&oldnd.last, old_dir, NULL);
 810         error = PTR_ERR(old_dentry);
 811         if (IS_ERR(old_dentry))
 812                 goto exit3;
 813 @@ -1920,16 +2128,16 @@
 814                 if (newnd.last.name[newnd.last.len])
 815                         goto exit4;
 816         }
 817 -       new_dentry = lookup_hash(&newnd.last, new_dir);
 818 +       new_dentry = lookup_hash_it(&newnd.last, new_dir, NULL);
 819         error = PTR_ERR(new_dentry);
 820         if (IS_ERR(new_dentry))
 821                 goto exit4;
 822
 823 +
 824         lock_kernel();
 825         error = vfs_rename(old_dir->d_inode, old_dentry,
 826                                    new_dir->d_inode, new_dentry);
 827         unlock_kernel();
 828 -
 829         dput(new_dentry);
 830  exit4:
 831         dput(old_dentry);
 832 @@ -1980,20 +2188,26 @@
 833  }
 834
 835  static inline int
 836 -__vfs_follow_link(struct nameidata *nd, const char *link)
 837 +__vfs_follow_link(struct nameidata *nd, const char *link,
 838 +                 struct lookup_intent *it)
 839  {
 840         int res = 0;
 841         char *name;
 842         if (IS_ERR(link))
 843                 goto fail;
 844
 845 +       if (it == NULL)
 846 +               it = nd->intent;
 847 +       else if (it != nd->intent)
 848 +               printk("it != nd->intent: tell phil@clusterfs.com\n");
 849 +
 850         if (*link == '/') {
 851                 path_release(nd);
 852                 if (!walk_init_root(link, nd))
 853                         /* weird __emul_prefix() stuff did it */
 854                         goto out;
 855         }
 856 -       res = __link_path_walk(link, nd);
 857 +       res = __link_path_walk_it(link, nd, it);
 858  out:
 859         if (current->link_count || res || nd->last_type!=LAST_NORM)
 860                 return res;
 861 @@ -2017,7 +2231,13 @@
 862
 863  int vfs_follow_link(struct nameidata *nd, const char *link)
 864  {
 865 -       return __vfs_follow_link(nd, link);
 866 +       return __vfs_follow_link(nd, link, NULL);
 867 +}
 868 +
 869 +int vfs_follow_link_it(struct nameidata *nd, const char *link,
 870 +                      struct lookup_intent *it)
 871 +{
 872 +       return __vfs_follow_link(nd, link, it);
 873  }
 874
 875  /* get the link contents into pagecache */
 876 @@ -2059,7 +2279,7 @@
 877  {
 878         struct page *page = NULL;
 879         char *s = page_getlink(dentry, &page);
 880 -       int res = __vfs_follow_link(nd, s);
 881 +       int res = __vfs_follow_link(nd, s, NULL);
 882         if (page) {
 883                 kunmap(page);
 884                 page_cache_release(page);
 885 Index: linux-2.4.21-x86_64/fs/namespace.c
 886 ===================================================================
 887 --- linux-2.4.21-x86_64.orig/fs/namespace.c     2003-10-28 10:34:12.000000000 -0800
 888 +++ linux-2.4.21-x86_64/fs/namespace.c  2004-04-12 19:57:36.000000000 -0700
 889 @@ -98,6 +98,7 @@
 890  {
 891         old_nd->dentry = mnt->mnt_mountpoint;
 892         old_nd->mnt = mnt->mnt_parent;
 893 +       UNPIN(old_nd->dentry, old_nd->mnt, 1);
 894         mnt->mnt_parent = mnt;
 895         mnt->mnt_mountpoint = mnt->mnt_root;
 896         list_del_init(&mnt->mnt_child);
 897 @@ -109,6 +110,7 @@
 898  {
 899         mnt->mnt_parent = mntget(nd->mnt);
 900         mnt->mnt_mountpoint = dget(nd->dentry);
 901 +       PIN(nd->dentry, nd->mnt, 1);
 902         list_add(&mnt->mnt_hash, mount_hashtable+hash(nd->mnt, nd->dentry));
 903         list_add(&mnt->mnt_child, &nd->mnt->mnt_mounts);
 904         nd->dentry->d_mounted++;
 905 @@ -488,14 +490,17 @@
 906  {
 907         struct nameidata old_nd;
 908         struct vfsmount *mnt = NULL;
 909 +       struct lookup_intent it = { .it_op = IT_GETATTR };
 910         int err = mount_is_safe(nd);
 911         if (err)
 912                 return err;
 913         if (!old_name || !*old_name)
 914                 return -EINVAL;
 915 -       err = path_lookup(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd);
 916 -       if (err)
 917 +       err = path_lookup_it(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd, &it);
 918 +       if (err) {
 919 +               intent_release(&it);
 920                 return err;
 921 +       }
 922
 923         down_write(&current->namespace->sem);
 924         err = -EINVAL;
 925 @@ -518,6 +523,7 @@
 926         }
 927
 928         up_write(&current->namespace->sem);
 929 +       intent_release(&it);
 930         path_release(&old_nd);
 931         return err;
 932  }
 933 @@ -701,6 +707,7 @@
 934                   unsigned long flags, void *data_page)
 935  {
 936         struct nameidata nd;
 937 +       struct lookup_intent it = { .it_op = IT_GETATTR };
 938         int retval = 0;
 939         int mnt_flags = 0;
 940
 941 @@ -725,10 +732,11 @@
 942         flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV);
 943
 944         /* ... and get the mountpoint */
 945 -       retval = path_lookup(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd);
 946 -       if (retval)
 947 +       retval = path_lookup_it(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd, &it);
 948 +       if (retval) {
 949 +               intent_release(&it);
 950                 return retval;
 951 -
 952 +       }
 953         if (flags & MS_REMOUNT)
 954                 retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
 955                                     data_page);
 956 @@ -739,6 +747,8 @@
 957         else
 958                 retval = do_add_mount(&nd, type_page, flags, mnt_flags,
 959                                       dev_name, data_page);
 960 +
 961 +       intent_release(&it);
 962         path_release(&nd);
 963         return retval;
 964  }
 965 @@ -904,6 +914,8 @@
 966  {
 967         struct vfsmount *tmp;
 968         struct nameidata new_nd, old_nd, parent_nd, root_parent, user_nd;
 969 +       struct lookup_intent new_it = { .it_op = IT_GETATTR };
 970 +       struct lookup_intent old_it = { .it_op = IT_GETATTR };
 971         int error;
 972
 973         if (!capable(CAP_SYS_ADMIN))
 974 @@ -911,14 +923,14 @@
 975
 976         lock_kernel();
 977
 978 -       error = __user_walk(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd);
 979 +       error = __user_walk_it(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd, &new_it);
 980         if (error)
 981                 goto out0;
 982         error = -EINVAL;
 983         if (!check_mnt(new_nd.mnt))
 984                 goto out1;
 985
 986 -       error = __user_walk(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd);
 987 +       error = __user_walk_it(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd, &old_it);
 988         if (error)
 989                 goto out1;
 990
 991 @@ -973,8 +985,10 @@
 992         up(&old_nd.dentry->d_inode->i_zombie);
 993         up_write(&current->namespace->sem);
 994         path_release(&user_nd);
 995 +       intent_release(&old_it);
 996         path_release(&old_nd);
 997  out1:
 998 +       intent_release(&new_it);
 999         path_release(&new_nd);
1000  out0:
1001         unlock_kernel();
1002 Index: linux-2.4.21-x86_64/fs/open.c
1003 ===================================================================
1004 --- linux-2.4.21-x86_64.orig/fs/open.c  2003-10-28 10:33:59.000000000 -0800
1005 +++ linux-2.4.21-x86_64/fs/open.c       2004-04-12 19:57:36.000000000 -0700
1006 @@ -19,6 +19,8 @@
1007  #include <asm/uaccess.h>
1008
1009  #define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))
1010 +extern int path_walk_it(const char *name, struct nameidata *nd,
1011 +                       struct lookup_intent *it);
1012
1013  int vfs_statfs(struct super_block *sb, struct statfs *buf)
1014  {
1015 @@ -95,9 +97,10 @@
1016         write_unlock(&files->file_lock);
1017  }
1018
1019 -int do_truncate(struct dentry *dentry, loff_t length)
1020 +int do_truncate(struct dentry *dentry, loff_t length, int called_from_open)
1021  {
1022         struct inode *inode = dentry->d_inode;
1023 +       struct inode_operations *op = dentry->d_inode->i_op;
1024         int error;
1025         struct iattr newattrs;
1026
1027 @@ -109,7 +112,13 @@
1028         down(&inode->i_sem);
1029         newattrs.ia_size = length;
1030         newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
1031 -       error = notify_change(dentry, &newattrs);
1032 +       if (called_from_open)
1033 +               newattrs.ia_valid |= ATTR_FROM_OPEN;
1034 +       if (op->setattr_raw) {
1035 +               newattrs.ia_valid |= ATTR_RAW;
1036 +               error = op->setattr_raw(inode, &newattrs);
1037 +       } else
1038 +               error = notify_change(dentry, &newattrs);
1039         up(&inode->i_sem);
1040         up_write(&inode->i_alloc_sem);
1041         return error;
1042 @@ -120,12 +129,13 @@
1043         struct nameidata nd;
1044         struct inode * inode;
1045         int error;
1046 +       struct lookup_intent it = { .it_op = IT_GETATTR };
1047
1048         error = -EINVAL;
1049         if (length < 0) /* sorry, but loff_t says... */
1050                 goto out;
1051
1052 -       error = user_path_walk(path, &nd);
1053 +       error = user_path_walk_it(path, &nd, &it);
1054         if (error)
1055                 goto out;
1056         inode = nd.dentry->d_inode;
1057 @@ -165,11 +175,13 @@
1058         error = locks_verify_truncate(inode, NULL, length);
1059         if (!error) {
1060                 DQUOT_INIT(inode);
1061 -               error = do_truncate(nd.dentry, length);
1062 +               intent_release(&it);
1063 +               error = do_truncate(nd.dentry, length, 0);
1064         }
1065         put_write_access(inode);
1066
1067  dput_and_out:
1068 +       intent_release(&it);
1069         path_release(&nd);
1070  out:
1071         return error;
1072 @@ -217,7 +229,7 @@
1073
1074         error = locks_verify_truncate(inode, file, length);
1075         if (!error)
1076 -               error = do_truncate(dentry, length);
1077 +               error = do_truncate(dentry, length, 0);
1078  out_putf:
1079         fput(file);
1080  out:
1081 @@ -262,11 +274,13 @@
1082         struct inode * inode;
1083         struct iattr newattrs;
1084
1085 -       error = user_path_walk(filename, &nd);
1086 +       error = user_path_walk_it(filename, &nd, NULL);
1087         if (error)
1088                 goto out;
1089         inode = nd.dentry->d_inode;
1090
1091 +       /* this is safe without a Lustre lock because it only depends
1092 +          on the super block */
1093         error = -EROFS;
1094         if (IS_RDONLY(inode))
1095                 goto dput_and_out;
1096 @@ -281,11 +295,25 @@
1097                         goto dput_and_out;
1098
1099                 newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET;
1100 -       } else {
1101 +       }
1102 +
1103 +       if (inode->i_op->setattr_raw) {
1104 +               struct inode_operations *op = nd.dentry->d_inode->i_op;
1105 +
1106 +               newattrs.ia_valid |= ATTR_RAW;
1107 +               error = op->setattr_raw(inode, &newattrs);
1108 +               /* the file system wants to use normal vfs path now */
1109 +               if (error != -EOPNOTSUPP)
1110 +                       goto dput_and_out;
1111 +       }
1112 +
1113 +       error = -EPERM;
1114 +       if (!times) {
1115                 if (current->fsuid != inode->i_uid &&
1116                     (error = permission(inode,MAY_WRITE)) != 0)
1117                         goto dput_and_out;
1118         }
1119 +
1120         error = notify_change(nd.dentry, &newattrs);
1121  dput_and_out:
1122         path_release(&nd);
1123 @@ -306,12 +334,14 @@
1124         struct inode * inode;
1125         struct iattr newattrs;
1126
1127 -       error = user_path_walk(filename, &nd);
1128 +       error = user_path_walk_it(filename, &nd, NULL);
1129
1130         if (error)
1131                 goto out;
1132         inode = nd.dentry->d_inode;
1133
1134 +       /* this is safe without a Lustre lock because it only depends
1135 +          on the super block */
1136         error = -EROFS;
1137         if (IS_RDONLY(inode))
1138                 goto dput_and_out;
1139 @@ -326,7 +356,20 @@
1140                 newattrs.ia_atime = times[0].tv_sec;
1141                 newattrs.ia_mtime = times[1].tv_sec;
1142                 newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET;
1143 -       } else {
1144 +       }
1145 +
1146 +       if (inode->i_op->setattr_raw) {
1147 +               struct inode_operations *op = nd.dentry->d_inode->i_op;
1148 +
1149 +               newattrs.ia_valid |= ATTR_RAW;
1150 +               error = op->setattr_raw(inode, &newattrs);
1151 +               /* the file system wants to use normal vfs path now */
1152 +               if (error != -EOPNOTSUPP)
1153 +                       goto dput_and_out;
1154 +       }
1155 +
1156 +       error = -EPERM;
1157 +       if (!utimes) {
1158                 if (current->fsuid != inode->i_uid &&
1159                     (error = permission(inode,MAY_WRITE)) != 0)
1160                         goto dput_and_out;
1161 @@ -349,6 +392,7 @@
1162         int old_fsuid, old_fsgid;
1163         kernel_cap_t old_cap;
1164         int res;
1165 +       struct lookup_intent it = { .it_op = IT_GETATTR };
1166
1167         if (mode & ~S_IRWXO)    /* where's F_OK, X_OK, W_OK, R_OK? */
1168                 return -EINVAL;
1169 @@ -366,13 +410,14 @@
1170         else
1171                 current->cap_effective = current->cap_permitted;
1172
1173 -       res = user_path_walk(filename, &nd);
1174 +       res = user_path_walk_it(filename, &nd, &it);
1175         if (!res) {
1176                 res = permission(nd.dentry->d_inode, mode);
1177                 /* SuS v2 requires we report a read only fs too */
1178                 if(!res && (mode & S_IWOTH) && IS_RDONLY(nd.dentry->d_inode)
1179                    && !special_file(nd.dentry->d_inode->i_mode))
1180                         res = -EROFS;
1181 +               intent_release(&it);
1182                 path_release(&nd);
1183         }
1184
1185 @@ -387,8 +432,9 @@
1186  {
1187         int error;
1188         struct nameidata nd;
1189 +       struct lookup_intent it = { .it_op = IT_GETATTR };
1190
1191 -       error = __user_walk(filename,LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY,&nd);
1192 +       error = __user_walk_it(filename,LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY,&nd, &it);
1193         if (error)
1194                 goto out;
1195
1196 @@ -399,6 +445,7 @@
1197         set_fs_pwd(current->fs, nd.mnt, nd.dentry);
1198
1199  dput_and_out:
1200 +       intent_release(&it);
1201         path_release(&nd);
1202  out:
1203         return error;
1204 @@ -438,9 +485,10 @@
1205  {
1206         int error;
1207         struct nameidata nd;
1208 +       struct lookup_intent it = { .it_op = IT_GETATTR };
1209
1210 -       error = __user_walk(filename, LOOKUP_POSITIVE | LOOKUP_FOLLOW |
1211 -                     LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd);
1212 +       error = __user_walk_it(filename, LOOKUP_POSITIVE | LOOKUP_FOLLOW |
1213 +                     LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd, &it);
1214         if (error)
1215                 goto out;
1216
1217 @@ -456,39 +504,56 @@
1218         set_fs_altroot();
1219         error = 0;
1220  dput_and_out:
1221 +       intent_release(&it);
1222         path_release(&nd);
1223  out:
1224         return error;
1225  }
1226
1227 -asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
1228 +int chmod_common(struct dentry *dentry, mode_t mode)
1229  {
1230 -       struct inode * inode;
1231 -       struct dentry * dentry;
1232 -       struct file * file;
1233 -       int err = -EBADF;
1234 +       struct inode *inode = dentry->d_inode;
1235         struct iattr newattrs;
1236 +       int err = -EROFS;
1237
1238 -       file = fget(fd);
1239 -       if (!file)
1240 +       if (IS_RDONLY(inode))
1241                 goto out;
1242
1243 -       dentry = file->f_dentry;
1244 -       inode = dentry->d_inode;
1245 +       if (inode->i_op->setattr_raw) {
1246 +               newattrs.ia_mode = mode;
1247 +               newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
1248 +               newattrs.ia_valid |= ATTR_RAW;
1249 +               err = inode->i_op->setattr_raw(inode, &newattrs);
1250 +               /* the file system wants to use normal vfs path now */
1251 +               if (err != -EOPNOTSUPP)
1252 +                       goto out;
1253 +       }
1254
1255 -       err = -EROFS;
1256 -       if (IS_RDONLY(inode))
1257 -               goto out_putf;
1258         err = -EPERM;
1259         if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
1260 -               goto out_putf;
1261 +               goto out;
1262 +
1263         if (mode == (mode_t) -1)
1264                 mode = inode->i_mode;
1265         newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
1266         newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
1267         err = notify_change(dentry, &newattrs);
1268
1269 -out_putf:
1270 +out:
1271 +       return err;
1272 +}
1273 +
1274 +asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
1275 +{
1276 +       struct file * file;
1277 +       int err = -EBADF;
1278 +
1279 +       file = fget(fd);
1280 +       if (!file)
1281 +               goto out;
1282 +
1283 +       err = chmod_common(file->f_dentry, mode);
1284 +
1285         fput(file);
1286  out:
1287         return err;
1288 @@ -497,30 +562,14 @@
1289  asmlinkage long sys_chmod(const char * filename, mode_t mode)
1290  {
1291         struct nameidata nd;
1292 -       struct inode * inode;
1293         int error;
1294 -       struct iattr newattrs;
1295
1296         error = user_path_walk(filename, &nd);
1297         if (error)
1298                 goto out;
1299 -       inode = nd.dentry->d_inode;
1300 -
1301 -       error = -EROFS;
1302 -       if (IS_RDONLY(inode))
1303 -               goto dput_and_out;
1304
1305 -       error = -EPERM;
1306 -       if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
1307 -               goto dput_and_out;
1308 +       error = chmod_common(nd.dentry, mode);
1309
1310 -       if (mode == (mode_t) -1)
1311 -               mode = inode->i_mode;
1312 -       newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
1313 -       newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
1314 -       error = notify_change(nd.dentry, &newattrs);
1315 -
1316 -dput_and_out:
1317         path_release(&nd);
1318  out:
1319         return error;
1320 @@ -540,6 +589,20 @@
1321         error = -EROFS;
1322         if (IS_RDONLY(inode))
1323                 goto out;
1324 +
1325 +       if (inode->i_op->setattr_raw) {
1326 +               struct inode_operations *op = dentry->d_inode->i_op;
1327 +
1328 +               newattrs.ia_uid = user;
1329 +               newattrs.ia_gid = group;
1330 +               newattrs.ia_valid = ATTR_UID | ATTR_GID | ATTR_CTIME;
1331 +               newattrs.ia_valid |= ATTR_RAW;
1332 +               error = op->setattr_raw(inode, &newattrs);
1333 +               /* the file system wants to use normal vfs path now */
1334 +               if (error != -EOPNOTSUPP)
1335 +                       return error;
1336 +       }
1337 +
1338         error = -EPERM;
1339         if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
1340                 goto out;
1341 @@ -644,6 +707,7 @@
1342  {
1343         int namei_flags, error;
1344         struct nameidata nd;
1345 +       struct lookup_intent it = { .it_op = IT_OPEN };
1346
1347         namei_flags = flags;
1348         if ((namei_flags+1) & O_ACCMODE)
1349 @@ -651,14 +715,15 @@
1350         if (namei_flags & O_TRUNC)
1351                 namei_flags |= 2;
1352
1353 -       error = open_namei(filename, namei_flags, mode, &nd);
1354 -       if (!error)
1355 -               return dentry_open(nd.dentry, nd.mnt, flags);
1356 +       error = open_namei_it(filename, namei_flags, mode, &nd, &it);
1357 +       if (error)
1358 +               return ERR_PTR(error);
1359
1360 -       return ERR_PTR(error);
1361 +       return dentry_open_it(nd.dentry, nd.mnt, flags, &it);
1362  }
1363
1364 -struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
1365 +struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt,
1366 +                           int flags, struct lookup_intent *it)
1367  {
1368         struct file * f;
1369         struct inode *inode;
1370 @@ -686,7 +751,9 @@
1371         file_move(f, &inode->i_sb->s_files);
1372
1373         if (f->f_op && f->f_op->open) {
1374 +               f->f_it = it;
1375                 error = f->f_op->open(inode,f);
1376 +               f->f_it = NULL;
1377                 if (error)
1378                         goto cleanup_all;
1379         }
1380 @@ -698,6 +765,7 @@
1381                                       !inode->i_mapping->a_ops->direct_IO))
1382                 goto cleanup_all;
1383
1384 +       intent_release(it);
1385         return f;
1386
1387  cleanup_all:
1388 @@ -710,11 +778,17 @@
1389  cleanup_file:
1390         put_filp(f);
1391  cleanup_dentry:
1392 +       intent_release(it);
1393         dput(dentry);
1394         mntput(mnt);
1395         return ERR_PTR(error);
1396  }
1397
1398 +struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
1399 +{
1400 +       return dentry_open_it(dentry, mnt, flags, NULL);
1401 +}
1402 +
1403  /*
1404   * Find an empty file descriptor entry, and mark it busy.
1405   */
1406 Index: linux-2.4.21-x86_64/fs/stat.c
1407 ===================================================================
1408 --- linux-2.4.21-x86_64.orig/fs/stat.c  2003-10-28 10:33:58.000000000 -0800
1409 +++ linux-2.4.21-x86_64/fs/stat.c       2004-04-12 19:58:44.000000000 -0700
1410 @@ -17,10 +17,12 @@
1411   * Revalidate the inode. This is required for proper NFS attribute caching.
1412   */
1413  static __inline__ int
1414 -do_revalidate(struct dentry *dentry)
1415 +do_revalidate(struct dentry *dentry, struct lookup_intent *it)
1416  {
1417         struct inode * inode = dentry->d_inode;
1418 -       if (inode->i_op && inode->i_op->revalidate)
1419 +       if (inode->i_op && inode->i_op->revalidate_it)
1420 +               return inode->i_op->revalidate_it(dentry, it);
1421 +       else if (inode->i_op && inode->i_op->revalidate)
1422                 return inode->i_op->revalidate(dentry);
1423         return 0;
1424  }
1425 @@ -141,13 +143,15 @@
1426  asmlinkage long sys_stat(char * filename, struct __old_kernel_stat * statbuf)
1427  {
1428         struct nameidata nd;
1429 +       struct lookup_intent it = { .it_op = IT_GETATTR };
1430         int error;
1431
1432 -       error = user_path_walk(filename, &nd);
1433 +       error = user_path_walk_it(filename, &nd, &it);
1434         if (!error) {
1435 -               error = do_revalidate(nd.dentry);
1436 +               error = do_revalidate(nd.dentry, &it);
1437                 if (!error)
1438                         error = cp_old_stat(nd.dentry->d_inode, statbuf);
1439 +               intent_release(&it);
1440                 path_release(&nd);
1441         }
1442         return error;
1443 @@ -157,13 +161,15 @@
1444  asmlinkage long sys_newstat(char * filename, struct stat * statbuf)
1445  {
1446         struct nameidata nd;
1447 +       struct lookup_intent it = { .it_op = IT_GETATTR };
1448         int error;
1449
1450 -       error = user_path_walk(filename, &nd);
1451 +       error = user_path_walk_it(filename, &nd, &it);
1452         if (!error) {
1453 -               error = do_revalidate(nd.dentry);
1454 +               error = do_revalidate(nd.dentry, &it);
1455                 if (!error)
1456                         error = cp_new_stat(nd.dentry->d_inode, statbuf);
1457 +               intent_release(&it);
1458                 path_release(&nd);
1459         }
1460         return error;
1461 @@ -178,13 +184,15 @@
1462  asmlinkage long sys_lstat(char * filename, struct __old_kernel_stat * statbuf)
1463  {
1464         struct nameidata nd;
1465 +       struct lookup_intent it = { .it_op = IT_GETATTR };
1466         int error;
1467
1468 -       error = user_path_walk_link(filename, &nd);
1469 +       error = user_path_walk_link_it(filename, &nd, &it);
1470         if (!error) {
1471 -               error = do_revalidate(nd.dentry);
1472 +               error = do_revalidate(nd.dentry, &it);
1473                 if (!error)
1474                         error = cp_old_stat(nd.dentry->d_inode, statbuf);
1475 +               intent_release(&it);
1476                 path_release(&nd);
1477         }
1478         return error;
1479 @@ -195,13 +203,15 @@
1480  asmlinkage long sys_newlstat(char * filename, struct stat * statbuf)
1481  {
1482         struct nameidata nd;
1483 +       struct lookup_intent it = { .it_op = IT_GETATTR };
1484         int error;
1485
1486 -       error = user_path_walk_link(filename, &nd);
1487 +       error = user_path_walk_link_it(filename, &nd, &it);
1488         if (!error) {
1489 -               error = do_revalidate(nd.dentry);
1490 +               error = do_revalidate(nd.dentry, &it);
1491                 if (!error)
1492                         error = cp_new_stat(nd.dentry->d_inode, statbuf);
1493 +               intent_release(&it);
1494                 path_release(&nd);
1495         }
1496         return error;
1497 @@ -222,7 +232,7 @@
1498         if (f) {
1499                 struct dentry * dentry = f->f_dentry;
1500
1501 -               err = do_revalidate(dentry);
1502 +               err = do_revalidate(dentry, NULL);
1503                 if (!err)
1504                         err = cp_old_stat(dentry->d_inode, statbuf);
1505                 fput(f);
1506 @@ -241,7 +251,7 @@
1507         if (f) {
1508                 struct dentry * dentry = f->f_dentry;
1509
1510 -               err = do_revalidate(dentry);
1511 +               err = do_revalidate(dentry, NULL);
1512                 if (!err)
1513                         err = cp_new_stat(dentry->d_inode, statbuf);
1514                 fput(f);
1515 @@ -263,7 +273,7 @@
1516
1517                 error = -EINVAL;
1518                 if (inode->i_op && inode->i_op->readlink &&
1519 -                   !(error = do_revalidate(nd.dentry))) {
1520 +                   !(error = do_revalidate(nd.dentry, NULL))) {
1521                         UPDATE_ATIME(inode);
1522                         error = inode->i_op->readlink(nd.dentry, buf, bufsiz);
1523                 }
1524 @@ -339,12 +349,14 @@
1525  {
1526         struct nameidata nd;
1527         int error;
1528 +       struct lookup_intent it = { .it_op = IT_GETATTR };
1529
1530 -       error = user_path_walk(filename, &nd);
1531 +       error = user_path_walk_it(filename, &nd, &it);
1532         if (!error) {
1533 -               error = do_revalidate(nd.dentry);
1534 +               error = do_revalidate(nd.dentry, &it);
1535                 if (!error)
1536                         error = cp_new_stat64(nd.dentry->d_inode, statbuf);
1537 +               intent_release(&it);
1538                 path_release(&nd);
1539         }
1540         return error;
1541 @@ -354,12 +366,14 @@
1542  {
1543         struct nameidata nd;
1544         int error;
1545 +       struct lookup_intent it = { .it_op = IT_GETATTR };
1546
1547 -       error = user_path_walk_link(filename, &nd);
1548 +       error = user_path_walk_link_it(filename, &nd, &it);
1549         if (!error) {
1550 -               error = do_revalidate(nd.dentry);
1551 +               error = do_revalidate(nd.dentry, &it);
1552                 if (!error)
1553                         error = cp_new_stat64(nd.dentry->d_inode, statbuf);
1554 +               intent_release(&it);
1555                 path_release(&nd);
1556         }
1557         return error;
1558 @@ -374,7 +388,7 @@
1559         if (f) {
1560                 struct dentry * dentry = f->f_dentry;
1561
1562 -               err = do_revalidate(dentry);
1563 +               err = do_revalidate(dentry, NULL);
1564                 if (!err)
1565                         err = cp_new_stat64(dentry->d_inode, statbuf);
1566                 fput(f);
1567 Index: linux-2.4.21-x86_64/include/linux/dcache.h
1568 ===================================================================
1569 --- linux-2.4.21-x86_64.orig/include/linux/dcache.h     2003-11-10 16:44:28.000000000 -0800
1570 +++ linux-2.4.21-x86_64/include/linux/dcache.h  2004-04-12 19:57:36.000000000 -0700
1571 @@ -7,6 +7,51 @@
1572  #include <linux/gdb.h>
1573  #include <linux/mount.h>
1574  #include <linux/kernel.h>
1575 +#include <linux/string.h>
1576 +
1577 +#define IT_OPEN     0x0001
1578 +#define IT_CREAT    0x0002
1579 +#define IT_READDIR  0x0004
1580 +#define IT_GETATTR  0x0008
1581 +#define IT_LOOKUP   0x0010
1582 +#define IT_UNLINK   0x0020
1583 +#define IT_GETXATTR 0x0040
1584 +#define IT_EXEC     0x0080
1585 +#define IT_PIN      0x0100
1586 +
1587 +#define IT_FL_LOCKED   0x0001
1588 +#define IT_FL_FOLLOWED 0x0002 /* set by vfs_follow_link */
1589 +
1590 +#define INTENT_MAGIC 0x19620323
1591 +
1592 +
1593 +struct lustre_intent_data {
1594 +       int       it_disposition;
1595 +       int       it_status;
1596 +       __u64     it_lock_handle;
1597 +       void     *it_data;
1598 +       int       it_lock_mode;
1599 +       int it_int_flags;
1600 +};
1601 +struct lookup_intent {
1602 +       int     it_magic;
1603 +       void    (*it_op_release)(struct lookup_intent *);
1604 +       int     it_op;
1605 +       int     it_flags;
1606 +       int     it_create_mode;
1607 +       union {
1608 +               struct lustre_intent_data lustre;
1609 +       } d;
1610 +};
1611 +
1612 +static inline void intent_init(struct lookup_intent *it, int op, int flags)
1613 +{
1614 +       memset(it, 0, sizeof(*it));
1615 +       it->it_magic = INTENT_MAGIC;
1616 +       it->it_op = op;
1617 +       it->it_flags = flags;
1618 +}
1619 +
1620
1621  /*
1622   * linux/include/linux/dcache.h
1623 @@ -94,8 +139,22 @@
1624         int (*d_delete)(struct dentry *);
1625         void (*d_release)(struct dentry *);
1626         void (*d_iput)(struct dentry *, struct inode *);
1627 +       int (*d_revalidate_it)(struct dentry *, int, struct lookup_intent *);
1628 +       void (*d_pin)(struct dentry *, struct vfsmount * , int);
1629 +       void (*d_unpin)(struct dentry *, struct vfsmount *, int);
1630  };
1631
1632 +#define PIN(de,mnt,flag)  if (de && de->d_op && de->d_op->d_pin) \
1633 +                               de->d_op->d_pin(de, mnt, flag);
1634 +#define UNPIN(de,mnt,flag)  if (de && de->d_op && de->d_op->d_unpin) \
1635 +                               de->d_op->d_unpin(de, mnt, flag);
1636 +
1637 +
1638 +/* defined in fs/namei.c */
1639 +extern void intent_release(struct lookup_intent *it);
1640 +/* defined in fs/dcache.c */
1641 +extern void __d_rehash(struct dentry * entry, int lock);
1642 +
1643  /* the dentry parameter passed to d_hash and d_compare is the parent
1644   * directory of the entries to be compared. It is used in case these
1645   * functions need any directory specific information for determining
1646 @@ -127,6 +186,7 @@
1647                                          * s_nfsd_free_path semaphore will be down
1648                                          */
1649  #define DCACHE_REFERENCED      0x0008  /* Recently used, don't discard. */
1650 +#define DCACHE_LUSTRE_INVALID  0x0010  /* Lustre invalidated */
1651
1652  extern spinlock_t dcache_lock;
1653
1654 Index: linux-2.4.21-x86_64/include/linux/fs.h
1655 ===================================================================
1656 --- linux-2.4.21-x86_64.orig/include/linux/fs.h 2004-04-12 19:57:33.000000000 -0700
1657 +++ linux-2.4.21-x86_64/include/linux/fs.h      2004-04-12 19:57:36.000000000 -0700
1658 @@ -74,6 +74,7 @@
1659
1660  #define FMODE_READ 1
1661  #define FMODE_WRITE 2
1662 +#define FMODE_EXEC 4
1663
1664  #define READ 0
1665  #define WRITE 1
1666 @@ -361,6 +362,9 @@
1667  #define ATTR_MTIME_SET 256
1668  #define ATTR_FORCE     512     /* Not a change, but a change it */
1669  #define ATTR_ATTR_FLAG 1024
1670 +#define ATTR_RAW       0x0800  /* file system, not vfs will massage attrs */
1671 +#define ATTR_FROM_OPEN 0x1000  /* called from open path, ie O_TRUNC */
1672 +#define ATTR_CTIME_SET 0x2000
1673
1674  /*
1675   * This is the Inode Attributes structure, used for notify_change().  It
1676 @@ -505,6 +509,7 @@
1677         struct pipe_inode_info  *i_pipe;
1678         struct block_device     *i_bdev;
1679         struct char_device      *i_cdev;
1680 +       void                    *i_filterdata;
1681
1682         unsigned long           i_dnotify_mask; /* Directory notify events */
1683         struct dnotify_struct   *i_dnotify; /* for directory notifications */
1684 @@ -667,6 +672,7 @@
1685
1686         /* needed for tty driver, and maybe others */
1687         void                    *private_data;
1688 +       struct lookup_intent    *f_it;
1689         struct list_head        f_ep_links;
1690         spinlock_t              f_ep_lock;
1691  };
1692 @@ -796,6 +802,7 @@
1693         struct qstr last;
1694         unsigned int flags;
1695         int last_type;
1696 +       struct lookup_intent *intent;
1697  };
1698
1699  /*
1700 @@ -917,7 +924,8 @@
1701  extern int __vfs_rmdir(struct inode *, struct dentry *);
1702  extern int vfs_rmdir(struct inode *, struct dentry *);
1703  extern int vfs_unlink(struct inode *, struct dentry *);
1704 -extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *);
1705 +int vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
1706 +              struct inode *new_dir, struct dentry *new_dentry);
1707
1708  /*
1709   * File types
1710 @@ -992,21 +1000,32 @@
1711
1712  struct inode_operations {
1713         int (*create) (struct inode *,struct dentry *,int);
1714 +       int (*create_it) (struct inode *,struct dentry *,int, struct lookup_intent *);
1715         struct dentry * (*lookup) (struct inode *,struct dentry *);
1716 +       struct dentry * (*lookup_it) (struct inode *,struct dentry *, struct lookup_intent *, int flags);
1717         int (*link) (struct dentry *,struct inode *,struct dentry *);
1718 +       int (*link_raw) (struct nameidata *,struct nameidata *);
1719         int (*unlink) (struct inode *,struct dentry *);
1720 +       int (*unlink_raw) (struct nameidata *);
1721         int (*symlink) (struct inode *,struct dentry *,const char *);
1722 +       int (*symlink_raw) (struct nameidata *,const char *);
1723         int (*mkdir) (struct inode *,struct dentry *,int);
1724 +       int (*mkdir_raw) (struct nameidata *,int);
1725         int (*rmdir) (struct inode *,struct dentry *);
1726 +       int (*rmdir_raw) (struct nameidata *);
1727         int (*mknod) (struct inode *,struct dentry *,int,int);
1728 +       int (*mknod_raw) (struct nameidata *,int,dev_t);
1729         int (*rename) (struct inode *, struct dentry *,
1730                         struct inode *, struct dentry *);
1731 +       int (*rename_raw) (struct nameidata *, struct nameidata *);
1732         int (*readlink) (struct dentry *, char *,int);
1733         int (*follow_link) (struct dentry *, struct nameidata *);
1734         void (*truncate) (struct inode *);
1735         int (*permission) (struct inode *, int);
1736         int (*revalidate) (struct dentry *);
1737 +       int (*revalidate_it) (struct dentry *, struct lookup_intent *);
1738         int (*setattr) (struct dentry *, struct iattr *);
1739 +       int (*setattr_raw) (struct inode *, struct iattr *);
1740         int (*getattr) (struct dentry *, struct iattr *);
1741         int (*setxattr) (struct dentry *, const char *, const void *, size_t, int);
1742         ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
1743 @@ -1205,10 +1224,14 @@
1744
1745  asmlinkage long sys_open(const char *, int, int);
1746  asmlinkage long sys_close(unsigned int);       /* yes, it's really unsigned */
1747 -extern int do_truncate(struct dentry *, loff_t start);
1748 +extern int do_truncate(struct dentry *, loff_t start, int called_from_open);
1749
1750  extern struct file *filp_open(const char *, int, int);
1751  extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
1752 +extern int open_namei_it(const char *filename, int namei_flags, int mode,
1753 +                        struct nameidata *nd, struct lookup_intent *it);
1754 +extern struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt,
1755 +                           int flags, struct lookup_intent *it);
1756  extern int filp_close(struct file *, fl_owner_t id);
1757  extern char * getname(const char *);
1758
1759 @@ -1504,6 +1527,7 @@
1760  extern loff_t default_llseek(struct file *file, loff_t offset, int origin);
1761
1762  extern int FASTCALL(__user_walk(const char *, unsigned, struct nameidata *));
1763 +extern int FASTCALL(__user_walk_it(const char *, unsigned, struct nameidata *, struct lookup_intent *it));
1764  extern int FASTCALL(path_init(const char *, unsigned, struct nameidata *));
1765  extern int FASTCALL(path_walk(const char *, struct nameidata *));
1766  extern int FASTCALL(path_lookup(const char *, unsigned, struct nameidata *));
1767 @@ -1516,6 +1540,8 @@
1768  extern struct dentry * lookup_hash(struct qstr *, struct dentry *);
1769  #define user_path_walk(name,nd)         __user_walk(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, nd)
1770  #define user_path_walk_link(name,nd) __user_walk(name, LOOKUP_POSITIVE, nd)
1771 +#define user_path_walk_it(name,nd,it)  __user_walk_it(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, nd, it)
1772 +#define user_path_walk_link_it(name,nd,it) __user_walk_it(name, LOOKUP_POSITIVE, nd, it)
1773
1774  extern void inode_init_once(struct inode *);
1775  extern void _inode_init_once(struct inode *);
1776 @@ -1667,6 +1693,8 @@
1777
1778  extern int vfs_readlink(struct dentry *, char *, int, const char *);
1779  extern int vfs_follow_link(struct nameidata *, const char *);
1780 +extern int vfs_follow_link_it(struct nameidata *, const char *,
1781 +                             struct lookup_intent *it);
1782  extern int page_readlink(struct dentry *, char *, int);
1783  extern int page_follow_link(struct dentry *, struct nameidata *);
1784  extern struct inode_operations page_symlink_inode_operations;
1785 Index: linux-2.4.21-x86_64/include/linux/fs_struct.h
1786 ===================================================================
1787 --- linux-2.4.21-x86_64.orig/include/linux/fs_struct.h  2001-07-13 15:10:44.000000000 -0700
1788 +++ linux-2.4.21-x86_64/include/linux/fs_struct.h       2004-04-12 19:57:36.000000000 -0700
1789 @@ -34,10 +34,12 @@
1790         write_lock(&fs->lock);
1791         old_root = fs->root;
1792         old_rootmnt = fs->rootmnt;
1793 +       PIN(dentry, mnt, 1);
1794         fs->rootmnt = mntget(mnt);
1795         fs->root = dget(dentry);
1796         write_unlock(&fs->lock);
1797         if (old_root) {
1798 +               UNPIN(old_root, old_rootmnt, 1);
1799                 dput(old_root);
1800                 mntput(old_rootmnt);
1801         }
1802 @@ -57,10 +59,12 @@
1803         write_lock(&fs->lock);
1804         old_pwd = fs->pwd;
1805         old_pwdmnt = fs->pwdmnt;
1806 +       PIN(dentry, mnt, 0);
1807         fs->pwdmnt = mntget(mnt);
1808         fs->pwd = dget(dentry);
1809         write_unlock(&fs->lock);
1810         if (old_pwd) {
1811 +               UNPIN(old_pwd, old_pwdmnt, 0);
1812                 dput(old_pwd);
1813                 mntput(old_pwdmnt);
1814         }
1815 Index: linux-2.4.21-x86_64/kernel/exit.c
1816 ===================================================================
1817 --- linux-2.4.21-x86_64.orig/kernel/exit.c      2003-10-28 10:34:13.000000000 -0800
1818 +++ linux-2.4.21-x86_64/kernel/exit.c   2004-04-12 19:57:36.000000000 -0700
1819 @@ -288,11 +288,14 @@
1820  {
1821         /* No need to hold fs->lock if we are killing it */
1822         if (atomic_dec_and_test(&fs->count)) {
1823 +               UNPIN(fs->pwd, fs->pwdmnt, 0);
1824 +               UNPIN(fs->root, fs->rootmnt, 1);
1825                 dput(fs->root);
1826                 mntput(fs->rootmnt);
1827                 dput(fs->pwd);
1828                 mntput(fs->pwdmnt);
1829                 if (fs->altroot) {
1830 +                       UNPIN(fs->altroot, fs->altrootmnt, 1);
1831                         dput(fs->altroot);
1832                         mntput(fs->altrootmnt);
1833                 }
1834 Index: linux-2.4.21-x86_64/kernel/fork.c
1835 ===================================================================
1836 --- linux-2.4.21-x86_64.orig/kernel/fork.c      2003-10-28 10:34:17.000000000 -0800
1837 +++ linux-2.4.21-x86_64/kernel/fork.c   2004-04-12 19:57:36.000000000 -0700
1838 @@ -461,10 +461,13 @@
1839                 fs->umask = old->umask;
1840                 read_lock(&old->lock);
1841                 fs->rootmnt = mntget(old->rootmnt);
1842 +               PIN(old->pwd, old->pwdmnt, 0);
1843 +               PIN(old->root, old->rootmnt, 1);
1844                 fs->root = dget(old->root);
1845                 fs->pwdmnt = mntget(old->pwdmnt);
1846                 fs->pwd = dget(old->pwd);
1847                 if (old->altroot) {
1848 +                       PIN(old->altroot, old->altrootmnt, 1);
1849                         fs->altrootmnt = mntget(old->altrootmnt);
1850                         fs->altroot = dget(old->altroot);
1851                 } else {
1852 Index: linux-2.4.21-x86_64/kernel/ksyms.c
1853 ===================================================================
1854 --- linux-2.4.21-x86_64.orig/kernel/ksyms.c     2004-04-12 19:57:33.000000000 -0700
1855 +++ linux-2.4.21-x86_64/kernel/ksyms.c  2004-04-12 19:57:36.000000000 -0700
1856 @@ -327,6 +327,7 @@
1857  EXPORT_SYMBOL(set_page_dirty);
1858  EXPORT_SYMBOL(vfs_readlink);
1859  EXPORT_SYMBOL(vfs_follow_link);
1860 +EXPORT_SYMBOL(vfs_follow_link_it);
1861  EXPORT_SYMBOL(page_readlink);
1862  EXPORT_SYMBOL(page_follow_link);
1863  EXPORT_SYMBOL(page_symlink_inode_operations);