Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

cifs: minor cleanup of some headers

checkpatch showed formatting problems with extra spaces,
and extra semicolon and some missing blank lines in some
cifs headers.

Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Reviewed-by: Germano Percossi <germano.percossi@gmail.com>
Signed-off-by: Steve French <stfrench@microsoft.com>

+8 -5
+1 -1
fs/cifs/cifs_ioctl.h
··· 108 108 #define CIFS_IOC_NOTIFY _IOW(CIFS_IOCTL_MAGIC, 9, struct smb3_notify) 109 109 #define CIFS_DUMP_FULL_KEY _IOWR(CIFS_IOCTL_MAGIC, 10, struct smb3_full_key_debug_info) 110 110 #define CIFS_IOC_NOTIFY_INFO _IOWR(CIFS_IOCTL_MAGIC, 11, struct smb3_notify_info) 111 - #define CIFS_IOC_SHUTDOWN _IOR ('X', 125, __u32) 111 + #define CIFS_IOC_SHUTDOWN _IOR('X', 125, __u32) 112 112 113 113 /* 114 114 * Flags for going down operation
+2 -2
fs/cifs/cifsfs.h
··· 105 105 extern int cifs_fsync(struct file *, loff_t, loff_t, int); 106 106 extern int cifs_strict_fsync(struct file *, loff_t, loff_t, int); 107 107 extern int cifs_flush(struct file *, fl_owner_t id); 108 - extern int cifs_file_mmap(struct file * , struct vm_area_struct *); 109 - extern int cifs_file_strict_mmap(struct file * , struct vm_area_struct *); 108 + extern int cifs_file_mmap(struct file *file, struct vm_area_struct *vma); 109 + extern int cifs_file_strict_mmap(struct file *file, struct vm_area_struct *vma); 110 110 extern const struct file_operations cifs_dir_ops; 111 111 extern int cifs_dir_open(struct inode *inode, struct file *file); 112 112 extern int cifs_readdir(struct file *file, struct dir_context *ctx);
+5 -2
fs/cifs/cifsglob.h
··· 785 785 in_flight(struct TCP_Server_Info *server) 786 786 { 787 787 unsigned int num; 788 + 788 789 spin_lock(&server->req_lock); 789 790 num = server->in_flight; 790 791 spin_unlock(&server->req_lock); ··· 796 795 has_credits(struct TCP_Server_Info *server, int *credits, int num_credits) 797 796 { 798 797 int num; 798 + 799 799 spin_lock(&server->req_lock); 800 800 num = *credits; 801 801 spin_unlock(&server->req_lock); ··· 1027 1025 struct TCP_Server_Info *server; /* pointer to server info */ 1028 1026 int ses_count; /* reference counter */ 1029 1027 enum ses_status_enum ses_status; /* updates protected by cifs_tcp_ses_lock */ 1030 - unsigned overrideSecFlg; /* if non-zero override global sec flags */ 1028 + unsigned int overrideSecFlg; /* if non-zero override global sec flags */ 1031 1029 char *serverOS; /* name of operating system underlying server */ 1032 1030 char *serverNOS; /* name of network operating system of server */ 1033 1031 char *serverDomain; /* security realm of server */ ··· 1383 1381 __u32 pid; /* process id who opened file */ 1384 1382 struct cifs_fid fid; /* file id from remote */ 1385 1383 struct list_head rlist; /* reconnect list */ 1386 - /* BB add lock scope info here if needed */ ; 1384 + /* BB add lock scope info here if needed */ 1387 1385 /* lock scope id (0 if none) */ 1388 1386 struct dentry *dentry; 1389 1387 struct tcon_link *tlink; ··· 1771 1769 int number_of_items) 1772 1770 { 1773 1771 int i; 1772 + 1774 1773 if ((number_of_items == 0) || (param == NULL)) 1775 1774 return; 1776 1775 for (i = 0; i < number_of_items; i++) {