Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[pandora-kernel.git] / fs / jffs2 / symlink.c

diff --git a/fs/jffs2/symlink.c b/fs/jffs2/symlink.c
index 82ef484..b90d5aa 100644 (file)
--- a/fs/jffs2/symlink.c
+++ b/fs/jffs2/symlink.c
@@ -7,7 +7,7 @@
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
- * $Id: symlink.c,v 1.16 2005/03/01 10:50:48 dedekind Exp $
+ * $Id: symlink.c,v 1.19 2005/11/07 11:14:42 gleixner Exp $
  *
  */
 
@@ -21,44 +21,47 @@
 static void *jffs2_follow_link(struct dentry *dentry, struct nameidata *nd);
 
 struct inode_operations jffs2_symlink_inode_operations =
-{      
+{
        .readlink =     generic_readlink,
        .follow_link =  jffs2_follow_link,
-       .setattr =      jffs2_setattr
+       .permission =   jffs2_permission,
+       .setattr =      jffs2_setattr,
+       .setxattr =     jffs2_setxattr,
+       .getxattr =     jffs2_getxattr,
+       .listxattr =    jffs2_listxattr,
+       .removexattr =  jffs2_removexattr
 };
 
 static void *jffs2_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
        struct jffs2_inode_info *f = JFFS2_INODE_INFO(dentry->d_inode);
-       char *p = (char *)f->dents;
-       
+       char *p = (char *)f->target;
+
        /*
         * We don't acquire the f->sem mutex here since the only data we
-        * use is f->dents which in case of the symlink inode points to the
-        * symlink's target path.
+        * use is f->target.
         *
-        * 1. If we are here the inode has already built and f->dents has
+        * 1. If we are here the inode has already built and f->target has
         * to point to the target path.
-        * 2. Nobody uses f->dents (if the inode is symlink's inode). The
-        * exception is inode freeing function which frees f->dents. But
+        * 2. Nobody uses f->target (if the inode is symlink's inode). The
+        * exception is inode freeing function which frees f->target. But
         * it can't be called while we are here and before VFS has
-        * stopped using our f->dents string which we provide by means of
+        * stopped using our f->target string which we provide by means of
         * nd_set_link() call.
         */
-       
+
        if (!p) {
-               printk(KERN_ERR "jffs2_follow_link(): can't find symlink taerget\n");
+               printk(KERN_ERR "jffs2_follow_link(): can't find symlink target\n");
                p = ERR_PTR(-EIO);
-       } else {
-               D1(printk(KERN_DEBUG "jffs2_follow_link(): target path is '%s'\n", (char *) f->dents));
        }
+       D1(printk(KERN_DEBUG "jffs2_follow_link(): target path is '%s'\n", (char *) f->target));
 
        nd_set_link(nd, p);
-       
+
        /*
-        * We unlock the f->sem mutex but VFS will use the f->dents string. This is safe
-        * since the only way that may cause f->dents to be changed is iput() operation.
-        * But VFS will not use f->dents after iput() has been called.
+        * We will unlock the f->sem mutex but VFS will use the f->target string. This is safe
+        * since the only way that may cause f->target to be changed is iput() operation.
+        * But VFS will not use f->target after iput() has been called.
         */
        return NULL;
 }