A bit annoyed that my submission didn't go in again.  It only had a 2 line
conflict with Malahal's dupreq patch and only in a format.  Was it really
that hard to merge?

Was *more* than a bit annoyed that Malahal's patch breaks logging at:
0a627b8b src/RPCAL/nfs_dupreq.c    (Matt Benjamin         2016-12-05 17:09:00 
-0500 1018)               dv, dk->hin.tcp.rq_xid, drc,
0a627b8b src/RPCAL/nfs_dupreq.c    (Matt Benjamin         2016-12-05 17:09:00 
-0500 1019)               dupreq_state_table[dv->state], 
dupreq_status_table[status],
0a627b8b src/RPCAL/nfs_dupreq.c    (Matt Benjamin         2016-12-05 17:09:00 
-0500 1020)               (dv) ? dv->refcnt : 0, drc->size);

Malahal freed dk a bit earlier:

9da22db0 src/RPCAL/nfs_dupreq.c    (Malahal Naineni       2017-01-11 12:49:28 
+0530  972)                       nfs_dupreq_free_dupreq(dk);

Yeah, I'll update my patch to try and fix that bug, too....

But we can now get rid of "(dv) ?" since Malahal added in the other branch:

9da22db0 src/RPCAL/nfs_dupreq.c    (Malahal Naineni       2017-01-11 12:49:28 
+0530 1010)                       dv = dk;

I know, I know, I'm the only one testing logging, because my boring patch is
partly about fixing formats to match changes in ntirpc.

Well, I've got no guarantee that I've hit all the logging paths.


------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
_______________________________________________
Nfs-ganesha-devel mailing list
Nfs-ganesha-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs-ganesha-devel

Reply via email to