This commit was manufactured by cvs2svn to create branch 'fedora'.

[linux-2.6.git] / fs / xfs / linux-2.6 / xfs_iops.c

diff --git a/fs/xfs/linux/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
similarity index 96%
rename from fs/xfs/linux/xfs_iops.c
rename to fs/xfs/linux-2.6/xfs_iops.c
index 4b3e61d..e7d4eba 100644 (file)
--- a/fs/xfs/linux/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -419,13 +419,16 @@ linvfs_follow_link(
        ASSERT(nd);
 
        link = (char *)kmalloc(MAXNAMELEN+1, GFP_KERNEL);
-       if (!link)
-               return -ENOMEM;
+       if (!link) {
+               nd_set_link(nd, ERR_PTR(-ENOMEM));
+               return 0;
+       }
 
        uio = (uio_t *)kmalloc(sizeof(uio_t), GFP_KERNEL);
        if (!uio) {
                kfree(link);
-               return -ENOMEM;
+               nd_set_link(nd, ERR_PTR(-ENOMEM));
+               return 0;
        }
 
        vp = LINVFS_GET_VP(dentry->d_inode);
@@ -441,18 +444,22 @@ linvfs_follow_link(
 
        VOP_READLINK(vp, uio, 0, NULL, error);
        if (error) {
-               kfree(uio);
                kfree(link);
-               return -error;
+               link = ERR_PTR(-error);
+       } else {
+               link[MAXNAMELEN - uio->uio_resid] = '\0';
        }
-
-       link[MAXNAMELEN - uio->uio_resid] = '\0';
        kfree(uio);
 
-       /* vfs_follow_link returns (-) errors */
-       error = vfs_follow_link(nd, link);
-       kfree(link);
-       return error;
+       nd_set_link(nd, link);
+       return 0;
+}
+
+static void linvfs_put_link(struct dentry *dentry, struct nameidata *nd)
+{
+       char *s = nd_get_link(nd);
+       if (!IS_ERR(s))
+               kfree(s);
 }
 
 #ifdef CONFIG_XFS_POSIX_ACL
@@ -535,7 +542,7 @@ linvfs_setattr(
        }
 
        if (ia_valid & (ATTR_MTIME_SET | ATTR_ATIME_SET))
-               flags = ATTR_UTIME;
+               flags |= ATTR_UTIME;
 #ifdef ATTR_NO_BLOCK
        if ((ia_valid & ATTR_NO_BLOCK))
                flags |= ATTR_NONBLOCK;
@@ -543,14 +550,8 @@ linvfs_setattr(
 
        VOP_SETATTR(vp, &vattr, flags, NULL, error);
        if (error)
-               return(-error); /* Positive error up from XFS */
-       if (ia_valid & ATTR_SIZE) {
-               error = vmtruncate(inode, attr->ia_size);
-       }
-
-       if (!error) {
-               vn_revalidate(vp);
-       }
+               return -error;
+       vn_revalidate(vp);
        return error;
 }
 
@@ -698,6 +699,7 @@ struct inode_operations linvfs_dir_inode_operations = {
 struct inode_operations linvfs_symlink_inode_operations = {
        .readlink               = linvfs_readlink,
        .follow_link            = linvfs_follow_link,
+       .put_link               = linvfs_put_link,
        .permission             = linvfs_permission,
        .getattr                = linvfs_getattr,
        .setattr                = linvfs_setattr,