Merge commit 'origin/master' into next

[deliverable/linux.git] / arch / powerpc / platforms / cell / spufs / inode.c

diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index 6296bfd9cb0b5646ce7b1cd8d195041f8ed239bf..64f068540d0dab1f33c21e2518f8aef23040239c 100644 (file)
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -97,7 +97,6 @@ spufs_new_inode(struct super_block *sb, int mode)
        inode->i_mode = mode;
        inode->i_uid = current_fsuid();
        inode->i_gid = current_fsgid();
-       inode->i_blocks = 0;
        inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
 out:
        return inode;
@@ -187,8 +186,9 @@ static int spufs_rmdir(struct inode *parent, struct dentry *dir)
        return simple_rmdir(parent, dir);
 }
 
-static int spufs_fill_dir(struct dentry *dir, struct spufs_tree_descr *files,
-                         int mode, struct spu_context *ctx)
+static int spufs_fill_dir(struct dentry *dir,
+               const struct spufs_tree_descr *files, int mode,
+               struct spu_context *ctx)
 {
        struct dentry *dentry, *tmp;
        int ret;