Skip to content

Commit c19204c

Browse files
committed
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) <[email protected]> Reviewed-by: Germano Percossi <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent d406d26 commit c19204c

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

fs/cifs/cifs_ioctl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ struct smb3_notify_info {
108108
#define CIFS_IOC_NOTIFY _IOW(CIFS_IOCTL_MAGIC, 9, struct smb3_notify)
109109
#define CIFS_DUMP_FULL_KEY _IOWR(CIFS_IOCTL_MAGIC, 10, struct smb3_full_key_debug_info)
110110
#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)
112112

113113
/*
114114
* Flags for going down operation

fs/cifs/cifsfs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ extern int cifs_lock(struct file *, int, struct file_lock *);
105105
extern int cifs_fsync(struct file *, loff_t, loff_t, int);
106106
extern int cifs_strict_fsync(struct file *, loff_t, loff_t, int);
107107
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);
110110
extern const struct file_operations cifs_dir_ops;
111111
extern int cifs_dir_open(struct inode *inode, struct file *file);
112112
extern int cifs_readdir(struct file *file, struct dir_context *ctx);

fs/cifs/cifsglob.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -785,6 +785,7 @@ static inline unsigned int
785785
in_flight(struct TCP_Server_Info *server)
786786
{
787787
unsigned int num;
788+
788789
spin_lock(&server->req_lock);
789790
num = server->in_flight;
790791
spin_unlock(&server->req_lock);
@@ -795,6 +796,7 @@ static inline bool
795796
has_credits(struct TCP_Server_Info *server, int *credits, int num_credits)
796797
{
797798
int num;
799+
798800
spin_lock(&server->req_lock);
799801
num = *credits;
800802
spin_unlock(&server->req_lock);
@@ -1025,7 +1027,7 @@ struct cifs_ses {
10251027
struct TCP_Server_Info *server; /* pointer to server info */
10261028
int ses_count; /* reference counter */
10271029
enum ses_status_enum ses_status; /* updates protected by cifs_tcp_ses_lock */
1028-
unsigned overrideSecFlg; /* if non-zero override global sec flags */
1030+
unsigned int overrideSecFlg; /* if non-zero override global sec flags */
10291031
char *serverOS; /* name of operating system underlying server */
10301032
char *serverNOS; /* name of network operating system of server */
10311033
char *serverDomain; /* security realm of server */
@@ -1381,7 +1383,7 @@ struct cifsFileInfo {
13811383
__u32 pid; /* process id who opened file */
13821384
struct cifs_fid fid; /* file id from remote */
13831385
struct list_head rlist; /* reconnect list */
1384-
/* BB add lock scope info here if needed */ ;
1386+
/* BB add lock scope info here if needed */
13851387
/* lock scope id (0 if none) */
13861388
struct dentry *dentry;
13871389
struct tcon_link *tlink;
@@ -1769,6 +1771,7 @@ static inline void free_dfs_info_array(struct dfs_info3_param *param,
17691771
int number_of_items)
17701772
{
17711773
int i;
1774+
17721775
if ((number_of_items == 0) || (param == NULL))
17731776
return;
17741777
for (i = 0; i < number_of_items; i++) {

0 commit comments

Comments
 (0)