- backport a few name changes in the patches to 2.4.18

- include some new I/O functions.

diff --git a/lustre/kernel_patches/patches/ext3-o_direct-1.patch b/lustre/kernel_patches/patches/ext3-o_direct-1.patch
new file mode 100644 (file)
index 0000000..ac71640
--- /dev/null
+++ b/lustre/kernel_patches/patches/ext3-o_direct-1.patch
@@ -0,0 +1,177 @@
+--- 2.4.20-pre2/fs/ext3/inode.c~ext3-o_direct  Thu Aug 15 01:11:02 2002
++++ 2.4.20-pre2-akpm/fs/ext3/inode.c   Thu Aug 15 01:25:55 2002
+@@ -27,6 +27,7 @@
+ #include <linux/ext3_jbd.h>
+ #include <linux/jbd.h>
+ #include <linux/locks.h>
++#include <linux/iobuf.h>
+ #include <linux/smp_lock.h>
+ #include <linux/highuid.h>
+ #include <linux/quotaops.h>
+@@ -716,9 +717,9 @@ err_out:
+  * The BKL may not be held on entry here.  Be sure to take it early.
+  */
+ 
+-static int ext3_get_block_handle(handle_t *handle, struct inode *inode, 
+-                               long iblock,
+-                               struct buffer_head *bh_result, int create)
++static int
++ext3_get_block_handle(handle_t *handle, struct inode *inode, long iblock,
++              struct buffer_head *bh_result, int create, int extend_disksize)
+ {
+       int err = -EIO;
+       int offsets[4];
+@@ -798,16 +799,18 @@ out:
+       if (err)
+               goto cleanup;
+ 
+-      new_size = inode->i_size;
+-      /*
+-       * This is not racy against ext3_truncate's modification of i_disksize
+-       * because VM/VFS ensures that the file cannot be extended while
+-       * truncate is in progress.  It is racy between multiple parallel
+-       * instances of get_block, but we have the BKL.
+-       */
+-      if (new_size > inode->u.ext3_i.i_disksize)
+-              inode->u.ext3_i.i_disksize = new_size;
+-
++      if (extend_disksize) {
++              /*
++               * This is not racy against ext3_truncate's modification of
++               * i_disksize because VM/VFS ensures that the file cannot be
++               * extended while truncate is in progress.  It is racy between
++               * multiple parallel instances of get_block, but we have BKL.
++               */
++              struct ext3_inode_info *ei = EXT3_I(inode);
++              new_size = inode->i_size;
++              if (new_size > ei->i_disksize)
++                      ei->i_disksize = new_size;
++      }
+       bh_result->b_state |= (1UL << BH_New);
+       goto got_it;
+ 
+@@ -834,7 +837,38 @@ static int ext3_get_block(struct inode *
+               handle = ext3_journal_current_handle();
+               J_ASSERT(handle != 0);
+       }
+-      ret = ext3_get_block_handle(handle, inode, iblock, bh_result, create);
++      ret = ext3_get_block_handle(handle, inode, iblock,
++                              bh_result, create, 1);
++      return ret;
++}
++
++#define DIO_CREDITS (EXT3_RESERVE_TRANS_BLOCKS + 32)
++
++static int
++ext3_direct_io_get_block(struct inode *inode, long iblock,
++              struct buffer_head *bh_result, int create)
++{
++      handle_t *handle = journal_current_handle();
++      int ret = 0;
++
++      lock_kernel();
++      if (handle && handle->h_buffer_credits <= EXT3_RESERVE_TRANS_BLOCKS) {
++              /*
++               * Getting low on buffer credits...
++               */
++              if (!ext3_journal_extend(handle, DIO_CREDITS)) {
++                      /*
++                       * Couldn't extend the transaction.  Start a new one
++                       */
++                      ret = ext3_journal_restart(handle, DIO_CREDITS);
++              }
++      }
++      if (ret == 0)
++              ret = ext3_get_block_handle(handle, inode, iblock,
++                                      bh_result, create, 0);
++      if (ret == 0)
++              bh_result->b_size = (1 << inode->i_blkbits);
++      unlock_kernel();
+       return ret;
+ }
+ 
+@@ -852,7 +886,7 @@ struct buffer_head *ext3_getblk(handle_t
+       dummy.b_state = 0;
+       dummy.b_blocknr = -1000;
+       buffer_trace_init(&dummy.b_history);
+-      *errp = ext3_get_block_handle(handle, inode, block, &dummy, create);
++      *errp = ext3_get_block_handle(handle, inode, block, &dummy, create, 1);
+       if (!*errp && buffer_mapped(&dummy)) {
+               struct buffer_head *bh;
+               bh = sb_getblk(inode->i_sb, dummy.b_blocknr);
+@@ -1349,6 +1383,67 @@ static int ext3_releasepage(struct page 
+       return journal_try_to_free_buffers(journal, page, wait);
+ }
+ 
++static int
++ext3_direct_IO(int rw, struct inode *inode, struct kiobuf *iobuf,
++              unsigned long blocknr, int blocksize)
++{
++      struct ext3_inode_info *ei = EXT3_I(inode);
++      handle_t *handle = NULL;
++      int ret;
++      int orphan = 0;
++      loff_t offset = blocknr << inode->i_blkbits;    /* ugh */
++      ssize_t count = iobuf->length;                  /* ditto */
++
++      if (rw == WRITE) {
++              loff_t final_size = offset + count;
++
++              lock_kernel();
++              handle = ext3_journal_start(inode, DIO_CREDITS);
++              unlock_kernel();
++              if (IS_ERR(handle)) {
++                      ret = PTR_ERR(handle);
++                      goto out;
++              }
++              if (final_size > inode->i_size) {
++                      lock_kernel();
++                      ret = ext3_orphan_add(handle, inode);
++                      unlock_kernel();
++                      if (ret)
++                              goto out_stop;
++                      orphan = 1;
++                      ei->i_disksize = inode->i_size;
++              }
++      }
++
++      ret = generic_direct_IO(rw, inode, iobuf, blocknr,
++                              blocksize, ext3_direct_io_get_block);
++
++out_stop:
++      if (handle) {
++              int err;
++
++              lock_kernel();
++              if (orphan) 
++                      ext3_orphan_del(handle, inode);
++              if (orphan && ret > 0) {
++                      loff_t end = offset + ret;
++                      if (end > inode->i_size) {
++                              ei->i_disksize = end;
++                              inode->i_size = end;
++                              err = ext3_mark_inode_dirty(handle, inode);
++                              if (!ret) 
++                                      ret = err;
++                      }
++              }
++              err = ext3_journal_stop(handle, inode);
++              if (ret == 0)
++                      ret = err;
++              unlock_kernel();
++      }
++out:
++      return ret;
++
++}
+ 
+ struct address_space_operations ext3_aops = {
+       readpage:       ext3_readpage,          /* BKL not held.  Don't need */
+@@ -1359,6 +1454,7 @@ struct address_space_operations ext3_aop
+       bmap:           ext3_bmap,              /* BKL held */
+       flushpage:      ext3_flushpage,         /* BKL not held.  Don't need */
+       releasepage:    ext3_releasepage,       /* BKL not held.  Don't need */
++      direct_IO:      ext3_direct_IO,         /* BKL not held.  Don't need */
+ };
+ 
+ /*

diff --git a/lustre/kernel_patches/patches/vfs_intent-2.4.18-18-chaos65.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.18-18-chaos65.patch
index d68a351..f8413f6 100644 (file)
--- a/lustre/kernel_patches/patches/vfs_intent-2.4.18-18-chaos65.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.4.18-18-chaos65.patch
@@ -12,8 +12,10 @@
  kernel/ksyms.c         |    1 
  12 files changed, 564 insertions(+), 99 deletions(-)
 
---- linux-2.4.18-p4smp/fs/exec.c~vfs_intent-2.4.18-18-chaos65  2003-07-09 12:17:30.000000000 -0600
-+++ linux-2.4.18-p4smp-braam/fs/exec.c 2003-07-09 13:20:37.000000000 -0600
+Index: linux/fs/exec.c
+===================================================================
+--- linux.orig/fs/exec.c       2003-07-25 12:23:57.000000000 -0600
++++ linux/fs/exec.c    2003-07-25 12:27:53.000000000 -0600
 @@ -117,8 +117,9 @@ asmlinkage long sys_uselib(const char * 
        struct file * file;
        struct nameidata nd;
@@ -73,8 +75,10 @@
                goto close_fail;
  
        retval = binfmt->core_dump(signr, regs, file);
---- linux-2.4.18-p4smp/fs/dcache.c~vfs_intent-2.4.18-18-chaos65        2003-07-09 12:17:30.000000000 -0600
-+++ linux-2.4.18-p4smp-braam/fs/dcache.c       2003-07-09 13:20:37.000000000 -0600
+Index: linux/fs/dcache.c
+===================================================================
+--- linux.orig/fs/dcache.c     2003-07-25 12:23:57.000000000 -0600
++++ linux/fs/dcache.c  2003-07-25 12:27:53.000000000 -0600
 @@ -186,6 +186,13 @@ int d_invalidate(struct dentry * dentry)
                spin_unlock(&dcache_lock);
                return 0;
@@ -112,8 +116,10 @@
  }
  
  #define do_switch(x,y) do { \
---- linux-2.4.18-p4smp/fs/namespace.c~vfs_intent-2.4.18-18-chaos65     2002-06-25 22:16:14.000000000 -0600
-+++ linux-2.4.18-p4smp-braam/fs/namespace.c    2003-07-09 13:20:37.000000000 -0600
+Index: linux/fs/namespace.c
+===================================================================
+--- linux.orig/fs/namespace.c  2002-06-25 22:16:14.000000000 -0600
++++ linux/fs/namespace.c       2003-07-25 12:27:53.000000000 -0600
 @@ -99,6 +99,7 @@ static void detach_mnt(struct vfsmount *
  {
        old_nd->dentry = mnt->mnt_mountpoint;
@@ -158,16 +164,14 @@
        path_release(&old_nd);
        return err;
  }
-@@ -698,7 +704,8 @@ long do_mount(char * dev_name, char * di
+@@ -698,6 +704,7 @@ long do_mount(char * dev_name, char * di
                  unsigned long flags, void *data_page)
  {
        struct nameidata nd;
--      int retval = 0;
 +      struct lookup_intent it = { .it_op = IT_GETATTR };
-+      int retval = 0;
+       int retval = 0;
        int mnt_flags = 0;
  
-       /* Discard magic */
 @@ -722,10 +729,11 @@ long do_mount(char * dev_name, char * di
        flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV);
  
@@ -229,8 +233,10 @@
        path_release(&new_nd);
  out0:
        unlock_kernel();
---- linux-2.4.18-p4smp/fs/namei.c~vfs_intent-2.4.18-18-chaos65 2003-07-09 12:17:30.000000000 -0600
-+++ linux-2.4.18-p4smp-braam/fs/namei.c        2003-07-09 13:20:37.000000000 -0600
+Index: linux/fs/namei.c
+===================================================================
+--- linux.orig/fs/namei.c      2003-07-25 12:23:57.000000000 -0600
++++ linux/fs/namei.c   2003-07-25 12:47:56.000000000 -0600
 @@ -94,6 +94,13 @@
   * XEmacs seems to be relying on it...
   */
@@ -315,22 +321,13 @@
  {
        int err;
        if (current->link_count >= max_recursive_link)
-@@ -348,10 +377,21 @@ static inline int do_follow_link(struct 
+@@ -348,10 +377,12 @@ static inline int do_follow_link(struct 
        current->link_count++;
        current->total_link_count++;
        UPDATE_ATIME(dentry->d_inode);
 -      err = dentry->d_inode->i_op->follow_link(dentry, nd);
-+      nd->it = it;
-+      if (dentry->d_inode->i_op->follow_link2)
-+              err = dentry->d_inode->i_op->follow_link2(dentry, nd, it);
-+      else
-+              err = dentry->d_inode->i_op->follow_link(dentry, nd);
-+      if (!err && it != NULL && !(it->it_int_flags & IT_FL_FOLLOWED)) {
-+              /* vfs_follow_link was never called */
-+              intent_release(it);
-+              path_release(nd);
-+              err = -ENOLINK;
-+      }
++      nd->intent = it;
++        err = dentry->d_inode->i_op->follow_link(dentry, nd);
        current->link_count--;
        return err;
  loop:
@@ -338,7 +335,7 @@
        path_release(nd);
        return -ELOOP;
  }
-@@ -381,15 +421,26 @@ int follow_up(struct vfsmount **mnt, str
+@@ -381,7 +412,8 @@ int follow_up(struct vfsmount **mnt, str
        return __follow_up(mnt, dentry);
  }
  
@@ -348,25 +345,7 @@
  {
        struct vfsmount *mounted;
  
-       spin_lock(&dcache_lock);
-       mounted = lookup_mnt(*mnt, *dentry);
-       if (mounted) {
-+              int opc = 0, mode = 0;
-               *mnt = mntget(mounted);
-               spin_unlock(&dcache_lock);
-+              if (it) {
-+                      opc = it->it_op;
-+                      mode = it->it_mode;
-+              }
-+              intent_release(it);
-+              if (it) {
-+                      it->it_op = opc;
-+                      it->it_mode = mode;
-+              }
-               dput(*dentry);
-               mntput(mounted->mnt_parent);
-               *dentry = dget(mounted->mnt_root);
-@@ -401,7 +452,7 @@ static inline int __follow_down(struct v
+@@ -401,7 +433,7 @@ static inline int __follow_down(struct v
  
  int follow_down(struct vfsmount **mnt, struct dentry **dentry)
  {
@@ -375,7 +354,7 @@
  }
   
  static inline void follow_dotdot(struct nameidata *nd)
-@@ -437,7 +488,7 @@ static inline void follow_dotdot(struct 
+@@ -437,7 +469,7 @@ static inline void follow_dotdot(struct 
                mntput(nd->mnt);
                nd->mnt = parent;
        }
@@ -384,7 +363,7 @@
                ;
  }
  
-@@ -449,7 +500,8 @@ static inline void follow_dotdot(struct 
+@@ -449,7 +481,8 @@ static inline void follow_dotdot(struct 
   *
   * We expect 'base' to be positive and a directory.
   */
@@ -394,7 +373,7 @@
  {
        struct dentry *dentry;
        struct inode *inode;
-@@ -526,18 +578,18 @@ int link_path_walk(const char * name, st
+@@ -526,18 +559,18 @@ int link_path_walk(const char * name, st
                                break;
                }
                /* This does the actual lookups.. */
@@ -416,7 +395,7 @@
                        ;
  
                err = -ENOENT;
-@@ -548,8 +600,8 @@ int link_path_walk(const char * name, st
+@@ -548,8 +581,8 @@ int link_path_walk(const char * name, st
                if (!inode->i_op)
                        goto out_dput;
  
@@ -427,7 +406,7 @@
                        dput(dentry);
                        if (err)
                                goto return_err;
-@@ -565,7 +617,7 @@ int link_path_walk(const char * name, st
+@@ -565,7 +598,7 @@ int link_path_walk(const char * name, st
                        nd->dentry = dentry;
                }
                err = -ENOTDIR; 
@@ -436,7 +415,7 @@
                        break;
                continue;
                /* here ends the main loop */
-@@ -592,22 +644,23 @@ last_component:
+@@ -592,22 +625,23 @@ last_component:
                        if (err < 0)
                                break;
                }
@@ -465,7 +444,7 @@
                        dput(dentry);
                        if (err)
                                goto return_err;
-@@ -621,7 +674,8 @@ last_component:
+@@ -621,7 +655,8 @@ last_component:
                        goto no_inode;
                if (lookup_flags & LOOKUP_DIRECTORY) {
                        err = -ENOTDIR; 
@@ -475,7 +454,7 @@
                                break;
                }
                goto return_base;
-@@ -645,7 +699,24 @@ return_reval:
+@@ -645,7 +680,24 @@ return_reval:
                 * Check the cached dentry for staleness.
                 */
                dentry = nd->dentry;
@@ -501,7 +480,7 @@
                        err = -ESTALE;
                        if (!dentry->d_op->d_revalidate(dentry, 0)) {
                                d_invalidate(dentry);
-@@ -658,15 +729,28 @@ out_dput:
+@@ -658,15 +710,28 @@ out_dput:
                dput(dentry);
                break;
        }
@@ -531,7 +510,7 @@
  }
  
  /* SMP-safe */
-@@ -751,6 +835,17 @@ walk_init_root(const char *name, struct 
+@@ -751,6 +816,17 @@ walk_init_root(const char *name, struct 
  }
  
  /* SMP-safe */
@@ -549,15 +528,15 @@
  int path_lookup(const char *path, unsigned flags, struct nameidata *nd)
  {
        int error = 0;
-@@ -765,6 +860,7 @@ int path_init(const char *name, unsigned
+@@ -765,6 +841,7 @@ int path_init(const char *name, unsigned
  {
        nd->last_type = LAST_ROOT; /* if there are only slashes... */
        nd->flags = flags;
-+      nd->it = NULL;
++      nd->intent = NULL;
        if (*name=='/')
                return walk_init_root(name,nd);
        read_lock(&current->fs->lock);
-@@ -779,7 +875,8 @@ int path_init(const char *name, unsigned
+@@ -779,7 +856,8 @@ int path_init(const char *name, unsigned
   * needs parent already locked. Doesn't follow mounts.
   * SMP-safe.
   */
@@ -567,7 +546,7 @@
  {
        struct dentry * dentry;
        struct inode *inode;
-@@ -802,13 +899,16 @@ struct dentry * lookup_hash(struct qstr 
+@@ -802,13 +880,16 @@ struct dentry * lookup_hash(struct qstr 
                        goto out;
        }
  
@@ -585,7 +564,7 @@
                dentry = inode->i_op->lookup(inode, new);
                unlock_kernel();
                if (!dentry)
-@@ -820,6 +920,12 @@ out:
+@@ -820,6 +901,12 @@ out:
        return dentry;
  }
  
@@ -598,7 +577,7 @@
  /* SMP-safe */
  struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
  {
-@@ -841,7 +947,7 @@ struct dentry * lookup_one_len(const cha
+@@ -841,7 +928,7 @@ struct dentry * lookup_one_len(const cha
        }
        this.hash = end_name_hash(hash);
  
@@ -607,7 +586,7 @@
  access:
        return ERR_PTR(-EACCES);
  }
-@@ -872,6 +978,23 @@ int __user_walk(const char *name, unsign
+@@ -872,6 +959,23 @@ int __user_walk(const char *name, unsign
        return err;
  }
  
@@ -631,7 +610,7 @@
  /*
   * It's inline, so penalty for filesystems that don't use sticky bit is
   * minimal.
-@@ -969,6 +1092,37 @@ static inline int lookup_flags(unsigned 
+@@ -969,6 +1073,37 @@ static inline int lookup_flags(unsigned 
        return retval;
  }
  
@@ -669,24 +648,14 @@
  int vfs_create(struct inode *dir, struct dentry *dentry, int mode)
  {
        int error;
-@@ -987,7 +1141,7 @@ int vfs_create(struct inode *dir, struct
- 
-       DQUOT_INIT(dir);
-       lock_kernel();
--      error = dir->i_op->create(dir, dentry, mode);
-+      error = dir->i_op->create(dir, dentry, mode);
-       unlock_kernel();
- exit_lock:
-       up(&dir->i_zombie);
-@@ -1045,14 +1199,17 @@ int may_open(struct nameidata *nd, int a
+@@ -1045,14 +1180,17 @@ int may_open(struct nameidata *nd, int a
          return get_lease(inode, flag);
  }
  
--struct file *filp_open(const char * pathname, int open_flags, int mode)
 +extern struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt,
 +                                 int flags, struct lookup_intent *it);
 +
-+struct file *filp_open(const char * pathname, int open_flags, int mode)
+ struct file *filp_open(const char * pathname, int open_flags, int mode)
  {
        int acc_mode, error = 0;
 -      struct inode *inode;
@@ -698,7 +667,7 @@
        int count = 0;
        
        if (!capable(CAP_SYS_ADMIN))
-@@ -1069,7 +1226,7 @@ struct file *filp_open(const char * path
+@@ -1069,7 +1207,7 @@ struct file *filp_open(const char * path
         * The simplest case - just a plain lookup.
         */
        if (!(flag & O_CREAT)) {
@@ -707,16 +676,16 @@
                if (error)
                        return ERR_PTR(error);
                dentry = nd.dentry;
-@@ -1079,6 +1236,8 @@ struct file *filp_open(const char * path
+@@ -1079,6 +1217,8 @@ struct file *filp_open(const char * path
        /*
         * Create - we need to know the parent.
         */
-+      it.it_mode = mode;
++      it.it_create_mode = mode;
 +      it.it_op |= IT_CREAT;
        error = path_lookup(pathname, LOOKUP_PARENT, &nd);
        if (error)
                return ERR_PTR(error);
-@@ -1094,7 +1253,7 @@ struct file *filp_open(const char * path
+@@ -1094,7 +1234,7 @@ struct file *filp_open(const char * path
  
        dir = nd.dentry;
        down(&dir->d_inode->i_sem);
@@ -725,11 +694,11 @@
  
  do_last:
        error = PTR_ERR(dentry);
-@@ -1103,10 +1262,11 @@ do_last:
+@@ -1103,10 +1243,11 @@ do_last:
                goto exit;
        }
  
-+      it.it_mode = mode;
++      it.it_create_mode = mode;
        /* Negative dentry, just create the file */
        if (!dentry->d_inode) {
 -              error = vfs_create(dir->d_inode, dentry,
@@ -739,7 +708,7 @@
                up(&dir->d_inode->i_sem);
                dput(nd.dentry);
                nd.dentry = dentry;
-@@ -1132,12 +1292,12 @@ do_last:
+@@ -1132,12 +1273,12 @@ do_last:
                error = -ELOOP;
                if (flag & O_NOFOLLOW)
                        goto exit_dput;
@@ -754,7 +723,7 @@
                goto do_link;
  
        dput(nd.dentry);
-@@ -1152,11 +1312,13 @@ ok:
+@@ -1152,11 +1293,13 @@ ok:
        if (!S_ISREG(nd.dentry->d_inode->i_mode))
                open_flags &= ~O_TRUNC;
  
@@ -769,20 +738,14 @@
        path_release(&nd);
        return ERR_PTR(error);
  
-@@ -1175,10 +1337,19 @@ do_link:
+@@ -1175,10 +1318,14 @@ do_link:
         * are done. Procfs-like symlinks just set LAST_BIND.
         */
        UPDATE_ATIME(dentry->d_inode);
--      error = dentry->d_inode->i_op->follow_link(dentry, &nd);
-+      nd.it = &it;
-+      error = dentry->d_inode->i_op->follow_link(dentry, &nd);
++      nd.intent = &it;
+       error = dentry->d_inode->i_op->follow_link(dentry, &nd);
 +      if (error) {
 +              intent_release(&it);
-+      } else if (!(it.it_int_flags & IT_FL_FOLLOWED)) {
-+              /* vfs_follow_link was never called */
-+              intent_release(&it);
-+              path_release(&nd);
-+              error = -ENOLINK;
 +      }
        dput(dentry);
        if (error)
@@ -791,7 +754,7 @@
        if (nd.last_type == LAST_BIND) {
                dentry = nd.dentry;
                goto ok;
-@@ -1197,13 +1368,15 @@ do_link:
+@@ -1197,13 +1344,15 @@ do_link:
        }
        dir = nd.dentry;
        down(&dir->d_inode->i_sem);
@@ -809,7 +772,7 @@
  {
        struct dentry *dentry;
  
-@@ -1211,7 +1384,7 @@ static struct dentry *lookup_create(stru
+@@ -1211,7 +1360,7 @@ static struct dentry *lookup_create(stru
        dentry = ERR_PTR(-EEXIST);
        if (nd->last_type != LAST_NORM)
                goto fail;
@@ -818,7 +781,7 @@
        if (IS_ERR(dentry))
                goto fail;
        if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode)
-@@ -1267,7 +1440,16 @@ asmlinkage long sys_mknod(const char * f
+@@ -1267,7 +1416,16 @@ asmlinkage long sys_mknod(const char * f
        error = path_lookup(tmp, LOOKUP_PARENT, &nd);
        if (error)
                goto out;
@@ -836,7 +799,7 @@
        error = PTR_ERR(dentry);
  
        mode &= ~current->fs->umask;
-@@ -1288,6 +1470,7 @@ asmlinkage long sys_mknod(const char * f
+@@ -1288,6 +1446,7 @@ asmlinkage long sys_mknod(const char * f
                dput(dentry);
        }
        up(&nd.dentry->d_inode->i_sem);
@@ -844,7 +807,7 @@
        path_release(&nd);
  out:
        putname(tmp);
-@@ -1335,7 +1518,14 @@ asmlinkage long sys_mkdir(const char * p
+@@ -1335,7 +1494,14 @@ asmlinkage long sys_mkdir(const char * p
                error = path_lookup(tmp, LOOKUP_PARENT, &nd);
                if (error)
                        goto out;
@@ -860,7 +823,7 @@
                error = PTR_ERR(dentry);
                if (!IS_ERR(dentry)) {
                        error = vfs_mkdir(nd.dentry->d_inode, dentry,
-@@ -1343,6 +1533,7 @@ asmlinkage long sys_mkdir(const char * p
+@@ -1343,6 +1509,7 @@ asmlinkage long sys_mkdir(const char * p
                        dput(dentry);
                }
                up(&nd.dentry->d_inode->i_sem);
@@ -868,7 +831,7 @@
                path_release(&nd);
  out:
                putname(tmp);
-@@ -1443,8 +1634,16 @@ asmlinkage long sys_rmdir(const char * p
+@@ -1443,8 +1610,16 @@ asmlinkage long sys_rmdir(const char * p
                        error = -EBUSY;
                        goto exit1;
        }
@@ -886,7 +849,7 @@
        error = PTR_ERR(dentry);
        if (!IS_ERR(dentry)) {
                error = vfs_rmdir(nd.dentry->d_inode, dentry);
-@@ -1502,8 +1701,15 @@ asmlinkage long sys_unlink(const char * 
+@@ -1502,8 +1677,15 @@ asmlinkage long sys_unlink(const char * 
        error = -EISDIR;
        if (nd.last_type != LAST_NORM)
                goto exit1;
@@ -903,7 +866,7 @@
        error = PTR_ERR(dentry);
        if (!IS_ERR(dentry)) {
                /* Why not before? Because we want correct error value */
-@@ -1570,15 +1776,23 @@ asmlinkage long sys_symlink(const char *
+@@ -1570,15 +1752,23 @@ asmlinkage long sys_symlink(const char *
                error = path_lookup(to, LOOKUP_PARENT, &nd);
                if (error)
                        goto out;
@@ -929,7 +892,7 @@
                putname(to);
        }
        putname(from);
-@@ -1654,7 +1868,14 @@ asmlinkage long sys_link(const char * ol
+@@ -1654,7 +1844,14 @@ asmlinkage long sys_link(const char * ol
                error = -EXDEV;
                if (old_nd.mnt != nd.mnt)
                        goto out_release;
@@ -945,7 +908,7 @@
                error = PTR_ERR(new_dentry);
                if (!IS_ERR(new_dentry)) {
                        error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry);
-@@ -1698,7 +1919,7 @@ exit:
+@@ -1698,7 +1895,7 @@ exit:
   *       locking].
   */
  int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry,
@@ -954,7 +917,7 @@
  {
        int error;
        struct inode *target;
-@@ -1777,7 +1998,7 @@ out_unlock:
+@@ -1777,7 +1974,7 @@ out_unlock:
  }
  
  int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
@@ -963,7 +926,7 @@
  {
        int error;
  
-@@ -1865,9 +2086,18 @@ static inline int do_rename(const char *
+@@ -1865,9 +2062,18 @@ static inline int do_rename(const char *
        if (newnd.last_type != LAST_NORM)
                goto exit2;
  
@@ -983,7 +946,7 @@
        error = PTR_ERR(old_dentry);
        if (IS_ERR(old_dentry))
                goto exit3;
-@@ -1883,16 +2113,16 @@ static inline int do_rename(const char *
+@@ -1883,16 +2089,16 @@ static inline int do_rename(const char *
                if (newnd.last.name[newnd.last.len])
                        goto exit4;
        }
@@ -1002,7 +965,7 @@
        dput(new_dentry);
  exit4:
        dput(old_dentry);
-@@ -1943,12 +2173,19 @@ out:
+@@ -1943,12 +2149,17 @@ out:
  }
  
  static inline int
@@ -1015,15 +978,13 @@
        if (IS_ERR(link))
                goto fail;
 +      if (it == NULL)
-+              it = nd->it;
-+      else if (it != nd->it)
-+              printk("it != nd->it: tell phil@clusterfs.com\n");
-+      if (it != NULL)
-+              it->it_int_flags |= IT_FL_FOLLOWED;
++              it = nd->intent;
++      else if (it != nd->intent)
++              printk("it != nd->intent: tell phil@clusterfs.com\n");
  
        if (*link == '/') {
                path_release(nd);
-@@ -1956,7 +2193,7 @@ __vfs_follow_link(struct nameidata *nd, 
+@@ -1956,7 +2167,7 @@ __vfs_follow_link(struct nameidata *nd, 
                        /* weird __emul_prefix() stuff did it */
                        goto out;
        }
@@ -1032,7 +993,7 @@
  out:
        if (current->link_count || res || nd->last_type!=LAST_NORM)
                return res;
-@@ -1978,7 +2215,13 @@ fail:
+@@ -1978,7 +2189,13 @@ fail:
  
  int vfs_follow_link(struct nameidata *nd, const char *link)
  {
@@ -1047,7 +1008,7 @@
  }
  
  /* get the link contents into pagecache */
-@@ -2020,7 +2263,7 @@ int page_follow_link(struct dentry *dent
+@@ -2020,7 +2237,7 @@ int page_follow_link(struct dentry *dent
  {
        struct page *page = NULL;
        char *s = page_getlink(dentry, &page);
@@ -1056,8 +1017,10 @@
        if (page) {
                kunmap(page);
                page_cache_release(page);
---- linux-2.4.18-p4smp/fs/open.c~vfs_intent-2.4.18-18-chaos65  2003-07-09 12:17:30.000000000 -0600
-+++ linux-2.4.18-p4smp-braam/fs/open.c 2003-07-09 13:20:37.000000000 -0600
+Index: linux/fs/open.c
+===================================================================
+--- linux.orig/fs/open.c       2003-07-25 12:23:57.000000000 -0600
++++ linux/fs/open.c    2003-07-25 12:27:53.000000000 -0600
 @@ -19,6 +19,8 @@
  #include <asm/uaccess.h>
  
@@ -1094,7 +1057,7 @@
        up(&inode->i_sem);
        return error;
  }
-@@ -118,12 +128,13 @@ static inline long do_sys_truncate(const
+@@ -118,12 +127,13 @@ static inline long do_sys_truncate(const
        struct nameidata nd;
        struct inode * inode;
        int error;
@@ -1109,7 +1072,7 @@
        if (error)
                goto out;
        inode = nd.dentry->d_inode;
-@@ -163,11 +174,13 @@ static inline long do_sys_truncate(const
+@@ -163,11 +173,13 @@ static inline long do_sys_truncate(const
        error = locks_verify_truncate(inode, NULL, length);
        if (!error) {
                DQUOT_INIT(inode);
@@ -1124,7 +1087,7 @@
        path_release(&nd);
  out:
        return error;
-@@ -215,7 +228,7 @@ static inline long do_sys_ftruncate(unsi
+@@ -215,7 +227,7 @@ static inline long do_sys_ftruncate(unsi
  
        error = locks_verify_truncate(inode, file, length);
        if (!error)
@@ -1133,7 +1096,7 @@
  out_putf:
        fput(file);
  out:
-@@ -260,11 +273,13 @@ asmlinkage long sys_utime(char * filenam
+@@ -260,11 +272,13 @@ asmlinkage long sys_utime(char * filenam
        struct inode * inode;
        struct iattr newattrs;
  
@@ -1148,7 +1111,7 @@
        error = -EROFS;
        if (IS_RDONLY(inode))
                goto dput_and_out;
-@@ -279,11 +294,25 @@ asmlinkage long sys_utime(char * filenam
+@@ -279,11 +293,25 @@ asmlinkage long sys_utime(char * filenam
                        goto dput_and_out;
  
                newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET;
@@ -1175,7 +1138,7 @@
        error = notify_change(nd.dentry, &newattrs);
  dput_and_out:
        path_release(&nd);
-@@ -304,12 +337,14 @@ asmlinkage long sys_utimes(char * filena
+@@ -304,12 +332,14 @@ asmlinkage long sys_utimes(char * filena
        struct inode * inode;
        struct iattr newattrs;
  
@@ -1191,7 +1154,7 @@
        error = -EROFS;
        if (IS_RDONLY(inode))
                goto dput_and_out;
-@@ -324,7 +359,20 @@ asmlinkage long sys_utimes(char * filena
+@@ -324,7 +354,20 @@ asmlinkage long sys_utimes(char * filena
                newattrs.ia_atime = times[0].tv_sec;
                newattrs.ia_mtime = times[1].tv_sec;
                newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET;
@@ -1213,7 +1176,7 @@
                if (current->fsuid != inode->i_uid &&
                    (error = permission(inode,MAY_WRITE)) != 0)
                        goto dput_and_out;
-@@ -347,6 +395,7 @@ asmlinkage long sys_access(const char * 
+@@ -347,6 +390,7 @@ asmlinkage long sys_access(const char * 
        int old_fsuid, old_fsgid;
        kernel_cap_t old_cap;
        int res;
@@ -1221,7 +1184,7 @@
  
        if (mode & ~S_IRWXO)    /* where's F_OK, X_OK, W_OK, R_OK? */
                return -EINVAL;
-@@ -364,13 +413,14 @@ asmlinkage long sys_access(const char * 
+@@ -364,13 +408,14 @@ asmlinkage long sys_access(const char * 
        else
                current->cap_effective = current->cap_permitted;
  
@@ -1237,7 +1200,7 @@
                path_release(&nd);
        }
  
-@@ -385,8 +435,11 @@ asmlinkage long sys_chdir(const char * f
+@@ -385,8 +430,11 @@ asmlinkage long sys_chdir(const char * f
  {
        int error;
        struct nameidata nd;
@@ -1250,7 +1213,7 @@
        if (error)
                goto out;
  
-@@ -397,6 +450,7 @@ asmlinkage long sys_chdir(const char * f
+@@ -397,6 +445,7 @@ asmlinkage long sys_chdir(const char * f
        set_fs_pwd(current->fs, nd.mnt, nd.dentry);
  
  dput_and_out:
@@ -1258,7 +1221,7 @@
        path_release(&nd);
  out:
        return error;
-@@ -436,9 +490,10 @@ asmlinkage long sys_chroot(const char * 
+@@ -436,9 +485,10 @@ asmlinkage long sys_chroot(const char * 
  {
        int error;
        struct nameidata nd;
@@ -1271,7 +1234,7 @@
        if (error)
                goto out;
  
-@@ -454,6 +509,7 @@ asmlinkage long sys_chroot(const char * 
+@@ -454,6 +504,7 @@ asmlinkage long sys_chroot(const char * 
        set_fs_altroot();
        error = 0;
  dput_and_out:
@@ -1279,7 +1242,7 @@
        path_release(&nd);
  out:
        return error;
-@@ -508,6 +564,18 @@ asmlinkage long sys_chmod(const char * f
+@@ -508,6 +559,18 @@ asmlinkage long sys_chmod(const char * f
        if (IS_RDONLY(inode))
                goto dput_and_out;
  
@@ -1298,7 +1261,7 @@
        error = -EPERM;
        if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
                goto dput_and_out;
-@@ -538,6 +606,20 @@ static int chown_common(struct dentry * 
+@@ -538,6 +601,20 @@ static int chown_common(struct dentry * 
        error = -EROFS;
        if (IS_RDONLY(inode))
                goto out;
@@ -1319,7 +1282,7 @@
        error = -EPERM;
        if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
                goto out;
-@@ -628,7 +710,8 @@ extern ssize_t do_readahead(struct file 
+@@ -628,7 +705,8 @@ extern ssize_t do_readahead(struct file 
  /* for files over a certains size it doesn't pay to do readahead on open */
  #define READAHEAD_CUTOFF 48000
  
@@ -1329,7 +1292,7 @@
  {
        struct file * f;
        struct inode *inode;
-@@ -649,7 +732,7 @@ struct file *dentry_open(struct dentry *
+@@ -649,7 +727,7 @@ struct file *dentry_open(struct dentry *
                error = locks_verify_locked(inode);
                if (!error) {
                        DQUOT_INIT(inode);
@@ -1338,7 +1301,7 @@
                }
                if (error || !(f->f_mode & FMODE_WRITE))
                        put_write_access(inode);
-@@ -679,7 +762,9 @@ struct file *dentry_open(struct dentry *
+@@ -679,7 +757,9 @@ struct file *dentry_open(struct dentry *
        }
  
        if (f->f_op && f->f_op->open) {
@@ -1348,7 +1311,7 @@
                if (error)
                        goto cleanup_all;
        }
-@@ -693,6 +778,7 @@ struct file *dentry_open(struct dentry *
+@@ -693,6 +773,7 @@ struct file *dentry_open(struct dentry *
                do_readahead(f, 0, (48 * 1024) >> PAGE_SHIFT);
        
  
@@ -1356,7 +1319,7 @@
        return f;
  
  cleanup_all:
-@@ -707,11 +793,17 @@ cleanup_all:
+@@ -707,11 +788,17 @@ cleanup_all:
  cleanup_file:
        put_filp(f);
  cleanup_dentry:
@@ -1374,8 +1337,10 @@
  /*
   * Find an empty file descriptor entry, and mark it busy.
   */
---- linux-2.4.18-p4smp/fs/stat.c~vfs_intent-2.4.18-18-chaos65  2003-07-09 12:17:30.000000000 -0600
-+++ linux-2.4.18-p4smp-braam/fs/stat.c 2003-07-09 13:20:37.000000000 -0600
+Index: linux/fs/stat.c
+===================================================================
+--- linux.orig/fs/stat.c       2003-07-25 12:23:57.000000000 -0600
++++ linux/fs/stat.c    2003-07-25 12:27:53.000000000 -0600
 @@ -17,21 +17,24 @@
   * Revalidate the inode. This is required for proper NFS attribute caching.
   */
@@ -1453,23 +1418,13 @@
                        UPDATE_ATIME(inode);
                        error = inode->i_op->readlink(nd.dentry, buf, bufsiz);
                }
---- linux-2.4.18-p4smp/fs/proc/base.c~vfs_intent-2.4.18-18-chaos65     2003-07-09 12:20:46.000000000 -0600
-+++ linux-2.4.18-p4smp-braam/fs/proc/base.c    2003-07-09 13:20:37.000000000 -0600
-@@ -465,6 +465,9 @@ static int proc_pid_follow_link(struct d
+Index: linux/include/linux/dcache.h
+===================================================================
+--- linux.orig/include/linux/dcache.h  2003-07-25 12:23:57.000000000 -0600
++++ linux/include/linux/dcache.h       2003-07-25 12:30:51.000000000 -0600
+@@ -5,6 +5,51 @@
  
-       error = inode->u.proc_i.op.proc_get_link(inode, &nd->dentry, &nd->mnt);
-       nd->last_type = LAST_BIND;
-+
-+      if (nd->it != NULL)
-+              nd->it->it_int_flags |= IT_FL_FOLLOWED;
- out:
-       return error;
- }
---- linux-2.4.18-p4smp/include/linux/dcache.h~vfs_intent-2.4.18-18-chaos65     2003-07-09 13:15:23.000000000 -0600
-+++ linux-2.4.18-p4smp-braam/include/linux/dcache.h    2003-07-09 13:32:08.000000000 -0600
-@@ -6,6 +6,45 @@
  #include <asm/atomic.h>
- #include <linux/gdb.h>
  #include <linux/mount.h>
 +#include <linux/string.h>
 +
@@ -1488,18 +1443,24 @@
 +
 +#define INTENT_MAGIC 0x19620323
 +
-+struct lookup_intent {
-+      int it_op;
-+      void (*it_op_release)(struct lookup_intent *);
-+      int it_magic;
-+      int it_mode;
-+      int it_flags;
-+      int it_disposition;
-+      int it_status;
++
++struct lustre_intent_data {
++        int       it_disposition;
++        int       it_status;
++        __u64     it_lock_handle;
++        void     *it_data;
++        int       it_lock_mode;
 +      int it_int_flags;
-+      __u64 it_lock_handle[2];
-+      int it_lock_mode;
-+      void *it_data;
++};
++struct lookup_intent {
++        int     it_magic;
++        void    (*it_op_release)(struct lookup_intent *);
++        int     it_op;
++      int     it_flags;
++      int     it_create_mode;
++        union {
++                struct lustre_intent_data lustre;
++        } d;
 +};
 +
 +static inline void intent_init(struct lookup_intent *it, int op, int flags)
@@ -1513,7 +1474,7 @@
  
  /*
   * linux/include/linux/dcache.h
-@@ -92,8 +131,22 @@ struct dentry_operations {
+@@ -91,8 +136,22 @@ struct dentry_operations {
        int (*d_delete)(struct dentry *);
        void (*d_release)(struct dentry *);
        void (*d_iput)(struct dentry *, struct inode *);
@@ -1536,7 +1497,7 @@
  /* the dentry parameter passed to d_hash and d_compare is the parent
   * directory of the entries to be compared. It is used in case these
   * functions need any directory specific information for determining
-@@ -125,6 +178,7 @@ d_iput:            no              no              yes
+@@ -124,6 +183,7 @@ d_iput:            no              no              yes
                                         * s_nfsd_free_path semaphore will be down
                                         */
  #define DCACHE_REFERENCED     0x0008  /* Recently used, don't discard. */
@@ -1544,9 +1505,11 @@
  
  extern spinlock_t dcache_lock;
  
---- linux-2.4.18-p4smp/include/linux/fs.h~vfs_intent-2.4.18-18-chaos65 2003-07-08 14:41:47.000000000 -0600
-+++ linux-2.4.18-p4smp-braam/include/linux/fs.h        2003-07-08 14:45:17.000000000 -0600
-@@ -339,6 +339,9 @@ extern void set_bh_page(struct buffer_he
+Index: linux/include/linux/fs.h
+===================================================================
+--- linux.orig/include/linux/fs.h      2003-07-25 12:27:53.000000000 -0600
++++ linux/include/linux/fs.h   2003-07-25 12:36:55.000000000 -0600
+@@ -338,6 +338,9 @@ extern void set_bh_page(struct buffer_he
  #define ATTR_MTIME_SET        256
  #define ATTR_FORCE    512     /* Not a change, but a change it */
  #define ATTR_ATTR_FLAG        1024
@@ -1556,7 +1519,7 @@
  
  /*
   * This is the Inode Attributes structure, used for notify_change().  It
-@@ -578,6 +580,7 @@ struct file {
+@@ -576,6 +579,7 @@ struct file {
  
        /* needed for tty driver, and maybe others */
        void                    *private_data;
@@ -1564,15 +1527,15 @@
  
        /* preallocated helper kiobuf to speedup O_DIRECT */
        struct kiobuf           *f_iobuf;
-@@ -707,6 +710,7 @@ struct nameidata {
+@@ -705,6 +709,7 @@ struct nameidata {
        struct qstr last;
        unsigned int flags;
        int last_type;
-+      struct lookup_intent *it;
++      struct lookup_intent *intent;
  };
  
  #define DQUOT_USR_ENABLED     0x01            /* User diskquotas enabled */
-@@ -840,7 +844,8 @@ extern int vfs_symlink(struct inode *, s
+@@ -836,7 +841,8 @@ extern int vfs_symlink(struct inode *, s
  extern int vfs_link(struct dentry *, struct inode *, struct dentry *);
  extern int vfs_rmdir(struct inode *, struct dentry *);
  extern int vfs_unlink(struct inode *, struct dentry *);
@@ -1582,7 +1545,7 @@
  
  /*
   * File types
-@@ -900,21 +905,34 @@ struct file_operations {
+@@ -896,21 +902,34 @@ struct file_operations {
  
  struct inode_operations {
        int (*create) (struct inode *,struct dentry *,int);
@@ -1617,7 +1580,7 @@
        int (*getattr) (struct dentry *, struct iattr *);
  };
  
-@@ -1119,10 +1137,12 @@ static inline int get_lease(struct inode
+@@ -1115,10 +1134,12 @@ static inline int get_lease(struct inode
  
  asmlinkage long sys_open(const char *, int, int);
  asmlinkage long sys_close(unsigned int);      /* yes, it's really unsigned */
@@ -1631,7 +1594,7 @@
  extern int filp_close(struct file *, fl_owner_t id);
  extern char * getname(const char *);
  
-@@ -1388,9 +1408,12 @@ typedef int (*read_actor_t)(read_descrip
+@@ -1384,9 +1405,12 @@ typedef int (*read_actor_t)(read_descrip
  extern loff_t default_llseek(struct file *file, loff_t offset, int origin);
  
  extern int FASTCALL(__user_walk(const char *, unsigned, struct nameidata *));
@@ -1644,7 +1607,7 @@
  extern int FASTCALL(link_path_walk(const char *, struct nameidata *));
  extern void path_release(struct nameidata *);
  extern int follow_down(struct vfsmount **, struct dentry **);
-@@ -1399,6 +1422,8 @@ extern struct dentry * lookup_one_len(co
+@@ -1395,6 +1419,8 @@ extern struct dentry * lookup_one_len(co
  extern struct dentry * lookup_hash(struct qstr *, struct dentry *);
  #define user_path_walk(name,nd)        __user_walk(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, nd)
  #define user_path_walk_link(name,nd) __user_walk(name, LOOKUP_POSITIVE, nd)
@@ -1653,7 +1616,7 @@
  
  extern void inode_init_once(struct inode *);
  extern void iput(struct inode *);
-@@ -1499,6 +1524,8 @@ extern struct file_operations generic_ro
+@@ -1495,6 +1521,8 @@ extern struct file_operations generic_ro
  
  extern int vfs_readlink(struct dentry *, char *, int, const char *);
  extern int vfs_follow_link(struct nameidata *, const char *);
@@ -1662,8 +1625,10 @@
  extern int page_readlink(struct dentry *, char *, int);
  extern int page_follow_link(struct dentry *, struct nameidata *);
  extern struct inode_operations page_symlink_inode_operations;
---- linux-2.4.18-p4smp/kernel/fork.c~vfs_intent-2.4.18-18-chaos65      2003-03-24 11:22:37.000000000 -0700
-+++ linux-2.4.18-p4smp-braam/kernel/fork.c     2003-07-09 13:20:37.000000000 -0600
+Index: linux/kernel/fork.c
+===================================================================
+--- linux.orig/kernel/fork.c   2003-03-24 11:22:37.000000000 -0700
++++ linux/kernel/fork.c        2003-07-25 12:27:53.000000000 -0600
 @@ -399,10 +399,13 @@ static inline struct fs_struct *__copy_f
                fs->umask = old->umask;
                read_lock(&old->lock);
@@ -1678,8 +1643,10 @@
                        fs->altrootmnt = mntget(old->altrootmnt);
                        fs->altroot = dget(old->altroot);
                } else {
---- linux-2.4.18-p4smp/kernel/exit.c~vfs_intent-2.4.18-18-chaos65      2002-10-29 12:27:38.000000000 -0700
-+++ linux-2.4.18-p4smp-braam/kernel/exit.c     2003-07-09 13:20:37.000000000 -0600
+Index: linux/kernel/exit.c
+===================================================================
+--- linux.orig/kernel/exit.c   2002-10-29 12:27:38.000000000 -0700
++++ linux/kernel/exit.c        2003-07-25 12:27:53.000000000 -0600
 @@ -303,11 +303,14 @@ static inline void __put_fs_struct(struc
  {
        /* No need to hold fs->lock if we are killing it */
@@ -1695,8 +1662,10 @@
                        dput(fs->altroot);
                        mntput(fs->altrootmnt);
                }
---- linux-2.4.18-p4smp/kernel/ksyms.c~vfs_intent-2.4.18-18-chaos65     2003-07-09 13:20:35.000000000 -0600
-+++ linux-2.4.18-p4smp-braam/kernel/ksyms.c    2003-07-09 13:20:37.000000000 -0600
+Index: linux/kernel/ksyms.c
+===================================================================
+--- linux.orig/kernel/ksyms.c  2003-07-25 12:27:53.000000000 -0600
++++ linux/kernel/ksyms.c       2003-07-25 12:27:53.000000000 -0600
 @@ -294,6 +294,7 @@ EXPORT_SYMBOL(read_cache_page);
  EXPORT_SYMBOL(set_page_dirty);
  EXPORT_SYMBOL(vfs_readlink);
@@ -1705,5 +1674,3 @@
  EXPORT_SYMBOL(page_readlink);
  EXPORT_SYMBOL(page_follow_link);
  EXPORT_SYMBOL(page_symlink_inode_operations);
-
-_