From patchwork Fri Jul 22 22:42:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Enzo Matsumiya X-Patchwork-Id: 12926952 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB80EC43334 for ; Fri, 22 Jul 2022 22:43:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229522AbiGVWnE (ORCPT ); Fri, 22 Jul 2022 18:43:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236430AbiGVWnD (ORCPT ); Fri, 22 Jul 2022 18:43:03 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7096FBB5 for ; Fri, 22 Jul 2022 15:43:01 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id E07D4200F2; Fri, 22 Jul 2022 22:42:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1658529779; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=mecqvNQbDRBiuSmQrfzZJAo2AsF/9ze4S/GkkE9yew0=; b=Ku13BS/jvcDnX6rYH+arL2sAtEeG/f0pe4NUnmSqyGrrnlZNmwLUNuZzjDtF3qxP1R3oC+ Mh5VzEx8Ss1AjPITiGNv7IZg0ZxV0cJ5p6D10B4eufij15CD3g7md9wL/eRnOYwLDEDJRS 6FTuEDUhCQ5YCFlonsaRTOiUQA1mzr4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1658529779; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=mecqvNQbDRBiuSmQrfzZJAo2AsF/9ze4S/GkkE9yew0=; b=TIhAHS5gC6kIco7R9rCKI9SvfKVZJFp3IUdULGMZbA2if9P8ZX0OB3fdx0lEmDfEvTulXQ yVfmuSE/CIut5eAA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 5EAD2134A9; Fri, 22 Jul 2022 22:42:59 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id yaRQCPMn22J/IgAAMHmgww (envelope-from ); Fri, 22 Jul 2022 22:42:59 +0000 From: Enzo Matsumiya To: linux-cifs@vger.kernel.org Cc: smfrench@gmail.com, pc@cjr.nz, ronniesahlberg@gmail.com, nspmangalore@gmail.com Subject: [PATCH 1/4] cifs: remove unused code Date: Fri, 22 Jul 2022 19:42:51 -0300 Message-Id: <20220722224254.8738-1-ematsumiya@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org Remove some macros definitions and several structs, most from cifspdu.h Move smb3_sd and smb3_acl structs to smb2pdu.h, where it makes more sense to have them. Also rename smb3_sd to smb3_sec_desc, to give a bit more of context to it. Other than that, no functional changes. Signed-off-by: Enzo Matsumiya --- fs/cifs/cifsacl.h | 25 -------- fs/cifs/cifsfs.c | 1 - fs/cifs/cifsfs.h | 1 - fs/cifs/cifsglob.h | 15 ----- fs/cifs/cifspdu.h | 147 ------------------------------------------- fs/cifs/dfs_cache.c | 1 - fs/cifs/smb2pdu.h | 28 ++++++++- fs/cifs/smbencrypt.c | 12 ---- 8 files changed, 27 insertions(+), 203 deletions(-) diff --git a/fs/cifs/cifsacl.h b/fs/cifs/cifsacl.h index ccbfc754bd3c..f7037fd03886 100644 --- a/fs/cifs/cifsacl.h +++ b/fs/cifs/cifsacl.h @@ -119,23 +119,6 @@ struct cifs_ace { struct cifs_sid sid; /* ie UUID of user or group who gets these perms */ } __attribute__((packed)); -/* - * The current SMB3 form of security descriptor is similar to what was used for - * cifs (see above) but some fields are split, and fields in the struct below - * matches names of fields to the spec, MS-DTYP (see sections 2.4.5 and - * 2.4.6). Note that "CamelCase" fields are used in this struct in order to - * match the MS-DTYP and MS-SMB2 specs which define the wire format. - */ -struct smb3_sd { - __u8 Revision; /* revision level, MUST be one */ - __u8 Sbz1; /* only meaningful if 'RM' flag set below */ - __le16 Control; - __le32 OffsetOwner; - __le32 OffsetGroup; - __le32 OffsetSacl; - __le32 OffsetDacl; -} __packed; - /* Meaning of 'Control' field flags */ #define ACL_CONTROL_SR 0x8000 /* Self relative */ #define ACL_CONTROL_RM 0x4000 /* Resource manager control bits */ @@ -158,14 +141,6 @@ struct smb3_sd { #define ACL_REVISION 0x02 /* See section 2.4.4.1 of MS-DTYP */ #define ACL_REVISION_DS 0x04 /* Additional AceTypes allowed */ -struct smb3_acl { - u8 AclRevision; /* revision level */ - u8 Sbz1; /* MBZ */ - __le16 AclSize; - __le16 AceCount; - __le16 Sbz2; /* MBZ */ -} __packed; - /* * Used to store the special 'NFS SIDs' used to persist the POSIX uid and gid * See http://technet.microsoft.com/en-us/library/hh509017(v=ws.10).aspx diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 4c3a9c97d766..da2a53daeae3 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -66,7 +66,6 @@ bool enable_gcm_256 = true; bool require_gcm_256; /* false by default */ bool enable_negotiate_signing; /* false by default */ unsigned int global_secflags = CIFSSEC_DEF; -unsigned int sign_CIFS_PDUs = 1; atomic_t mid_count; atomic_t buf_alloc_count; atomic_t small_buf_alloc_count; diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h index b17be47a8e59..d7f4917c191d 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h @@ -108,7 +108,6 @@ extern int cifs_flush(struct file *, fl_owner_t id); extern int cifs_file_mmap(struct file * , struct vm_area_struct *); extern int cifs_file_strict_mmap(struct file * , struct vm_area_struct *); extern const struct file_operations cifs_dir_ops; -extern int cifs_dir_open(struct inode *inode, struct file *file); extern int cifs_readdir(struct file *file, struct dir_context *ctx); /* Functions related to dir entries */ diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 2a458db1b5ae..721799b9a7a9 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -1747,20 +1747,6 @@ static inline void cifs_save_when_sent(struct mid_q_entry *mid) } #endif -/* for pending dnotify requests */ -struct dir_notify_req { - struct list_head lhead; - __le16 Pid; - __le16 PidHigh; - __u16 Mid; - __u16 Tid; - __u16 Uid; - __u16 netfid; - __u32 filter; /* CompletionFilter (for multishot) */ - int multishot; - struct file *pfile; -}; - struct dfs_info3_param { int flags; /* DFSREF_REFERRAL_SERVER, DFSREF_STORAGE_SERVER*/ int path_consumed; @@ -1987,7 +1973,6 @@ extern bool enable_oplocks; /* enable or disable oplocks */ extern bool lookupCacheEnabled; extern unsigned int global_secflags; /* if on, session setup sent with more secure ntlmssp2 challenge/resp */ -extern unsigned int sign_CIFS_PDUs; /* enable smb packet signing */ extern bool enable_gcm_256; /* allow optional negotiate of strongest signing (aes-gcm-256) */ extern bool require_gcm_256; /* require use of strongest signing (aes-gcm-256) */ extern bool enable_negotiate_signing; /* request use of faster (GMAC) signing if available */ diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h index 36df9a55376f..d869e1ed3648 100644 --- a/fs/cifs/cifspdu.h +++ b/fs/cifs/cifspdu.h @@ -836,12 +836,6 @@ typedef struct smb_com_findclose_req { #define NO_EAS 0x0001 #define NO_SUBSTREAMS 0x0002 #define NO_REPARSETAG 0x0004 -/* following flags can apply if pipe */ -#define ICOUNT_MASK 0x00FF -#define PIPE_READ_MODE 0x0100 -#define NAMED_PIPE_TYPE 0x0400 -#define PIPE_END_POINT 0x4000 -#define BLOCKING_NAMED_PIPE 0x8000 typedef struct smb_com_open_req { /* also handles create */ struct smb_hdr hdr; /* wct = 24 */ @@ -1281,14 +1275,6 @@ typedef struct smb_com_ntransact_rsp { /* parms and data follow */ } __attribute__((packed)) NTRANSACT_RSP; -/* See MS-SMB 2.2.7.2.1.1 */ -struct srv_copychunk { - __le64 SourceOffset; - __le64 DestinationOffset; - __le32 CopyLength; - __u32 Reserved; -} __packed; - typedef struct smb_com_transaction_ioctl_req { struct smb_hdr hdr; /* wct = 23 */ __u8 MaxSetupCount; @@ -1511,16 +1497,6 @@ struct reparse_posix_data { char PathBuffer[]; } __attribute__((packed)); -struct cifs_quota_data { - __u32 rsrvd1; /* 0 */ - __u32 sid_size; - __u64 rsrvd2; /* 0 */ - __u64 space_used; - __u64 soft_limit; - __u64 hard_limit; - char sid[1]; /* variable size? */ -} __attribute__((packed)); - /* quota sub commands */ #define QUOTA_LIST_CONTINUE 0 #define QUOTA_LIST_START 0x100 @@ -1547,11 +1523,6 @@ struct trans2_req { __le16 ByteCount; } __attribute__((packed)); -struct smb_t2_req { - struct smb_hdr hdr; - struct trans2_req t2_req; -} __attribute__((packed)); - struct trans2_resp { /* struct smb_hdr hdr precedes. Note wct = 10 + setup count */ __le16 TotalParameterCount; @@ -2072,43 +2043,6 @@ typedef struct smb_com_transaction_get_dfs_refer_rsp { ************************************************************************ */ -/* - * Information on a server - */ - -struct serverInfo { - char name[16]; - unsigned char versionMajor; - unsigned char versionMinor; - unsigned long type; - unsigned int commentOffset; -} __attribute__((packed)); - -/* - * The following structure is the format of the data returned on a NetShareEnum - * with level "90" (x5A) - */ - -struct shareInfo { - char shareName[13]; - char pad; - unsigned short type; - unsigned int commentOffset; -} __attribute__((packed)); - -struct aliasInfo { - char aliasName[9]; - char pad; - unsigned int commentOffset; - unsigned char type[2]; -} __attribute__((packed)); - -struct aliasInfo92 { - int aliasNameOffset; - int serverNameOffset; - int shareNameOffset; -} __attribute__((packed)); - typedef struct { __le64 TotalAllocationUnits; __le64 FreeAllocationUnits; @@ -2363,36 +2297,10 @@ typedef struct { __u32 Pad; } __attribute__((packed)) FILE_BASIC_INFO; /* size info, level 0x101 */ -struct file_allocation_info { - __le64 AllocationSize; /* Note old Samba srvr rounds this up too much */ -} __attribute__((packed)); /* size used on disk, for level 0x103 for set, - 0x105 for query */ - struct file_end_of_file_info { __le64 FileSize; /* offset to end of file */ } __attribute__((packed)); /* size info, level 0x104 for set, 0x106 for query */ -struct file_alt_name_info { - __u8 alt_name[1]; -} __attribute__((packed)); /* level 0x0108 */ - -struct file_stream_info { - __le32 number_of_streams; /* BB check sizes and verify location */ - /* followed by info on streams themselves - u64 size; - u64 allocation_size - stream info */ -}; /* level 0x109 */ - -struct file_compression_info { - __le64 compressed_size; - __le16 format; - __u8 unit_shift; - __u8 ch_shift; - __u8 cl_shift; - __u8 pad[3]; -} __attribute__((packed)); /* level 0x10b */ - /* POSIX ACL set/query path info structures */ #define CIFS_ACL_VERSION 1 struct cifs_posix_ace { /* access control entry (ACE) */ @@ -2465,16 +2373,6 @@ struct file_internal_info { __le64 UniqueId; /* inode number */ } __attribute__((packed)); /* level 0x3ee */ -struct file_mode_info { - __le32 Mode; -} __attribute__((packed)); /* level 0x3f8 */ - -struct file_attrib_tag { - __le32 Attribute; - __le32 ReparseTag; -} __attribute__((packed)); /* level 0x40b */ - - /********************************************************/ /* FindFirst/FindNext transact2 data buffer formats */ /********************************************************/ @@ -2572,16 +2470,6 @@ struct win_dev { __le64 minor; } __attribute__((packed)); -struct gea { - unsigned char name_len; - char name[1]; -} __attribute__((packed)); - -struct gealist { - unsigned long list_len; - struct gea list[1]; -} __attribute__((packed)); - struct fea { unsigned char EA_flags; __u8 name_len; @@ -2597,14 +2485,6 @@ struct fealist { struct fea list[1]; } __attribute__((packed)); -/* used to hold an arbitrary blob of data */ -struct data_blob { - __u8 *data; - size_t length; - void (*free) (struct data_blob *data_blob); -} __attribute__((packed)); - - #ifdef CONFIG_CIFS_POSIX /* For better POSIX semantics from Linux client, (even better @@ -2680,33 +2560,6 @@ struct data_blob { T2_QFS_INFO QueryDevice/AttributeInfo - OPTIONAL */ -/* xsymlink is a symlink format (used by MacOS) that can be used - to save symlink info in a regular file when - mounted to operating systems that do not - support the cifs Unix extensions or EAs (for xattr - based symlinks). For such a file to be recognized - as containing symlink data: - - 1) file size must be 1067, - 2) signature must begin file data, - 3) length field must be set to ASCII representation - of a number which is less than or equal to 1024, - 4) md5 must match that of the path data */ - -struct xsymlink { - /* 1067 bytes */ - char signature[4]; /* XSym */ /* not null terminated */ - char cr0; /* \n */ -/* ASCII representation of length (4 bytes decimal) terminated by \n not null */ - char length[4]; - char cr1; /* \n */ -/* md5 of valid subset of path ie path[0] through path[length-1] */ - __u8 md5[32]; - char cr2; /* \n */ -/* if room left, then end with \n then 0x20s by convention but not required */ - char path[1024]; -} __attribute__((packed)); - typedef struct file_xattr_info { /* BB do we need another field for flags? BB */ __u32 xattr_name_len; diff --git a/fs/cifs/dfs_cache.c b/fs/cifs/dfs_cache.c index 34a8f3baed5e..1587ac435724 100644 --- a/fs/cifs/dfs_cache.c +++ b/fs/cifs/dfs_cache.c @@ -382,7 +382,6 @@ static inline void dump_refs(const struct dfs_info3_param *refs, int numrefs) } } #else -#define dump_tgts(e) #define dump_ce(e) #define dump_refs(r, n) #endif diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h index f57881b8464f..286044850e85 100644 --- a/fs/cifs/smb2pdu.h +++ b/fs/cifs/smb2pdu.h @@ -203,12 +203,38 @@ struct crt_query_id_ctxt { __u8 Name[8]; } __packed; +/* + * The current SMB3 form of security descriptor is similar to what was used for + * cifs (see cifsacl.h) but some fields are split, and fields in the struct + * below matches names of fields to the spec, MS-DTYP (see sections 2.4.5 and + * 2.4.6). + * + * Note that "CamelCase" fields are used in this struct in order to match the + * MS-DTYP and MS-SMB2 specs which define the wire format. + */ +struct smb3_sec_desc { + __u8 Revision; /* revision level, MUST be one */ + __u8 Sbz1; /* only meaningful if 'ACL_CONTROL_RM' flag set (cifsacl.h) */ + __le16 Control; + __le32 OffsetOwner; + __le32 OffsetGroup; + __le32 OffsetSacl; + __le32 OffsetDacl; +} __packed; + struct crt_sd_ctxt { struct create_context ccontext; __u8 Name[8]; - struct smb3_sd sd; + struct smb3_sec_desc sd; } __packed; +struct smb3_acl { + u8 AclRevision; /* revision level */ + u8 Sbz1; /* MBZ */ + __le16 AclSize; + __le16 AceCount; + __le16 Sbz2; /* MBZ */ +} __packed; #define COPY_CHUNK_RES_KEY_SIZE 24 struct resume_key_req { diff --git a/fs/cifs/smbencrypt.c b/fs/cifs/smbencrypt.c index 4a0487753869..0214092d2714 100644 --- a/fs/cifs/smbencrypt.c +++ b/fs/cifs/smbencrypt.c @@ -26,18 +26,6 @@ #include "cifsproto.h" #include "../smbfs_common/md4.h" -#ifndef false -#define false 0 -#endif -#ifndef true -#define true 1 -#endif - -/* following came from the other byteorder.h to avoid include conflicts */ -#define CVAL(buf,pos) (((unsigned char *)(buf))[pos]) -#define SSVALX(buf,pos,val) (CVAL(buf,pos)=(val)&0xFF,CVAL(buf,pos+1)=(val)>>8) -#define SSVAL(buf,pos,val) SSVALX((buf),(pos),((__u16)(val))) - /* produce a md4 message digest from data of length n bytes */ static int mdfour(unsigned char *md4_hash, unsigned char *link_str, int link_len) From patchwork Fri Jul 22 22:42:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Enzo Matsumiya X-Patchwork-Id: 12926953 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50521C433EF for ; Fri, 22 Jul 2022 22:43:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236149AbiGVWnH (ORCPT ); Fri, 22 Jul 2022 18:43:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236910AbiGVWnF (ORCPT ); Fri, 22 Jul 2022 18:43:05 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD18EBC8D for ; Fri, 22 Jul 2022 15:43:04 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 5479338278; Fri, 22 Jul 2022 22:43:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1658529783; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v5+1D+rOEQ8qSiyVt2pQPIfWltvv1vG4L24y8yru/Lc=; b=IguS5IhNRK3PwJPkLSFAE3ghZbDUP5thwQ8sCf63esQDhUMKP1Pfk8aLaBcVDYX3pfkStU GFEA1GUD439V3P6tPHcIMGKX/1nneEmQ3fsBdL23Y/Zc7bJ0nirFdY7NQWRLp5u+lT1pMa /hvv5XbqqIZnZ4mKv3MwE+KgJh52jEg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1658529783; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v5+1D+rOEQ8qSiyVt2pQPIfWltvv1vG4L24y8yru/Lc=; b=oY4YQ2MZ64NAKnzc2wv47mRusESy1fm3JMJojpHsb77BNDF38efThG/TiSzyB4SuoFX2r/ ywZFWGokrjn0AmAg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C5F1C134A9; Fri, 22 Jul 2022 22:43:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id AieOIfYn22KFIgAAMHmgww (envelope-from ); Fri, 22 Jul 2022 22:43:02 +0000 From: Enzo Matsumiya To: linux-cifs@vger.kernel.org Cc: smfrench@gmail.com, pc@cjr.nz, ronniesahlberg@gmail.com, nspmangalore@gmail.com Subject: [PATCH 2/4] cifs: standardize SPDX header comment Date: Fri, 22 Jul 2022 19:42:52 -0300 Message-Id: <20220722224254.8738-2-ematsumiya@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220722224254.8738-1-ematsumiya@suse.de> References: <20220722224254.8738-1-ematsumiya@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org Use "//" comments for SPDX header since it seems to be most common (at least among kernel files) than the "/* ... */" variant. Signed-off-by: Enzo Matsumiya --- fs/cifs/cifs_fs_sb.h | 2 +- fs/cifs/cifs_ioctl.h | 2 +- fs/cifs/cifs_spnego.h | 2 +- fs/cifs/cifs_swn.h | 2 +- fs/cifs/cifs_unicode.h | 2 +- fs/cifs/cifs_uniupr.h | 2 +- fs/cifs/cifsacl.h | 2 +- fs/cifs/cifsfs.h | 2 +- fs/cifs/cifsglob.h | 3 +-- fs/cifs/cifspdu.h | 2 +- fs/cifs/dfs_cache.h | 2 +- fs/cifs/dns_resolve.h | 2 +- fs/cifs/fs_context.h | 2 +- fs/cifs/fscache.h | 2 +- fs/cifs/netlink.h | 2 +- fs/cifs/nterr.h | 2 +- fs/cifs/ntlmssp.h | 2 +- fs/cifs/rfc1002pdu.h | 2 +- fs/cifs/smb2glob.h | 2 +- fs/cifs/smb2pdu.h | 2 +- fs/cifs/smb2proto.h | 2 +- fs/cifs/smb2status.h | 2 +- fs/cifs/smbdirect.h | 2 +- fs/cifs/smberr.h | 2 +- fs/cifs/trace.h | 2 +- 25 files changed, 25 insertions(+), 26 deletions(-) diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h index 013a4bd65280..7317534ac410 100644 --- a/fs/cifs/cifs_fs_sb.h +++ b/fs/cifs/cifs_fs_sb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +// SPDX-License-Identifier: LGPL-2.1 /* * * Copyright (c) International Business Machines Corp., 2002,2004 diff --git a/fs/cifs/cifs_ioctl.h b/fs/cifs/cifs_ioctl.h index 03e6531998b0..bf2850b54f3b 100644 --- a/fs/cifs/cifs_ioctl.h +++ b/fs/cifs/cifs_ioctl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +// SPDX-License-Identifier: LGPL-2.1 /* * * Structure definitions for io control for cifs/smb3 diff --git a/fs/cifs/cifs_spnego.h b/fs/cifs/cifs_spnego.h index 7f102ffeb675..3819940e2ab5 100644 --- a/fs/cifs/cifs_spnego.h +++ b/fs/cifs/cifs_spnego.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +// SPDX-License-Identifier: LGPL-2.1 /* * SPNEGO upcall management for CIFS * diff --git a/fs/cifs/cifs_swn.h b/fs/cifs/cifs_swn.h index 8a9d2a5c9077..934cbd7bb3ce 100644 --- a/fs/cifs/cifs_swn.h +++ b/fs/cifs/cifs_swn.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +// SPDX-License-Identifier: GPL-2.0 /* * Witness Service client for CIFS * diff --git a/fs/cifs/cifs_unicode.h b/fs/cifs/cifs_unicode.h index 80b3d845419f..9bad387d2bff 100644 --- a/fs/cifs/cifs_unicode.h +++ b/fs/cifs/cifs_unicode.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ +// SPDX-License-Identifier: GPL-2.0-or-later /* * cifs_unicode: Unicode kernel case support * diff --git a/fs/cifs/cifs_uniupr.h b/fs/cifs/cifs_uniupr.h index 7b272fcdf0d3..529bd690fd91 100644 --- a/fs/cifs/cifs_uniupr.h +++ b/fs/cifs/cifs_uniupr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) International Business Machines Corp., 2000,2002 * diff --git a/fs/cifs/cifsacl.h b/fs/cifs/cifsacl.h index f7037fd03886..6c051b3ae922 100644 --- a/fs/cifs/cifsacl.h +++ b/fs/cifs/cifsacl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +// SPDX-License-Identifier: LGPL-2.1 /* * * Copyright (c) International Business Machines Corp., 2007 diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h index d7f4917c191d..deef6c8d0dc3 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +// SPDX-License-Identifier: LGPL-2.1 /* * * Copyright (c) International Business Machines Corp., 2002, 2007 diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 721799b9a7a9..65c7e5b55278 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -1,6 +1,5 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +// SPDX-License-Identifier: LGPL-2.1 /* - * * Copyright (C) International Business Machines Corp., 2002,2008 * Author(s): Steve French (sfrench@us.ibm.com) * Jeremy Allison (jra@samba.org) diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h index d869e1ed3648..d3c5e3d23385 100644 --- a/fs/cifs/cifspdu.h +++ b/fs/cifs/cifspdu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +// SPDX-License-Identifier: LGPL-2.1 /* * * Copyright (c) International Business Machines Corp., 2002,2009 diff --git a/fs/cifs/dfs_cache.h b/fs/cifs/dfs_cache.h index 52070d1df189..490aa28eec38 100644 --- a/fs/cifs/dfs_cache.h +++ b/fs/cifs/dfs_cache.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +// SPDX-License-Identifier: GPL-2.0 /* * DFS referral cache routines * diff --git a/fs/cifs/dns_resolve.h b/fs/cifs/dns_resolve.h index afc0df381246..5a617278a669 100644 --- a/fs/cifs/dns_resolve.h +++ b/fs/cifs/dns_resolve.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +// SPDX-License-Identifier: LGPL-2.1 /* * DNS Resolver upcall management for CIFS DFS * Handles host name to IP address resolution diff --git a/fs/cifs/fs_context.h b/fs/cifs/fs_context.h index 5f093cb7e9b9..ec4a8af72570 100644 --- a/fs/cifs/fs_context.h +++ b/fs/cifs/fs_context.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020, Microsoft Corporation. * diff --git a/fs/cifs/fscache.h b/fs/cifs/fscache.h index aa3b941a5555..435e826fdd9a 100644 --- a/fs/cifs/fscache.h +++ b/fs/cifs/fscache.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +// SPDX-License-Identifier: LGPL-2.1 /* * CIFS filesystem cache interface definitions * diff --git a/fs/cifs/netlink.h b/fs/cifs/netlink.h index e2fa8ed24c54..8c4e680eb41f 100644 --- a/fs/cifs/netlink.h +++ b/fs/cifs/netlink.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +// SPDX-License-Identifier: GPL-2.0 /* * Netlink routines for CIFS * diff --git a/fs/cifs/nterr.h b/fs/cifs/nterr.h index edd4741cab0a..0a35538dd338 100644 --- a/fs/cifs/nterr.h +++ b/fs/cifs/nterr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ +// SPDX-License-Identifier: GPL-2.0-or-later /* Unix SMB/Netbios implementation. Version 1.9. diff --git a/fs/cifs/ntlmssp.h b/fs/cifs/ntlmssp.h index 55758b9ec877..7a00acffa6ea 100644 --- a/fs/cifs/ntlmssp.h +++ b/fs/cifs/ntlmssp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +// SPDX-License-Identifier: LGPL-2.1 /* * * Copyright (c) International Business Machines Corp., 2002,2007 diff --git a/fs/cifs/rfc1002pdu.h b/fs/cifs/rfc1002pdu.h index ae1d025da294..b32940b2b2bf 100644 --- a/fs/cifs/rfc1002pdu.h +++ b/fs/cifs/rfc1002pdu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +// SPDX-License-Identifier: LGPL-2.1 /* * * Protocol Data Unit definitions for RFC 1001/1002 support diff --git a/fs/cifs/smb2glob.h b/fs/cifs/smb2glob.h index 82e916ad167c..c240ce7bc0ed 100644 --- a/fs/cifs/smb2glob.h +++ b/fs/cifs/smb2glob.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +// SPDX-License-Identifier: LGPL-2.1 /* * * Definitions for various global variables and structures diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h index 286044850e85..8cad2a5c516b 100644 --- a/fs/cifs/smb2pdu.h +++ b/fs/cifs/smb2pdu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +// SPDX-License-Identifier: LGPL-2.1 /* * * Copyright (c) International Business Machines Corp., 2009, 2013 diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h index a69f1eed1cfe..c210e1221c9a 100644 --- a/fs/cifs/smb2proto.h +++ b/fs/cifs/smb2proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +// SPDX-License-Identifier: LGPL-2.1 /* * * Copyright (c) International Business Machines Corp., 2002, 2011 diff --git a/fs/cifs/smb2status.h b/fs/cifs/smb2status.h index a9e958166fc5..283bef0ae839 100644 --- a/fs/cifs/smb2status.h +++ b/fs/cifs/smb2status.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +// SPDX-License-Identifier: LGPL-2.1 /* * * SMB2 Status code (network error) definitions diff --git a/fs/cifs/smbdirect.h b/fs/cifs/smbdirect.h index a87fca82a796..f7b98793c664 100644 --- a/fs/cifs/smbdirect.h +++ b/fs/cifs/smbdirect.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, Microsoft Corporation. * diff --git a/fs/cifs/smberr.h b/fs/cifs/smberr.h index aeffdad829e2..1d96335a046c 100644 --- a/fs/cifs/smberr.h +++ b/fs/cifs/smberr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +// SPDX-License-Identifier: LGPL-2.1 /* * * Copyright (c) International Business Machines Corp., 2002,2004 diff --git a/fs/cifs/trace.h b/fs/cifs/trace.h index 6b88dc2e364f..7b9a85f5b93c 100644 --- a/fs/cifs/trace.h +++ b/fs/cifs/trace.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2018, Microsoft Corporation. * From patchwork Fri Jul 22 22:42:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Enzo Matsumiya X-Patchwork-Id: 12926954 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0DDCC433EF for ; Fri, 22 Jul 2022 22:43:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236916AbiGVWnL (ORCPT ); Fri, 22 Jul 2022 18:43:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236430AbiGVWnL (ORCPT ); Fri, 22 Jul 2022 18:43:11 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46ADBBB5 for ; Fri, 22 Jul 2022 15:43:08 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id EDA92200F2; Fri, 22 Jul 2022 22:43:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1658529786; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=koEZ7rzzxQ7S0O/y6NMa1nUepMOXOGjsdD5oNtB8Bns=; b=zODlXtcP7XFAiwdKx1+Fb3wBLPrkQWgxPzc+RQYkqtToXVQ3j5yQwibbU9ifYebwA5SDae XMJA9X2RggVyEpXc8wAv5E0FH1JO9OtNOsZtZ99C2sPk8hEVpcAnLNV8t4ohRGqUBwmKfK swpWDMJZtE1+8uZ1/sZzovCnVtNqRvY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1658529786; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=koEZ7rzzxQ7S0O/y6NMa1nUepMOXOGjsdD5oNtB8Bns=; b=aPUaWF4+xYn1f61aReaMxaBgZZJvj2aHwVW1CcZAurXMcwJffMKJBDWhbegvC8IIWA09iL TFd8wQ/qOTl7gCAA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 33917134A9; Fri, 22 Jul 2022 22:43:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id CBXhOfkn22KIIgAAMHmgww (envelope-from ); Fri, 22 Jul 2022 22:43:05 +0000 From: Enzo Matsumiya To: linux-cifs@vger.kernel.org Cc: smfrench@gmail.com, pc@cjr.nz, ronniesahlberg@gmail.com, nspmangalore@gmail.com Subject: [PATCH 3/4] cifs: standardize top comments format Date: Fri, 22 Jul 2022 19:42:53 -0300 Message-Id: <20220722224254.8738-3-ematsumiya@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220722224254.8738-1-ematsumiya@suse.de> References: <20220722224254.8738-1-ematsumiya@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org Use only 1 space after comment start, remove unecessary extra lines. Done via sed, might have affected some code comments, will fix up later. Signed-off-by: Enzo Matsumiya --- fs/cifs/cifs_dfs_ref.c | 10 +++++----- fs/cifs/cifs_fs_sb.h | 8 +++----- fs/cifs/cifs_ioctl.h | 8 +++----- fs/cifs/cifs_spnego.c | 9 ++++----- fs/cifs/cifs_spnego.h | 9 ++++----- fs/cifs/cifs_unicode.c | 8 +++----- fs/cifs/cifs_unicode.h | 5 ++--- fs/cifs/cifs_uniupr.h | 2 +- fs/cifs/cifsacl.c | 10 ++++------ fs/cifs/cifsacl.h | 8 +++----- fs/cifs/cifsencrypt.c | 12 +++++------- fs/cifs/cifsfs.c | 10 +++++----- fs/cifs/cifsfs.h | 8 ++++---- fs/cifs/cifsglob.h | 7 +++---- fs/cifs/cifspdu.h | 14 +++++--------- fs/cifs/cifssmb.c | 10 ++++------ fs/cifs/connect.c | 11 ++++------- fs/cifs/dir.c | 10 ++++------ fs/cifs/dns_resolve.c | 12 +++++------- fs/cifs/dns_resolve.h | 11 +++++------ fs/cifs/export.c | 12 +++++------- fs/cifs/file.c | 13 +++++-------- fs/cifs/fs_context.c | 4 ++-- fs/cifs/fs_context.h | 4 ++-- fs/cifs/fscache.c | 9 ++++----- fs/cifs/fscache.h | 9 ++++----- fs/cifs/inode.c | 8 +++----- fs/cifs/ioctl.c | 12 +++++------- fs/cifs/link.c | 8 +++----- fs/cifs/misc.c | 8 +++----- fs/cifs/netmisc.c | 9 ++++----- fs/cifs/ntlmssp.h | 8 +++----- fs/cifs/readdir.c | 12 +++++------- fs/cifs/rfc1002pdu.h | 10 ++++------ fs/cifs/sess.c | 10 ++++------ fs/cifs/smb2file.c | 8 +++----- fs/cifs/smb2glob.h | 10 ++++------ fs/cifs/smb2inode.c | 8 +++----- fs/cifs/smb2maperror.c | 10 ++++------ fs/cifs/smb2misc.c | 8 +++----- fs/cifs/smb2pdu.c | 16 ++++++---------- fs/cifs/smb2pdu.h | 11 ++++------- fs/cifs/smb2proto.h | 8 +++----- fs/cifs/smb2status.h | 12 +++++------- fs/cifs/smb2transport.c | 8 +++----- fs/cifs/smbdirect.c | 4 ++-- fs/cifs/smbdirect.h | 4 ++-- fs/cifs/smberr.h | 12 +++++------- fs/cifs/trace.c | 4 ++-- fs/cifs/trace.h | 4 ++-- fs/cifs/transport.c | 14 +++++--------- fs/cifs/unc.c | 4 ++-- fs/cifs/winucase.c | 1 - fs/cifs/xattr.c | 8 +++----- 54 files changed, 193 insertions(+), 279 deletions(-) diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c index 23fa4fa3cb16..5c776f4639f4 100644 --- a/fs/cifs/cifs_dfs_ref.c +++ b/fs/cifs/cifs_dfs_ref.c @@ -1,11 +1,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Contains the CIFS DFS referral mounting routines used for handling - * traversal via DFS junction point + * Contains the CIFS DFS referral mounting routines used for handling + * traversal via DFS junction point * - * Copyright (c) 2007 Igor Mammedov - * Copyright (C) International Business Machines Corp., 2008 - * Author(s): Igor Mammedov (niallain@gmail.com) + * Copyright (c) 2007 Igor Mammedov + * Copyright (c) International Business Machines Corp., 2008 + * Author(s): Igor Mammedov (niallain@gmail.com) * Steve French (sfrench@us.ibm.com) */ diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h index 7317534ac410..4381511028e1 100644 --- a/fs/cifs/cifs_fs_sb.h +++ b/fs/cifs/cifs_fs_sb.h @@ -1,10 +1,8 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * - * Copyright (c) International Business Machines Corp., 2002,2004 - * Author(s): Steve French (sfrench@us.ibm.com) - * - */ + * Copyright (c) International Business Machines Corp., 2002,2004 + * Author(s): Steve French (sfrench@us.ibm.com) +*/ #include #ifndef _CIFS_FS_SB_H diff --git a/fs/cifs/cifs_ioctl.h b/fs/cifs/cifs_ioctl.h index bf2850b54f3b..1748b7db9d88 100644 --- a/fs/cifs/cifs_ioctl.h +++ b/fs/cifs/cifs_ioctl.h @@ -1,11 +1,9 @@ // SPDX-License-Identifier: LGPL-2.1 /* + * Structure definitions for io control for cifs/smb3 * - * Structure definitions for io control for cifs/smb3 - * - * Copyright (c) 2015 Steve French - * - */ + * Copyright (c) 2015 Steve French +*/ struct smb_mnt_fs_info { __u32 version; /* 0001 */ diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c index 342717bf1dc2..5c52d08725a4 100644 --- a/fs/cifs/cifs_spnego.c +++ b/fs/cifs/cifs_spnego.c @@ -1,11 +1,10 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * SPNEGO upcall management for CIFS + * SPNEGO upcall management for CIFS * - * Copyright (c) 2007 Red Hat, Inc. - * Author(s): Jeff Layton (jlayton@redhat.com) - * - */ + * Copyright (c) 2007 Red Hat, Inc. + * Author(s): Jeff Layton (jlayton@redhat.com) +*/ #include #include diff --git a/fs/cifs/cifs_spnego.h b/fs/cifs/cifs_spnego.h index 3819940e2ab5..358b7220b593 100644 --- a/fs/cifs/cifs_spnego.h +++ b/fs/cifs/cifs_spnego.h @@ -1,12 +1,11 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * SPNEGO upcall management for CIFS + * SPNEGO upcall management for CIFS * - * Copyright (c) 2007 Red Hat, Inc. - * Author(s): Jeff Layton (jlayton@redhat.com) + * Copyright (c) 2007 Red Hat, Inc. + * Author(s): Jeff Layton (jlayton@redhat.com) * Steve French (sfrench@us.ibm.com) - * - */ +*/ #ifndef _CIFS_SPNEGO_H #define _CIFS_SPNEGO_H diff --git a/fs/cifs/cifs_unicode.c b/fs/cifs/cifs_unicode.c index e7582dd79179..e701e8916275 100644 --- a/fs/cifs/cifs_unicode.c +++ b/fs/cifs/cifs_unicode.c @@ -1,8 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * - * Copyright (c) International Business Machines Corp., 2000,2009 - * Modified by Steve French (sfrench@us.ibm.com) + * Copyright (c) International Business Machines Corp., 2000,2009 + * Modified by Steve French (sfrench@us.ibm.com) */ #include #include @@ -243,8 +242,7 @@ cifs_from_utf16(char *to, const __le16 *from, int tolen, int fromlen, * NAME: cifs_strtoUTF16() * * FUNCTION: Convert character string to unicode string - * - */ +*/ int cifs_strtoUTF16(__le16 *to, const char *from, int len, const struct nls_table *codepage) diff --git a/fs/cifs/cifs_unicode.h b/fs/cifs/cifs_unicode.h index 9bad387d2bff..9a2e65212bdb 100644 --- a/fs/cifs/cifs_unicode.h +++ b/fs/cifs/cifs_unicode.h @@ -6,7 +6,7 @@ * Convert a unicode character to upper or lower case using * compressed tables. * - * Copyright (c) International Business Machines Corp., 2000,2009 + * Copyright (c) International Business Machines Corp., 2000,2009 * * Notes: * These APIs are based on the C library functions. The semantics @@ -62,8 +62,7 @@ * NO_MAP_UNI_RSVD = do not perform any remapping of the character * SFM_MAP_UNI_RSVD = map reserved characters using SFM scheme (MAC compatible) * SFU_MAP_UNI_RSVD = map reserved characters ala SFU ("mapchars" option) - * - */ +*/ #define NO_MAP_UNI_RSVD 0 #define SFM_MAP_UNI_RSVD 1 #define SFU_MAP_UNI_RSVD 2 diff --git a/fs/cifs/cifs_uniupr.h b/fs/cifs/cifs_uniupr.h index 529bd690fd91..66e87cb9f374 100644 --- a/fs/cifs/cifs_uniupr.h +++ b/fs/cifs/cifs_uniupr.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (c) International Business Machines Corp., 2000,2002 + * Copyright (c) International Business Machines Corp., 2000,2002 * * uniupr.h - Unicode compressed case ranges */ diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c index 73754cb74065..d9bc8cee6317 100644 --- a/fs/cifs/cifsacl.c +++ b/fs/cifs/cifsacl.c @@ -1,12 +1,10 @@ // SPDX-License-Identifier: LGPL-2.1 /* + * Copyright (c) International Business Machines Corp., 2007,2008 + * Author(s): Steve French (sfrench@us.ibm.com) * - * Copyright (C) International Business Machines Corp., 2007,2008 - * Author(s): Steve French (sfrench@us.ibm.com) - * - * Contains the routines for mapping CIFS/NTFS ACLs - * - */ + * Contains the routines for mapping CIFS/NTFS ACLs +*/ #include #include diff --git a/fs/cifs/cifsacl.h b/fs/cifs/cifsacl.h index 6c051b3ae922..227cb8f123a5 100644 --- a/fs/cifs/cifsacl.h +++ b/fs/cifs/cifsacl.h @@ -1,10 +1,8 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * - * Copyright (c) International Business Machines Corp., 2007 - * Author(s): Steve French (sfrench@us.ibm.com) - * - */ + * Copyright (c) International Business Machines Corp., 2007 + * Author(s): Steve French (sfrench@us.ibm.com) +*/ #ifndef _CIFSACL_H #define _CIFSACL_H diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c index 663cb9db4908..dfc5bce69fe6 100644 --- a/fs/cifs/cifsencrypt.c +++ b/fs/cifs/cifsencrypt.c @@ -1,13 +1,11 @@ // SPDX-License-Identifier: LGPL-2.1 /* + * Encryption and hashing operations relating to NTLM, NTLMv2. See MS-NLMP + * for more detailed information * - * Encryption and hashing operations relating to NTLM, NTLMv2. See MS-NLMP - * for more detailed information - * - * Copyright (C) International Business Machines Corp., 2005,2013 - * Author(s): Steve French (sfrench@us.ibm.com) - * - */ + * Copyright (c) International Business Machines Corp., 2005,2013 + * Author(s): Steve French (sfrench@us.ibm.com) +*/ #include #include diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index da2a53daeae3..c81935405b70 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -1,11 +1,11 @@ // SPDX-License-Identifier: LGPL-2.1 /* + * Copyright (c) International Business Machines Corp., 2002,2008 + * Copyright (c) SUSE LLC, 2022 + * Author(s): Steve French (sfrench@us.ibm.com) + * Enzo Matsumiya * - * Copyright (C) International Business Machines Corp., 2002,2008 - * Author(s): Steve French (sfrench@us.ibm.com) - * - * Common Internet FileSystem (CIFS) client - * + * SMBFS client */ /* Note that BB means BUGBUG (ie something to fix eventually) */ diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h index deef6c8d0dc3..b6c4fbe5ccc6 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h @@ -1,9 +1,9 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * - * Copyright (c) International Business Machines Corp., 2002, 2007 - * Author(s): Steve French (sfrench@us.ibm.com) - * + * Copyright (c) International Business Machines Corp., 2002, 2007 + * Copyright (c) SUSE LLC, 2022 + * Author(s): Steve French (sfrench@us.ibm.com) + * Enzo Matsumiya */ #ifndef _CIFSFS_H diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 65c7e5b55278..bbc02fea2181 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -1,10 +1,9 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * Copyright (C) International Business Machines Corp., 2002,2008 - * Author(s): Steve French (sfrench@us.ibm.com) + * Copyright (c) International Business Machines Corp., 2002,2008 + * Author(s): Steve French (sfrench@us.ibm.com) * Jeremy Allison (jra@samba.org) - * - */ +*/ #ifndef _CIFS_GLOB_H #define _CIFS_GLOB_H diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h index d3c5e3d23385..c280677f6358 100644 --- a/fs/cifs/cifspdu.h +++ b/fs/cifs/cifspdu.h @@ -1,10 +1,8 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * - * Copyright (c) International Business Machines Corp., 2002,2009 - * Author(s): Steve French (sfrench@us.ibm.com) - * - */ + * Copyright (c) International Business Machines Corp., 2002,2009 + * Author(s): Steve French (sfrench@us.ibm.com) +*/ #ifndef _CIFSPDU_H #define _CIFSPDU_H @@ -477,8 +475,7 @@ put_bcc(__u16 count, struct smb_hdr *hdr) * Typedefs can always be removed later if they are too distracting * and they are only used for the CIFSs PDUs themselves, not * internal cifs vfs structures - * - */ +*/ typedef struct negotiate_req { struct smb_hdr hdr; /* wct = 0 */ @@ -747,8 +744,7 @@ typedef struct smb_com_tconx_rsp_ext { * IPC ie named pipe * COMM * ????? ie any type - * - */ +*/ typedef struct smb_com_echo_req { struct smb_hdr hdr; diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 011d17b7523c..049a1ba7e297 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -1,12 +1,10 @@ // SPDX-License-Identifier: LGPL-2.1 /* + * Copyright (c) International Business Machines Corp., 2002,2010 + * Author(s): Steve French (sfrench@us.ibm.com) * - * Copyright (C) International Business Machines Corp., 2002,2010 - * Author(s): Steve French (sfrench@us.ibm.com) - * - * Contains the routines for constructing the SMB PDUs themselves - * - */ + * Contains the routines for constructing the SMB PDUs themselves +*/ /* SMB/CIFS PDU handling routines here - except for leftovers in connect.c */ /* These are mostly routines that operate on a pathname, or on a tree id */ diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 8859da70cb06..6ebfe8b9ce80 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1,10 +1,8 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * - * Copyright (C) International Business Machines Corp., 2002,2011 - * Author(s): Steve French (sfrench@us.ibm.com) - * - */ + * Copyright (c) International Business Machines Corp., 2002,2011 + * Author(s): Steve French (sfrench@us.ibm.com) +*/ #include #include #include @@ -379,8 +377,7 @@ static bool cifs_tcp_ses_needs_reconnect(struct TCP_Server_Info *server, int num * if mark_smb_session is passed as true, unconditionally mark * the smb session (and tcon) for reconnect as well. This value * doesn't really matter for non-multichannel scenario. - * - */ +*/ static int __cifs_reconnect(struct TCP_Server_Info *server, bool mark_smb_session) { diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index ce9b22aecfba..3783889a9dc5 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -1,12 +1,10 @@ // SPDX-License-Identifier: LGPL-2.1 /* + * vfs operations that deal with dentries * - * vfs operations that deal with dentries - * - * Copyright (C) International Business Machines Corp., 2002,2009 - * Author(s): Steve French (sfrench@us.ibm.com) - * - */ + * Copyright (c) International Business Machines Corp., 2002,2009 + * Author(s): Steve French (sfrench@us.ibm.com) +*/ #include #include #include diff --git a/fs/cifs/dns_resolve.c b/fs/cifs/dns_resolve.c index 0458d28d71aa..8af13d34f627 100644 --- a/fs/cifs/dns_resolve.c +++ b/fs/cifs/dns_resolve.c @@ -1,16 +1,14 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * - * Copyright (c) 2007 Igor Mammedov - * Author(s): Igor Mammedov (niallain@gmail.com) + * Copyright (c) 2007 Igor Mammedov + * Author(s): Igor Mammedov (niallain@gmail.com) * Steve French (sfrench@us.ibm.com) * Wang Lei (wang840925@gmail.com) * David Howells (dhowells@redhat.com) * - * Contains the CIFS DFS upcall routines used for hostname to - * IP address translation. - * - */ + * Contains the CIFS DFS upcall routines used for hostname to + * IP address translation. +*/ #include #include diff --git a/fs/cifs/dns_resolve.h b/fs/cifs/dns_resolve.h index 5a617278a669..dee549bba4c7 100644 --- a/fs/cifs/dns_resolve.h +++ b/fs/cifs/dns_resolve.h @@ -1,12 +1,11 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * DNS Resolver upcall management for CIFS DFS - * Handles host name to IP address resolution + * DNS Resolver upcall management for CIFS DFS + * Handles host name to IP address resolution * - * Copyright (c) International Business Machines Corp., 2008 - * Author(s): Steve French (sfrench@us.ibm.com) - * - */ + * Copyright (c) International Business Machines Corp., 2008 + * Author(s): Steve French (sfrench@us.ibm.com) +*/ #ifndef _DNS_RESOLVE_H #define _DNS_RESOLVE_H diff --git a/fs/cifs/export.c b/fs/cifs/export.c index 37c28415df1e..bf9b0361c497 100644 --- a/fs/cifs/export.c +++ b/fs/cifs/export.c @@ -1,14 +1,12 @@ // SPDX-License-Identifier: LGPL-2.1 /* + * Copyright (c) International Business Machines Corp., 2007 + * Author(s): Steve French (sfrench@us.ibm.com) * - * Copyright (C) International Business Machines Corp., 2007 - * Author(s): Steve French (sfrench@us.ibm.com) + * Common Internet FileSystem (CIFS) client * - * Common Internet FileSystem (CIFS) client - * - * Operations related to support for exporting files via NFSD - * - */ + * Operations related to support for exporting files via NFSD +*/ /* * See Documentation/filesystems/nfs/exporting.rst diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 6985710e14c2..01f3b1db129f 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -1,13 +1,11 @@ // SPDX-License-Identifier: LGPL-2.1 /* + * vfs operations that deal with files * - * vfs operations that deal with files - * - * Copyright (C) International Business Machines Corp., 2002,2010 - * Author(s): Steve French (sfrench@us.ibm.com) + * Copyright (c) International Business Machines Corp., 2002,2010 + * Author(s): Steve French (sfrench@us.ibm.com) * Jeremy Allison (jra@samba.org) - * - */ +*/ #include #include #include @@ -430,8 +428,7 @@ void cifsFileInfo_put(struct cifsFileInfo *cifs_file) * @cifs_file: cifs/smb3 specific info (eg refcounts) for an open file * @wait_oplock_handler: must be false if called from oplock_break_handler * @offload: not offloaded on close and oplock breaks - * - */ +*/ void _cifsFileInfo_put(struct cifsFileInfo *cifs_file, bool wait_oplock_handler, bool offload) { diff --git a/fs/cifs/fs_context.c b/fs/cifs/fs_context.c index f76d9920a7a7..c218126dc701 100644 --- a/fs/cifs/fs_context.c +++ b/fs/cifs/fs_context.c @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2020, Microsoft Corporation. + * Copyright (c) 2020, Microsoft Corporation. * - * Author(s): Steve French + * Author(s): Steve French * David Howells */ #include diff --git a/fs/cifs/fs_context.h b/fs/cifs/fs_context.h index ec4a8af72570..68d5c4e2f6ad 100644 --- a/fs/cifs/fs_context.h +++ b/fs/cifs/fs_context.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2020, Microsoft Corporation. + * Copyright (c) 2020, Microsoft Corporation. * - * Author(s): Steve French + * Author(s): Steve French * David Howells */ diff --git a/fs/cifs/fscache.c b/fs/cifs/fscache.c index 23ef56f55ce5..45b5df911bf9 100644 --- a/fs/cifs/fscache.c +++ b/fs/cifs/fscache.c @@ -1,11 +1,10 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * CIFS filesystem cache interface + * CIFS filesystem cache interface * - * Copyright (c) 2010 Novell, Inc. - * Author(s): Suresh Jayaraman - * - */ + * Copyright (c) 2010 Novell, Inc. + * Author(s): Suresh Jayaraman +*/ #include "fscache.h" #include "cifsglob.h" #include "cifs_debug.h" diff --git a/fs/cifs/fscache.h b/fs/cifs/fscache.h index 435e826fdd9a..cc7f5033b7d0 100644 --- a/fs/cifs/fscache.h +++ b/fs/cifs/fscache.h @@ -1,11 +1,10 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * CIFS filesystem cache interface definitions + * CIFS filesystem cache interface definitions * - * Copyright (c) 2010 Novell, Inc. - * Authors(s): Suresh Jayaraman (sjayaraman@suse.de> - * - */ + * Copyright (c) 2010 Novell, Inc. + * Authors(s): Suresh Jayaraman (sjayaraman@suse.de> +*/ #ifndef _CIFS_FSCACHE_H #define _CIFS_FSCACHE_H diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 46ebc2554b53..687237571c11 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -1,10 +1,8 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * - * Copyright (C) International Business Machines Corp., 2002,2010 - * Author(s): Steve French (sfrench@us.ibm.com) - * - */ + * Copyright (c) International Business Machines Corp., 2002,2010 + * Author(s): Steve French (sfrench@us.ibm.com) +*/ #include #include #include diff --git a/fs/cifs/ioctl.c b/fs/cifs/ioctl.c index 0359b604bdbc..d2de957df2de 100644 --- a/fs/cifs/ioctl.c +++ b/fs/cifs/ioctl.c @@ -1,12 +1,10 @@ // SPDX-License-Identifier: LGPL-2.1 /* + * vfs operations that deal with io control * - * vfs operations that deal with io control - * - * Copyright (C) International Business Machines Corp., 2005,2013 - * Author(s): Steve French (sfrench@us.ibm.com) - * - */ + * Copyright (c) International Business Machines Corp., 2005,2013 + * Author(s): Steve French (sfrench@us.ibm.com) +*/ #include #include @@ -174,7 +172,7 @@ static int cifs_shutdown(struct super_block *sb, unsigned long arg) /* * see: - * https://man7.org/linux/man-pages/man2/ioctl_xfs_goingdown.2.html + * https://man7.org/linux/man-pages/man2/ioctl_xfs_goingdown.2.html * for more information and description of original intent of the flags */ switch (flags) { diff --git a/fs/cifs/link.c b/fs/cifs/link.c index bbdf3281559c..6b9ff8f8d122 100644 --- a/fs/cifs/link.c +++ b/fs/cifs/link.c @@ -1,10 +1,8 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * - * Copyright (C) International Business Machines Corp., 2002,2008 - * Author(s): Steve French (sfrench@us.ibm.com) - * - */ + * Copyright (c) International Business Machines Corp., 2002,2008 + * Author(s): Steve French (sfrench@us.ibm.com) +*/ #include #include #include diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c index ec0069058f45..944d073edad8 100644 --- a/fs/cifs/misc.c +++ b/fs/cifs/misc.c @@ -1,10 +1,8 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * - * Copyright (C) International Business Machines Corp., 2002,2008 - * Author(s): Steve French (sfrench@us.ibm.com) - * - */ + * Copyright (c) International Business Machines Corp., 2002,2008 + * Author(s): Steve French (sfrench@us.ibm.com) +*/ #include #include diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c index 28caae7aed1b..7cd52ea80a90 100644 --- a/fs/cifs/netmisc.c +++ b/fs/cifs/netmisc.c @@ -1,11 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* + * Copyright (c) International Business Machines Corp., 2002,2008 + * Author(s): Steve French (sfrench@us.ibm.com) * - * Copyright (c) International Business Machines Corp., 2002,2008 - * Author(s): Steve French (sfrench@us.ibm.com) - * - * Error mapping routines from Samba libsmb/errormap.c - * Copyright (C) Andrew Tridgell 2001 + * Error mapping routines from Samba libsmb/errormap.c + * Copyright (c) Andrew Tridgell 2001 */ #include diff --git a/fs/cifs/ntlmssp.h b/fs/cifs/ntlmssp.h index 7a00acffa6ea..69111c35719b 100644 --- a/fs/cifs/ntlmssp.h +++ b/fs/cifs/ntlmssp.h @@ -1,10 +1,8 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * - * Copyright (c) International Business Machines Corp., 2002,2007 - * Author(s): Steve French (sfrench@us.ibm.com) - * - */ + * Copyright (c) International Business Machines Corp., 2002,2007 + * Author(s): Steve French (sfrench@us.ibm.com) +*/ #define NTLMSSP_SIGNATURE "NTLMSSP" /* Message Types */ diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index 384cabdf47ca..79c8c443a2ce 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c @@ -1,13 +1,11 @@ // SPDX-License-Identifier: LGPL-2.1 /* + * Directory search handling * - * Directory search handling - * - * Copyright (C) International Business Machines Corp., 2004, 2008 - * Copyright (C) Red Hat, Inc., 2011 - * Author(s): Steve French (sfrench@us.ibm.com) - * - */ + * Copyright (c) International Business Machines Corp., 2004, 2008 + * Copyright (c) Red Hat, Inc., 2011 + * Author(s): Steve French (sfrench@us.ibm.com) +*/ #include #include #include diff --git a/fs/cifs/rfc1002pdu.h b/fs/cifs/rfc1002pdu.h index b32940b2b2bf..09110b34b74b 100644 --- a/fs/cifs/rfc1002pdu.h +++ b/fs/cifs/rfc1002pdu.h @@ -1,12 +1,10 @@ // SPDX-License-Identifier: LGPL-2.1 /* + * Protocol Data Unit definitions for RFC 1001/1002 support * - * Protocol Data Unit definitions for RFC 1001/1002 support - * - * Copyright (c) International Business Machines Corp., 2004 - * Author(s): Steve French (sfrench@us.ibm.com) - * - */ + * Copyright (c) International Business Machines Corp., 2004 + * Author(s): Steve French (sfrench@us.ibm.com) +*/ /* NB: unlike smb/cifs packets, the RFC1002 structures are big endian */ diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index 02c8b2906196..b07be54846e4 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c @@ -1,12 +1,10 @@ // SPDX-License-Identifier: LGPL-2.1 /* + * SMB/CIFS session setup handling routines * - * SMB/CIFS session setup handling routines - * - * Copyright (c) International Business Machines Corp., 2006, 2009 - * Author(s): Steve French (sfrench@us.ibm.com) - * - */ + * Copyright (c) International Business Machines Corp., 2006, 2009 + * Author(s): Steve French (sfrench@us.ibm.com) +*/ #include "cifspdu.h" #include "cifsglob.h" diff --git a/fs/cifs/smb2file.c b/fs/cifs/smb2file.c index f5dcc4940b6d..f80f2e989ffe 100644 --- a/fs/cifs/smb2file.c +++ b/fs/cifs/smb2file.c @@ -1,11 +1,9 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * - * Copyright (C) International Business Machines Corp., 2002, 2011 - * Author(s): Steve French (sfrench@us.ibm.com), + * Copyright (c) International Business Machines Corp., 2002, 2011 + * Author(s): Steve French (sfrench@us.ibm.com), * Pavel Shilovsky ((pshilovsky@samba.org) 2012 - * - */ +*/ #include #include #include diff --git a/fs/cifs/smb2glob.h b/fs/cifs/smb2glob.h index c240ce7bc0ed..bb91031423e0 100644 --- a/fs/cifs/smb2glob.h +++ b/fs/cifs/smb2glob.h @@ -1,15 +1,13 @@ // SPDX-License-Identifier: LGPL-2.1 /* + * Definitions for various global variables and structures * - * Definitions for various global variables and structures - * - * Copyright (C) International Business Machines Corp., 2002, 2011 + * Copyright (c) International Business Machines Corp., 2002, 2011 * Etersoft, 2012 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French (sfrench@us.ibm.com) * Jeremy Allison (jra@samba.org) * Pavel Shilovsky (pshilovsky@samba.org) 2012 - * - */ +*/ #ifndef _SMB2_GLOB_H #define _SMB2_GLOB_H diff --git a/fs/cifs/smb2inode.c b/fs/cifs/smb2inode.c index 8571a459c710..75925d119bb9 100644 --- a/fs/cifs/smb2inode.c +++ b/fs/cifs/smb2inode.c @@ -1,12 +1,10 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * - * Copyright (C) International Business Machines Corp., 2002, 2011 + * Copyright (c) International Business Machines Corp., 2002, 2011 * Etersoft, 2012 - * Author(s): Pavel Shilovsky (pshilovsky@samba.org), + * Author(s): Pavel Shilovsky (pshilovsky@samba.org), * Steve French (sfrench@us.ibm.com) - * - */ +*/ #include #include #include diff --git a/fs/cifs/smb2maperror.c b/fs/cifs/smb2maperror.c index 194799ddd382..3ae0c1296d22 100644 --- a/fs/cifs/smb2maperror.c +++ b/fs/cifs/smb2maperror.c @@ -1,12 +1,10 @@ // SPDX-License-Identifier: LGPL-2.1 /* + * Functions which do error mapping of SMB2 status codes to POSIX errors * - * Functions which do error mapping of SMB2 status codes to POSIX errors - * - * Copyright (C) International Business Machines Corp., 2009 - * Author(s): Steve French (sfrench@us.ibm.com) - * - */ + * Copyright (c) International Business Machines Corp., 2009 + * Author(s): Steve French (sfrench@us.ibm.com) +*/ #include #include "cifsglob.h" #include "cifs_debug.h" diff --git a/fs/cifs/smb2misc.c b/fs/cifs/smb2misc.c index 818cc4dee0e2..577b0537541d 100644 --- a/fs/cifs/smb2misc.c +++ b/fs/cifs/smb2misc.c @@ -1,12 +1,10 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * - * Copyright (C) International Business Machines Corp., 2002,2011 + * Copyright (c) International Business Machines Corp., 2002,2011 * Etersoft, 2012 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French (sfrench@us.ibm.com) * Pavel Shilovsky (pshilovsky@samba.org) 2012 - * - */ +*/ #include #include "cifsglob.h" #include "cifsproto.h" diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 295ee8b88055..a0019a46104e 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -1,14 +1,12 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * - * Copyright (C) International Business Machines Corp., 2009, 2013 + * Copyright (c) International Business Machines Corp., 2009, 2013 * Etersoft, 2012 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French (sfrench@us.ibm.com) * Pavel Shilovsky (pshilovsky@samba.org) 2012 * - * Contains the routines for constructing the SMB2 PDUs themselves - * - */ + * Contains the routines for constructing the SMB2 PDUs themselves +*/ /* SMB2 PDU handling routines here - except for leftovers (eg session setup) */ /* Note that there are handle based routines which must be */ @@ -848,7 +846,6 @@ add_posix_context(struct kvec *iov, unsigned int *num_iovec, umode_t mode) /* - * * SMB2 Worker functions follow: * * The general structure of the worker functions is: @@ -859,8 +856,7 @@ add_posix_context(struct kvec *iov, unsigned int *num_iovec, umode_t mode) * 5) Decode variable length data area (if any for this SMB2 command type) * 6) Call free smb buffer * 7) return - * - */ +*/ int SMB2_negotiate(const unsigned int xid, @@ -3281,7 +3277,7 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, } /* - * Individual callers to ioctl worker function follow + * Individual callers to ioctl worker function follow */ int diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h index 8cad2a5c516b..ac72d34e1e67 100644 --- a/fs/cifs/smb2pdu.h +++ b/fs/cifs/smb2pdu.h @@ -1,12 +1,10 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * - * Copyright (c) International Business Machines Corp., 2009, 2013 + * Copyright (c) International Business Machines Corp., 2009, 2013 * Etersoft, 2012 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French (sfrench@us.ibm.com) * Pavel Shilovsky (pshilovsky@samba.org) 2012 - * - */ +*/ #ifndef _SMB2PDU_H #define _SMB2PDU_H @@ -51,8 +49,7 @@ struct smb2_rdma_crypto_transform { * See MS-SMB2.PDF specification for protocol details. * The Naming convention is the lower case version of the SMB2 * command code name for the struct. Note that structures must be packed. - * - */ +*/ #define COMPOUND_FID 0xFFFFFFFFFFFFFFFFULL diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h index c210e1221c9a..a80aceb8b78c 100644 --- a/fs/cifs/smb2proto.h +++ b/fs/cifs/smb2proto.h @@ -1,12 +1,10 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * - * Copyright (c) International Business Machines Corp., 2002, 2011 + * Copyright (c) International Business Machines Corp., 2002, 2011 * Etersoft, 2012 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French (sfrench@us.ibm.com) * Pavel Shilovsky (pshilovsky@samba.org) 2012 - * - */ +*/ #ifndef _SMB2PROTO_H #define _SMB2PROTO_H #include diff --git a/fs/cifs/smb2status.h b/fs/cifs/smb2status.h index 283bef0ae839..940c07590a00 100644 --- a/fs/cifs/smb2status.h +++ b/fs/cifs/smb2status.h @@ -1,13 +1,11 @@ // SPDX-License-Identifier: LGPL-2.1 /* + * SMB2 Status code (network error) definitions + * Definitions are from MS-ERREF * - * SMB2 Status code (network error) definitions - * Definitions are from MS-ERREF - * - * Copyright (c) International Business Machines Corp., 2009,2011 - * Author(s): Steve French (sfrench@us.ibm.com) - * - */ + * Copyright (c) International Business Machines Corp., 2009,2011 + * Author(s): Steve French (sfrench@us.ibm.com) +*/ /* * 0 1 2 3 4 5 6 7 8 9 0 A B C D E F 0 1 2 3 4 5 6 7 8 9 A B C D E F diff --git a/fs/cifs/smb2transport.c b/fs/cifs/smb2transport.c index 53ff6bc11939..1a0ceecd5170 100644 --- a/fs/cifs/smb2transport.c +++ b/fs/cifs/smb2transport.c @@ -1,13 +1,11 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * - * Copyright (C) International Business Machines Corp., 2002, 2011 + * Copyright (c) International Business Machines Corp., 2002, 2011 * Etersoft, 2012 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French (sfrench@us.ibm.com) * Jeremy Allison (jra@samba.org) 2006 * Pavel Shilovsky (pshilovsky@samba.org) 2012 - * - */ +*/ #include #include diff --git a/fs/cifs/smbdirect.c b/fs/cifs/smbdirect.c index 5fbbec22bcc8..a2cf17ac823a 100644 --- a/fs/cifs/smbdirect.c +++ b/fs/cifs/smbdirect.c @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2017, Microsoft Corporation. + * Copyright (c) 2017, Microsoft Corporation. * - * Author(s): Long Li + * Author(s): Long Li */ #include #include diff --git a/fs/cifs/smbdirect.h b/fs/cifs/smbdirect.h index f7b98793c664..b42769d56d16 100644 --- a/fs/cifs/smbdirect.h +++ b/fs/cifs/smbdirect.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2017, Microsoft Corporation. + * Copyright (c) 2017, Microsoft Corporation. * - * Author(s): Long Li + * Author(s): Long Li */ #ifndef _SMBDIRECT_H #define _SMBDIRECT_H diff --git a/fs/cifs/smberr.h b/fs/cifs/smberr.h index 1d96335a046c..514739487331 100644 --- a/fs/cifs/smberr.h +++ b/fs/cifs/smberr.h @@ -1,13 +1,11 @@ // SPDX-License-Identifier: LGPL-2.1 /* + * Copyright (c) International Business Machines Corp., 2002,2004 + * Author(s): Steve French (sfrench@us.ibm.com) * - * Copyright (c) International Business Machines Corp., 2002,2004 - * Author(s): Steve French (sfrench@us.ibm.com) - * - * See Error Codes section of the SNIA CIFS Specification - * for more information - * - */ + * See Error Codes section of the SNIA CIFS Specification + * for more information +*/ #define SUCCESS 0x00 /* The request was successful. */ #define ERRDOS 0x01 /* Error is from the core DOS operating system set */ diff --git a/fs/cifs/trace.c b/fs/cifs/trace.c index 465483787193..2a6ba22b6fd6 100644 --- a/fs/cifs/trace.c +++ b/fs/cifs/trace.c @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Copyright (C) 2018, Microsoft Corporation. + * Copyright (c) 2018, Microsoft Corporation. * - * Author(s): Steve French + * Author(s): Steve French */ #define CREATE_TRACE_POINTS #include "trace.h" diff --git a/fs/cifs/trace.h b/fs/cifs/trace.h index 7b9a85f5b93c..7abf58911d63 100644 --- a/fs/cifs/trace.h +++ b/fs/cifs/trace.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Copyright (C) 2018, Microsoft Corporation. + * Copyright (c) 2018, Microsoft Corporation. * - * Author(s): Steve French + * Author(s): Steve French */ #undef TRACE_SYSTEM #define TRACE_SYSTEM cifs diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index 081dd21b731e..8d24f7d5cd49 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c @@ -1,11 +1,9 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * - * Copyright (C) International Business Machines Corp., 2002,2008 - * Author(s): Steve French (sfrench@us.ibm.com) - * Jeremy Allison (jra@samba.org) 2006. - * - */ + * Copyright (c) International Business Machines Corp., 2002,2008 + * Author(s): Steve French (sfrench@us.ibm.com) + * Jeremy Allison (jra@samba.org) 2006. +*/ #include #include @@ -877,14 +875,12 @@ cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst, } /* - * * Send an SMB Request. No response info (other than return code) * needs to be parsed. * * flags indicate the type of request buffer and how long to wait * and whether to log NT STATUS code (error) before mapping it to POSIX error - * - */ +*/ int SendReceiveNoRsp(const unsigned int xid, struct cifs_ses *ses, char *in_buf, int flags) diff --git a/fs/cifs/unc.c b/fs/cifs/unc.c index f6fc5e343ea4..857f3c6f084e 100644 --- a/fs/cifs/unc.c +++ b/fs/cifs/unc.c @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2020, Microsoft Corporation. + * Copyright (c) 2020, Microsoft Corporation. * - * Author(s): Steve French + * Author(s): Steve French * Suresh Jayaraman * Jeff Layton */ diff --git a/fs/cifs/winucase.c b/fs/cifs/winucase.c index 2f075b5b50df..168a3df193b7 100644 --- a/fs/cifs/winucase.c +++ b/fs/cifs/winucase.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * * Copyright (c) Jeffrey Layton , 2013 * * The const tables in this file were converted from the following info diff --git a/fs/cifs/xattr.c b/fs/cifs/xattr.c index 9d486fbbfbbd..531bf9d1a2f9 100644 --- a/fs/cifs/xattr.c +++ b/fs/cifs/xattr.c @@ -1,10 +1,8 @@ // SPDX-License-Identifier: LGPL-2.1 /* - * - * Copyright (c) International Business Machines Corp., 2003, 2007 - * Author(s): Steve French (sfrench@us.ibm.com) - * - */ + * Copyright (c) International Business Machines Corp., 2003, 2007 + * Author(s): Steve French (sfrench@us.ibm.com) +*/ #include #include From patchwork Fri Jul 22 22:42:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Enzo Matsumiya X-Patchwork-Id: 12926955 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D21FBC43334 for ; Fri, 22 Jul 2022 22:43:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236430AbiGVWnO (ORCPT ); Fri, 22 Jul 2022 18:43:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236910AbiGVWnN (ORCPT ); Fri, 22 Jul 2022 18:43:13 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93418BB5 for ; Fri, 22 Jul 2022 15:43:11 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 478EE2019F; Fri, 22 Jul 2022 22:43:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1658529790; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xNn0IvgbwKzEXKLqn2TcEsYfaY4yA6br+6w7p5UL+OQ=; b=qxijLxk3Nj1GtJrSOKRQzNsVTLxY/qNwSFVz75kQlRvYuCQZ0WLlQXcCkRaId/BkwpadOQ ZtGMpf8q8XJ0r4rMPOFnaqqfD2Rlg7icAzjY7N/m5dUyQ6bpmJYqrtvLcn1dV5Xs/+sYW8 TM+n3D+yyiT7ByRWRI+LyV/MaMcCoLo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1658529790; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xNn0IvgbwKzEXKLqn2TcEsYfaY4yA6br+6w7p5UL+OQ=; b=AOvque4FO5Hf5jBzuYkly4OuG3DcAItfFuioLXbzzHECAU5vOAr7DLS9hX22R4NSmgCnyl kANlBcOq91qd5tDw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id BEE1D134A9; Fri, 22 Jul 2022 22:43:09 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id taNJIP0n22KRIgAAMHmgww (envelope-from ); Fri, 22 Jul 2022 22:43:09 +0000 From: Enzo Matsumiya To: linux-cifs@vger.kernel.org Cc: smfrench@gmail.com, pc@cjr.nz, ronniesahlberg@gmail.com, nspmangalore@gmail.com Subject: [PATCH 4/4] cifs: standardize authors emails to RFC5322 format Date: Fri, 22 Jul 2022 19:42:54 -0300 Message-Id: <20220722224254.8738-4-ematsumiya@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220722224254.8738-1-ematsumiya@suse.de> References: <20220722224254.8738-1-ematsumiya@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org Change (author@example.com) to Signed-off-by: Enzo Matsumiya --- fs/cifs/cifs_dfs_ref.c | 4 ++-- fs/cifs/cifs_fs_sb.h | 2 +- fs/cifs/cifs_spnego.c | 2 +- fs/cifs/cifs_spnego.h | 4 ++-- fs/cifs/cifs_unicode.c | 2 +- fs/cifs/cifsacl.c | 2 +- fs/cifs/cifsacl.h | 2 +- fs/cifs/cifsencrypt.c | 2 +- fs/cifs/cifsfs.c | 2 +- fs/cifs/cifsfs.h | 2 +- fs/cifs/cifsglob.h | 4 ++-- fs/cifs/cifspdu.h | 2 +- fs/cifs/cifssmb.c | 2 +- fs/cifs/connect.c | 2 +- fs/cifs/dir.c | 2 +- fs/cifs/dns_resolve.c | 8 ++++---- fs/cifs/dns_resolve.h | 2 +- fs/cifs/export.c | 2 +- fs/cifs/file.c | 4 ++-- fs/cifs/inode.c | 2 +- fs/cifs/ioctl.c | 2 +- fs/cifs/link.c | 2 +- fs/cifs/misc.c | 2 +- fs/cifs/netmisc.c | 2 +- fs/cifs/ntlmssp.h | 2 +- fs/cifs/readdir.c | 2 +- fs/cifs/rfc1002pdu.h | 2 +- fs/cifs/sess.c | 2 +- fs/cifs/smb2file.c | 4 ++-- fs/cifs/smb2glob.h | 6 +++--- fs/cifs/smb2inode.c | 4 ++-- fs/cifs/smb2maperror.c | 2 +- fs/cifs/smb2misc.c | 4 ++-- fs/cifs/smb2pdu.c | 4 ++-- fs/cifs/smb2pdu.h | 4 ++-- fs/cifs/smb2proto.h | 4 ++-- fs/cifs/smb2status.h | 2 +- fs/cifs/smb2transport.c | 6 +++--- fs/cifs/smbencrypt.c | 4 ++-- fs/cifs/smberr.h | 2 +- fs/cifs/transport.c | 4 ++-- fs/cifs/xattr.c | 2 +- 42 files changed, 61 insertions(+), 61 deletions(-) diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c index 5c776f4639f4..2b7fd67e4947 100644 --- a/fs/cifs/cifs_dfs_ref.c +++ b/fs/cifs/cifs_dfs_ref.c @@ -5,8 +5,8 @@ * * Copyright (c) 2007 Igor Mammedov * Copyright (c) International Business Machines Corp., 2008 - * Author(s): Igor Mammedov (niallain@gmail.com) - * Steve French (sfrench@us.ibm.com) + * Author(s): Igor Mammedov + * Steve French */ #include diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h index 4381511028e1..910bddc24ce5 100644 --- a/fs/cifs/cifs_fs_sb.h +++ b/fs/cifs/cifs_fs_sb.h @@ -1,7 +1,7 @@ // SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) International Business Machines Corp., 2002,2004 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French */ #include diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c index 5c52d08725a4..c3215be17869 100644 --- a/fs/cifs/cifs_spnego.c +++ b/fs/cifs/cifs_spnego.c @@ -3,7 +3,7 @@ * SPNEGO upcall management for CIFS * * Copyright (c) 2007 Red Hat, Inc. - * Author(s): Jeff Layton (jlayton@redhat.com) + * Author(s): Jeff Layton */ #include diff --git a/fs/cifs/cifs_spnego.h b/fs/cifs/cifs_spnego.h index 358b7220b593..bcf31a5eb223 100644 --- a/fs/cifs/cifs_spnego.h +++ b/fs/cifs/cifs_spnego.h @@ -3,8 +3,8 @@ * SPNEGO upcall management for CIFS * * Copyright (c) 2007 Red Hat, Inc. - * Author(s): Jeff Layton (jlayton@redhat.com) - * Steve French (sfrench@us.ibm.com) + * Author(s): Jeff Layton + * Steve French */ #ifndef _CIFS_SPNEGO_H diff --git a/fs/cifs/cifs_unicode.c b/fs/cifs/cifs_unicode.c index e701e8916275..4d077ad42e4d 100644 --- a/fs/cifs/cifs_unicode.c +++ b/fs/cifs/cifs_unicode.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) International Business Machines Corp., 2000,2009 - * Modified by Steve French (sfrench@us.ibm.com) + * Modified by Steve French */ #include #include diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c index d9bc8cee6317..d38677e59484 100644 --- a/fs/cifs/cifsacl.c +++ b/fs/cifs/cifsacl.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) International Business Machines Corp., 2007,2008 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French * * Contains the routines for mapping CIFS/NTFS ACLs */ diff --git a/fs/cifs/cifsacl.h b/fs/cifs/cifsacl.h index 227cb8f123a5..3856d04c7f18 100644 --- a/fs/cifs/cifsacl.h +++ b/fs/cifs/cifsacl.h @@ -1,7 +1,7 @@ // SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) International Business Machines Corp., 2007 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French */ #ifndef _CIFSACL_H diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c index dfc5bce69fe6..7198cae5bbf0 100644 --- a/fs/cifs/cifsencrypt.c +++ b/fs/cifs/cifsencrypt.c @@ -4,7 +4,7 @@ * for more detailed information * * Copyright (c) International Business Machines Corp., 2005,2013 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French */ #include diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index c81935405b70..19c947572afb 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -2,7 +2,7 @@ /* * Copyright (c) International Business Machines Corp., 2002,2008 * Copyright (c) SUSE LLC, 2022 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French * Enzo Matsumiya * * SMBFS client diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h index b6c4fbe5ccc6..a11fb8be7daa 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h @@ -2,7 +2,7 @@ /* * Copyright (c) International Business Machines Corp., 2002, 2007 * Copyright (c) SUSE LLC, 2022 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French * Enzo Matsumiya */ diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index bbc02fea2181..ab01f13aafc7 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) International Business Machines Corp., 2002,2008 - * Author(s): Steve French (sfrench@us.ibm.com) - * Jeremy Allison (jra@samba.org) + * Author(s): Steve French + * Jeremy Allison */ #ifndef _CIFS_GLOB_H #define _CIFS_GLOB_H diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h index c280677f6358..fdb9ee427790 100644 --- a/fs/cifs/cifspdu.h +++ b/fs/cifs/cifspdu.h @@ -1,7 +1,7 @@ // SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) International Business Machines Corp., 2002,2009 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French */ #ifndef _CIFSPDU_H diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 049a1ba7e297..d7cf1fae3af5 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) International Business Machines Corp., 2002,2010 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French * * Contains the routines for constructing the SMB PDUs themselves */ diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 6ebfe8b9ce80..5a6b4c02a6bc 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) International Business Machines Corp., 2002,2011 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French */ #include #include diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index 3783889a9dc5..13124b9c737d 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -3,7 +3,7 @@ * vfs operations that deal with dentries * * Copyright (c) International Business Machines Corp., 2002,2009 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French */ #include #include diff --git a/fs/cifs/dns_resolve.c b/fs/cifs/dns_resolve.c index 8af13d34f627..c2e3c0b8ae70 100644 --- a/fs/cifs/dns_resolve.c +++ b/fs/cifs/dns_resolve.c @@ -1,10 +1,10 @@ // SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) 2007 Igor Mammedov - * Author(s): Igor Mammedov (niallain@gmail.com) - * Steve French (sfrench@us.ibm.com) - * Wang Lei (wang840925@gmail.com) - * David Howells (dhowells@redhat.com) + * Author(s): Igor Mammedov + * Steve French + * Wang Lei + * David Howells * * Contains the CIFS DFS upcall routines used for hostname to * IP address translation. diff --git a/fs/cifs/dns_resolve.h b/fs/cifs/dns_resolve.h index dee549bba4c7..91af52ceed67 100644 --- a/fs/cifs/dns_resolve.h +++ b/fs/cifs/dns_resolve.h @@ -4,7 +4,7 @@ * Handles host name to IP address resolution * * Copyright (c) International Business Machines Corp., 2008 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French */ #ifndef _DNS_RESOLVE_H diff --git a/fs/cifs/export.c b/fs/cifs/export.c index bf9b0361c497..5c9290d55e02 100644 --- a/fs/cifs/export.c +++ b/fs/cifs/export.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) International Business Machines Corp., 2007 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French * * Common Internet FileSystem (CIFS) client * diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 01f3b1db129f..4d9eb64ad855 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -3,8 +3,8 @@ * vfs operations that deal with files * * Copyright (c) International Business Machines Corp., 2002,2010 - * Author(s): Steve French (sfrench@us.ibm.com) - * Jeremy Allison (jra@samba.org) + * Author(s): Steve French + * Jeremy Allison */ #include #include diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 687237571c11..6a42ab16755f 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) International Business Machines Corp., 2002,2010 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French */ #include #include diff --git a/fs/cifs/ioctl.c b/fs/cifs/ioctl.c index d2de957df2de..7365abf170a4 100644 --- a/fs/cifs/ioctl.c +++ b/fs/cifs/ioctl.c @@ -3,7 +3,7 @@ * vfs operations that deal with io control * * Copyright (c) International Business Machines Corp., 2005,2013 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French */ #include diff --git a/fs/cifs/link.c b/fs/cifs/link.c index 6b9ff8f8d122..2990697916a3 100644 --- a/fs/cifs/link.c +++ b/fs/cifs/link.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) International Business Machines Corp., 2002,2008 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French */ #include #include diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c index 944d073edad8..62e7871d0f2b 100644 --- a/fs/cifs/misc.c +++ b/fs/cifs/misc.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) International Business Machines Corp., 2002,2008 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French */ #include diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c index 7cd52ea80a90..06f3ba5b05e3 100644 --- a/fs/cifs/netmisc.c +++ b/fs/cifs/netmisc.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) International Business Machines Corp., 2002,2008 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French * * Error mapping routines from Samba libsmb/errormap.c * Copyright (c) Andrew Tridgell 2001 diff --git a/fs/cifs/ntlmssp.h b/fs/cifs/ntlmssp.h index 69111c35719b..fa8dcfee89ed 100644 --- a/fs/cifs/ntlmssp.h +++ b/fs/cifs/ntlmssp.h @@ -1,7 +1,7 @@ // SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) International Business Machines Corp., 2002,2007 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French */ #define NTLMSSP_SIGNATURE "NTLMSSP" diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index 79c8c443a2ce..14546c32021d 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c @@ -4,7 +4,7 @@ * * Copyright (c) International Business Machines Corp., 2004, 2008 * Copyright (c) Red Hat, Inc., 2011 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French */ #include #include diff --git a/fs/cifs/rfc1002pdu.h b/fs/cifs/rfc1002pdu.h index 09110b34b74b..6060a87fa97f 100644 --- a/fs/cifs/rfc1002pdu.h +++ b/fs/cifs/rfc1002pdu.h @@ -3,7 +3,7 @@ * Protocol Data Unit definitions for RFC 1001/1002 support * * Copyright (c) International Business Machines Corp., 2004 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French */ /* NB: unlike smb/cifs packets, the RFC1002 structures are big endian */ diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index b07be54846e4..2d2066e292e1 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c @@ -3,7 +3,7 @@ * SMB/CIFS session setup handling routines * * Copyright (c) International Business Machines Corp., 2006, 2009 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French */ #include "cifspdu.h" diff --git a/fs/cifs/smb2file.c b/fs/cifs/smb2file.c index f80f2e989ffe..739207751999 100644 --- a/fs/cifs/smb2file.c +++ b/fs/cifs/smb2file.c @@ -1,8 +1,8 @@ // SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) International Business Machines Corp., 2002, 2011 - * Author(s): Steve French (sfrench@us.ibm.com), - * Pavel Shilovsky ((pshilovsky@samba.org) 2012 + * Author(s): Steve French , + * Pavel Shilovsky <(pshilovsky@samba.org> 2012 */ #include #include diff --git a/fs/cifs/smb2glob.h b/fs/cifs/smb2glob.h index bb91031423e0..563222b34fd1 100644 --- a/fs/cifs/smb2glob.h +++ b/fs/cifs/smb2glob.h @@ -4,9 +4,9 @@ * * Copyright (c) International Business Machines Corp., 2002, 2011 * Etersoft, 2012 - * Author(s): Steve French (sfrench@us.ibm.com) - * Jeremy Allison (jra@samba.org) - * Pavel Shilovsky (pshilovsky@samba.org) 2012 + * Author(s): Steve French + * Jeremy Allison + * Pavel Shilovsky 2012 */ #ifndef _SMB2_GLOB_H #define _SMB2_GLOB_H diff --git a/fs/cifs/smb2inode.c b/fs/cifs/smb2inode.c index 75925d119bb9..e68cc6ebf765 100644 --- a/fs/cifs/smb2inode.c +++ b/fs/cifs/smb2inode.c @@ -2,8 +2,8 @@ /* * Copyright (c) International Business Machines Corp., 2002, 2011 * Etersoft, 2012 - * Author(s): Pavel Shilovsky (pshilovsky@samba.org), - * Steve French (sfrench@us.ibm.com) + * Author(s): Pavel Shilovsky , + * Steve French */ #include #include diff --git a/fs/cifs/smb2maperror.c b/fs/cifs/smb2maperror.c index 3ae0c1296d22..4d39abf54234 100644 --- a/fs/cifs/smb2maperror.c +++ b/fs/cifs/smb2maperror.c @@ -3,7 +3,7 @@ * Functions which do error mapping of SMB2 status codes to POSIX errors * * Copyright (c) International Business Machines Corp., 2009 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French */ #include #include "cifsglob.h" diff --git a/fs/cifs/smb2misc.c b/fs/cifs/smb2misc.c index 577b0537541d..2183907ce8d8 100644 --- a/fs/cifs/smb2misc.c +++ b/fs/cifs/smb2misc.c @@ -2,8 +2,8 @@ /* * Copyright (c) International Business Machines Corp., 2002,2011 * Etersoft, 2012 - * Author(s): Steve French (sfrench@us.ibm.com) - * Pavel Shilovsky (pshilovsky@samba.org) 2012 + * Author(s): Steve French + * Pavel Shilovsky 2012 */ #include #include "cifsglob.h" diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index a0019a46104e..45f3db4da860 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -2,8 +2,8 @@ /* * Copyright (c) International Business Machines Corp., 2009, 2013 * Etersoft, 2012 - * Author(s): Steve French (sfrench@us.ibm.com) - * Pavel Shilovsky (pshilovsky@samba.org) 2012 + * Author(s): Steve French + * Pavel Shilovsky 2012 * * Contains the routines for constructing the SMB2 PDUs themselves */ diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h index ac72d34e1e67..b9d6c0fc8cbd 100644 --- a/fs/cifs/smb2pdu.h +++ b/fs/cifs/smb2pdu.h @@ -2,8 +2,8 @@ /* * Copyright (c) International Business Machines Corp., 2009, 2013 * Etersoft, 2012 - * Author(s): Steve French (sfrench@us.ibm.com) - * Pavel Shilovsky (pshilovsky@samba.org) 2012 + * Author(s): Steve French + * Pavel Shilovsky 2012 */ #ifndef _SMB2PDU_H diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h index a80aceb8b78c..0cd765107f17 100644 --- a/fs/cifs/smb2proto.h +++ b/fs/cifs/smb2proto.h @@ -2,8 +2,8 @@ /* * Copyright (c) International Business Machines Corp., 2002, 2011 * Etersoft, 2012 - * Author(s): Steve French (sfrench@us.ibm.com) - * Pavel Shilovsky (pshilovsky@samba.org) 2012 + * Author(s): Steve French + * Pavel Shilovsky 2012 */ #ifndef _SMB2PROTO_H #define _SMB2PROTO_H diff --git a/fs/cifs/smb2status.h b/fs/cifs/smb2status.h index 940c07590a00..a561c0d0fa52 100644 --- a/fs/cifs/smb2status.h +++ b/fs/cifs/smb2status.h @@ -4,7 +4,7 @@ * Definitions are from MS-ERREF * * Copyright (c) International Business Machines Corp., 2009,2011 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French */ /* diff --git a/fs/cifs/smb2transport.c b/fs/cifs/smb2transport.c index 1a0ceecd5170..01b81532c874 100644 --- a/fs/cifs/smb2transport.c +++ b/fs/cifs/smb2transport.c @@ -2,9 +2,9 @@ /* * Copyright (c) International Business Machines Corp., 2002, 2011 * Etersoft, 2012 - * Author(s): Steve French (sfrench@us.ibm.com) - * Jeremy Allison (jra@samba.org) 2006 - * Pavel Shilovsky (pshilovsky@samba.org) 2012 + * Author(s): Steve French + * Jeremy Allison 2006 + * Pavel Shilovsky 2012 */ #include diff --git a/fs/cifs/smbencrypt.c b/fs/cifs/smbencrypt.c index 0214092d2714..8824191ec1e6 100644 --- a/fs/cifs/smbencrypt.c +++ b/fs/cifs/smbencrypt.c @@ -6,8 +6,8 @@ Copyright (C) Andrew Tridgell 1992-2000 Copyright (C) Luke Kenneth Casson Leighton 1996-2000 Modified by Jeremy Allison 1995. - Copyright (C) Andrew Bartlett 2002-2003 - Modified by Steve French (sfrench@us.ibm.com) 2002-2003 + Copyright (c) Andrew Bartlett 2002-2003 + Modified by Steve French 2002-2003 */ diff --git a/fs/cifs/smberr.h b/fs/cifs/smberr.h index 514739487331..483c4575865f 100644 --- a/fs/cifs/smberr.h +++ b/fs/cifs/smberr.h @@ -1,7 +1,7 @@ // SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) International Business Machines Corp., 2002,2004 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French * * See Error Codes section of the SNIA CIFS Specification * for more information diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index 8d24f7d5cd49..9d3407699c88 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c @@ -1,8 +1,8 @@ // SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) International Business Machines Corp., 2002,2008 - * Author(s): Steve French (sfrench@us.ibm.com) - * Jeremy Allison (jra@samba.org) 2006. + * Author(s): Steve French + * Jeremy Allison 2006. */ #include diff --git a/fs/cifs/xattr.c b/fs/cifs/xattr.c index 531bf9d1a2f9..7a1aa2107d10 100644 --- a/fs/cifs/xattr.c +++ b/fs/cifs/xattr.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) International Business Machines Corp., 2003, 2007 - * Author(s): Steve French (sfrench@us.ibm.com) + * Author(s): Steve French */ #include