On Fri, Mar 15, 2013 at 2:01 PM, Jeff Layton <jlayton@xxxxxxxxxx> wrote: > > On Thu, 14 Mar 2013 12:24:37 -0700 > Joe Perches <joe@xxxxxxxxxxx> wrote: > > > It's not obvious from reading the macro names that these macros > > are for debugging. Convert the names to a single more typical > > kernel style cifs_dbg macro. > > > > cERROR(1, ...) -> cifs_dbg(VFS, ...) > > cFYI(1, ...) -> cifs_dbg(FYI, ...) > > cFYI(DBG2, ...) -> cifs_dbg(NOISY, ...) > > > > Move the terminating format newline from the macro to the call site. > > > > Add CONFIG_CIFS_DEBUG function cifs_vfs_err to emit the > > "CIFS VFS: " prefix for VFS messages. > > > > Size is reduced ~ 1% when CONFIG_CIFS_DEBUG is set (default y) > > > > $ size fs/cifs/cifs.ko* > > text data bss dec hex filename > > 265245 2525 132 267902 4167e fs/cifs/cifs.ko.new > > 268359 2525 132 271016 422a8 fs/cifs/cifs.ko.old > > > > (my apologies -- my MUA has a mind of its own sometimes) > > This all looks like good stuff. I am a bit concerned about mashing all > of these cleanups into the same patch though. > > > Other miscellaneous changes around these conversions: > > > > o Miscellaneous typo fixes > > o Add terminating \n's to almost all formats and remove them > > from the macros to be more kernel style like. A few formats > > previously had defective \n's > > o Remove unnecessary OOM messages as kmalloc() calls dump_stack > > o Coalesce formats to make grep easier, > > added missing spaces when coalescing formats > > o Use %s, __func__ instead of embedded function name > > o Removed unnecessary "cifs: " prefixes > > > o Convert kzalloc with multiply to kcalloc > ^^^ > Things like this really ought to be a separate patch, even though it is > a trivial change. That's a minor nit though... > > > o Remove unused cifswarn macro > > > > I think we ought to go ahead and take this for 3.10. I do have some > minor concern about having to deal with backports of later patches to > kernels that don't have these changes, but hey, that's the price of > dealing with old kernels. > > The sooner Steve merges this into his for-next tree, the better. This > bound to give us all sorts of merge conflicts for the 3.10 window, so > we want to make sure that people know what to base their work on. I would like to merge the three we have (one still has to be put in for-next - the one from Jeff) for for-next in the next three or fouir days - but I can create another temporary branch for the ones for 3.10 - but ... I would like to simplify things by merging the other cleanup patches we already have first. I agree that we are going to have to let people know to rebase everything for cifs for 3.10 on this big cleanup patch. -- Thanks, Steve -- Thanks, Steve -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html