I've looked at the repo (http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=blob;f=fs/nfs/idmap.c;h=b701358c39c351d0613d1db29ebcf382ca8cb0a6;hb=ddf343f635fe4440cad528e12f96f28bd50aa099), seems just like what I have Can it be already changed on the tree? -----Original Message----- From: Myklebust, Trond [mailto:Trond.Myklebust@xxxxxxxxxx] Sent: Thursday, August 16, 2012 5:22 PM To: Shai Lazmi Cc: William Dauchy; Schumaker, Bryan; linux-nfs@xxxxxxxxxxxxxxx Subject: Re: [PATCH 1/2] NFS: Clear key construction data if the idmap upcall fails On Thu, 2012-08-16 at 17:15 -0700, Shai Lazmi wrote: > git apply --check 0001-NFS-Clear-key-construction-data-if-the-idmap-upcall-.patch > error: patch failed: fs/nfs/idmap.c:61 > error: fs/nfs/idmap.c: patch does not apply > > > idmap.c > define NFS_UINT_MAXLEN 11 > > static const struct cred *id_resolver_cache; > static struct key_type key_type_id_resolver_legacy; > > struct idmap { > struct rpc_pipe *idmap_pipe; > struct key_construction *idmap_key_cons; > struct mutex idmap_mutex; > }; That's how it should more or less look after applying the patch. I'm guessing that one of your previous attempts has partially worked, and has left your checked out git tree in a "dirty" state. Please try the following: $ git reset --hard HEAD $ git apply --check 0001-NFS-Clear-key-construction-data-if-the-idmap-upcall-.patch $ git apply --check 0002-NFS-return-ENOKEY-when-the-upcall-fails-to-map-the-n.patch > > -----Original Message----- > From: Myklebust, Trond [mailto:Trond.Myklebust@xxxxxxxxxx] > Sent: Thursday, August 16, 2012 5:14 PM > To: Shai Lazmi > Cc: William Dauchy; Schumaker, Bryan; linux-nfs@xxxxxxxxxxxxxxx > Subject: Re: [PATCH 1/2] NFS: Clear key construction data if the idmap upcall fails > > On Thu, 2012-08-16 at 17:07 -0700, Shai Lazmi wrote: > > Sorry - company's policy ... > > What idmap version was this patch used against? The one I have (b701358c) seems to be a bit different (I used latest pull commit ddf343f635fe4440cad528e12f96f28bd50aa099), hence the patch fails again > > It works fine for me against commit ddf343f635fe4440cad528e12f96f28bd50aa099: > > [trondmy@lade linux-nfs]$ git branch test-apply ddf343f635fe4440cad528e12f96f28bd50aa099 > [trondmy@lade linux-nfs]$ git checkout test-apply > Switched to branch 'test-apply' > [trondmy@lade linux-nfs]$ git am ~/Desktop/for_shai/0001-NFS-Clear-key-construction-data-if-the-idmap-upcall-.patch > Applying: NFS: Clear key construction data if the idmap upcall fails > [trondmy@lade linux-nfs]$ git am ~/Desktop/for_shai/0002-NFS-return-ENOKEY-when-the-upcall-fails-to-map-the-n.patch > Applying: NFS: return -ENOKEY when the upcall fails to map the name > > What error messages are you seeing? > > Cheers > Trond > > > -----Original Message----- > > From: Myklebust, Trond [mailto:Trond.Myklebust@xxxxxxxxxx] > > Sent: Thursday, August 16, 2012 4:57 PM > > To: Shai Lazmi > > Cc: William Dauchy; Schumaker, Bryan; linux-nfs@xxxxxxxxxxxxxxx > > Subject: Re: [PATCH 1/2] NFS: Clear key construction data if the idmap upcall fails > > > > On Thu, 2012-08-16 at 16:50 -0700, Shai Lazmi wrote: > > > MS outlook > > > > Don't ever use LookOut for patches. Its "I just reformatted your email" > > wonder feature breaks all the whitespace. > > > > > Best thing is to attached the patch > > > > We do not normally use attachments on the mailing list because it makes it impossible to comment the patches inline. Ah well, here goes... > > > > -- > > Trond Myklebust > > Linux NFS client maintainer > > > > NetApp > > Trond.Myklebust@xxxxxxxxxx > > www.netapp.com > > > > > > This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message. > > -- > Trond Myklebust > Linux NFS client maintainer > > NetApp > Trond.Myklebust@xxxxxxxxxx > www.netapp.com > > > This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message. -- Trond Myklebust Linux NFS client maintainer NetApp Trond.Myklebust@xxxxxxxxxx www.netapp.com This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message. ��.n��������+%������w��{.n�����{��w��� jg��� �����ݢj����G���� ���j:+v���w�m������w�������h�����٥
