fix setattr error handling in sysfs, configfs

[net-next-2.6.git] / fs / sysfs / inode.c

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index bbd77e95cf7f7d6babe801fcac345d7cfcd7599f..0835a3b70e03b01738a8ef18493e1c6180432acd 100644 (file)
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -117,13 +117,13 @@ int sysfs_setattr(struct dentry *dentry, struct iattr *iattr)
        if (error)
                goto out;
 
-       iattr->ia_valid &= ~ATTR_SIZE; /* ignore size changes */
-
-       error = inode_setattr(inode, iattr);
+       error = sysfs_sd_setattr(sd, iattr);
        if (error)
                goto out;
 
-       error = sysfs_sd_setattr(sd, iattr);
+       /* this ignores size changes */
+       generic_setattr(inode, iattr);
+
 out:
        mutex_unlock(&sysfs_mutex);
        return error;