From patchwork Sat Feb 26 05:21:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve French X-Patchwork-Id: 592091 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1Q5LOJ3017462 for ; Sat, 26 Feb 2011 05:21:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751341Ab1BZFVY (ORCPT ); Sat, 26 Feb 2011 00:21:24 -0500 Received: from mail-bw0-f46.google.com ([209.85.214.46]:45106 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751033Ab1BZFVX (ORCPT ); Sat, 26 Feb 2011 00:21:23 -0500 Received: by bwz15 with SMTP id 15so2491014bwz.19 for ; Fri, 25 Feb 2011 21:21:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:date:message-id:subject:from:to :content-type; bh=9UidfV8C0v8NktOZMhQGAERUwL9wWklnuZJx2xUJmyw=; b=g9AtmIOz4pqT+8SwkWePT3QNT7ukCqtSbiiXpjHqz45dm31qxjVwluq6WLXB61nRka hE9tY4ma5XAKPMSSgWe6RoW2A0MOa0FRuqMhvTIdpRO0IhSQs2OkDWZc6Y5z9fp33Kmt SISMU+2j+PrBv8fI9dlvUwh9R0LJZSxmgu68M= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=vCyB2fz1NUpDu6bsPBQmoizgYi0iLMVuJCWWAPfVSuX0IZLU5YV4j0cjbiO0Tm7HZB YO+WalPbts/VErZ9jnrZTmCOgh/t3pNxVnCeKUZbrMPhHFOUsJKi8aL+c6J73oaQ9Ir7 Bt/e5gSS+qtFBFYm82GD4IfigJ1NG+QpkGiMY= MIME-Version: 1.0 Received: by 10.204.14.204 with SMTP id h12mr2789729bka.183.1298697681582; Fri, 25 Feb 2011 21:21:21 -0800 (PST) Received: by 10.204.102.75 with HTTP; Fri, 25 Feb 2011 21:21:21 -0800 (PST) Date: Fri, 25 Feb 2011 23:21:21 -0600 Message-ID: Subject: [PATCH] cifs: Cleanup cifs headers for smb2 debugging routines From: Steve French To: linux-cifs@vger.kernel.org Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 26 Feb 2011 05:21:25 +0000 (UTC) diff --git a/fs/cifs/TODO b/fs/cifs/TODO index 355abcd..2c68abc 100644 --- a/fs/cifs/TODO +++ b/fs/cifs/TODO @@ -1,5 +1,7 @@ Version 1.53 May 20, 2008 +PUT IN WARNING FOR NTLMV2 becoming default + A Partial List of Missing Features ================================== diff --git a/fs/cifs/cifs_debug.h b/fs/cifs/cifs_debug.h index 8942b28..fec0743 100644 --- a/fs/cifs/cifs_debug.h +++ b/fs/cifs/cifs_debug.h @@ -1,6 +1,6 @@ /* * - * Copyright (c) International Business Machines Corp., 2000,2002 + * Copyright (c) International Business Machines Corp., 2000,2011 * Modified by Steve French (sfrench@us.ibm.com) * * This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ -#define CIFS_DEBUG /* BB temporary */ +#define CIFS_DEBUG /* remove to disable cifserror logging */ #ifndef _H_CIFS_DEBUG #define _H_CIFS_DEBUG @@ -28,6 +28,9 @@ void cifs_dump_mem(char *label, void *data, int length); #define DBG2 2 void cifs_dump_detail(struct smb_hdr *); void cifs_dump_mids(struct TCP_Server_Info *); +#ifdef CONFIG_CIFS_SMB2 +void smb2_dump_detail(struct smb2_hdr *); +#endif /* CONFIG_CIFS_SMB2 */ #else #define DBG2 0 #endif @@ -37,12 +40,15 @@ void dump_smb(struct smb_hdr *, int); #define CIFS_RC 0x02 #define CIFS_TIMER 0x04 +#ifdef CONFIG_CIFS_SMB2 +void dump_smb2(struct smb2_hdr *, int); +#endif /* CONFIG_CIFS_SMB2 */ + /* * debug ON * -------- */ #ifdef CIFS_DEBUG - /* information message: e.g., configuration, major event */ extern int cifsFYI; #define cifsfyi(fmt, arg...) \ diff --git a/fs/cifs/cifsacl.h b/fs/cifs/cifsacl.h index c4ae7d0..025e943 100644 --- a/fs/cifs/cifsacl.h +++ b/fs/cifs/cifsacl.h @@ -1,7 +1,7 @@ /* * fs/cifs/cifsacl.h * - * Copyright (c) International Business Machines Corp., 2007 + * Copyright (c) International Business Machines Corp., 2007,2010 * Author(s): Steve French (sfrench@us.ibm.com) * * This library is free software; you can redistribute it and/or modify diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 293b636..232b790 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -1,7 +1,7 @@ /* * fs/cifs/cifsglob.h * - * Copyright (C) International Business Machines Corp., 2002,2008 + * Copyright (C) International Business Machines Corp., 2002,2011 * Author(s): Steve French (sfrench@us.ibm.com) * Jeremy Allison (jra@samba.org) * @@ -595,13 +595,6 @@ struct mid_q_entry { bool multiEnd:1; /* both received */ }; -struct oplock_q_entry { - struct list_head qhead; - struct inode *pinode; - struct cifsTconInfo *tcon; - __u16 netfid; -}; - /* for pending dnotify requests */ struct dir_notify_req { struct list_head lhead; @@ -651,6 +644,7 @@ struct cifs_fattr { struct timespec cf_atime; struct timespec cf_mtime; struct timespec cf_ctime; + u32 ea_size; }; static inline void free_dfs_info_param(struct dfs_info3_param *param) @@ -681,6 +675,7 @@ static inline void free_dfs_info_array(struct dfs_info3_param *param, #define MID_RESPONSE_RECEIVED 4 #define MID_RETRY_NEEDED 8 /* session closed while this request out */ #define MID_RESPONSE_MALFORMED 0x10 +#define MID_NO_RESPONSE_NEEDED 0x20 /* Types of response buffer returned from SendReceive2 */