On Thu, 31 May 2012 16:50:50 +0400 Pavel Shilovsky <[email protected]> wrote:
> Signed-off-by: Pavel Shilovsky <[email protected]> > --- > fs/cifs/connect.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c > index ccafded..3647b1a 100644 > --- a/fs/cifs/connect.c > +++ b/fs/cifs/connect.c > @@ -1058,13 +1058,15 @@ cifs_demultiplex_thread(void *p) > if (mid_entry != NULL) { > if (!mid_entry->multiRsp || mid_entry->multiEnd) > mid_entry->callback(mid_entry); > - } else if (!server->ops->is_oplock_break(buf, server)) { > + } else if (!server->ops->is_oplock_break || > + !server->ops->is_oplock_break(buf, server)) { > cERROR(1, "No task to wake, unknown frame received! " > "NumMids %d", atomic_read(&midCount)); > cifs_dump_mem("Received Data is: ", buf, > HEADER_SIZE(server)); > #ifdef CONFIG_CIFS_DEBUG2 > - server->ops->dump_detail(buf); > + if (server->ops->dump_detail) > + server->ops->dump_detail(buf); > cifs_dump_mids(server); > #endif /* CIFS_DEBUG2 */ > Looks fine for now. Eventually you might want to make dump_detail mandatory, in which case you could eliminate the second check. Reviewed-by: Jeff Layton <[email protected]> -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
