Merge tag 'nfs-for-3.5-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[linux-2.6-block.git] / fs / nfs / nfs4proc.c

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 42d9e9ca7d2fbe22af780544eb86b4d40ce3f31a..d48dbefa0e71ebf6d9ac90edbb893364afd2d0a3 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2830,8 +2830,7 @@ static int _nfs4_proc_remove(struct inode *dir, struct qstr *name)
        struct nfs_server *server = NFS_SERVER(dir);
        struct nfs_removeargs args = {
                .fh = NFS_FH(dir),
-               .name.len = name->len,
-               .name.name = name->name,
+               .name = *name,
        };
        struct nfs_removeres res = {
                .server = server,