Hi Trond, Today's linux-next merge of the nfs tree got a conflict in fs/nfs/nfs4proc.c between commit 26fe57502870 ("vfs: make it possible to access the dentry hash/len as one 64-bit entry") from Linus' tree and commit 778d28172f71 ("NFSv4: Simplify the NFSv4 REMOVE, LINK and RENAME compounds") from the nfs tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc fs/nfs/nfs4proc.c index ab985f6,78784e5..0000000 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@@ -2782,8 -2799,8 +2799,7 @@@ static int _nfs4_proc_remove(struct ino 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, - .bitmask = server->attr_bitmask, }; struct nfs_removeres res = { .server = server,
Attachment:
pgpS4Na10CpEt.pgp
Description: PGP signature