diff options
author | Steve French <sfrench@us.ibm.com> | 2010-10-23 12:51:40 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2010-10-24 20:19:00 -0400 |
commit | 6c0f6218ba04a5d6e61d0c55b68e6c4ef0736531 (patch) | |
tree | 20575207bcaa90572a619483e763a3e4275845b3 /fs | |
parent | d3f1322af8f866be54ea79a4002fc30c98290411 (diff) |
[CIFS] Fix checkpatch warnings and bump cifs version number
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/cifs/cifsfs.h | 2 | ||||
-rw-r--r-- | fs/cifs/cifsglob.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h index f35795a16b42..897b2b2b28b5 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h | |||
@@ -112,5 +112,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); | |||
112 | extern const struct export_operations cifs_export_ops; | 112 | extern const struct export_operations cifs_export_ops; |
113 | #endif /* EXPERIMENTAL */ | 113 | #endif /* EXPERIMENTAL */ |
114 | 114 | ||
115 | #define CIFS_VERSION "1.67" | 115 | #define CIFS_VERSION "1.68" |
116 | #endif /* _CIFSFS_H */ | 116 | #endif /* _CIFSFS_H */ |
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 6319db025e7b..7128c291cec8 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h | |||
@@ -74,7 +74,7 @@ | |||
74 | * CIFS vfs client Status information (based on what we know.) | 74 | * CIFS vfs client Status information (based on what we know.) |
75 | */ | 75 | */ |
76 | 76 | ||
77 | /* associated with each tcp and smb session */ | 77 | /* associated with each tcp and smb session */ |
78 | enum statusEnum { | 78 | enum statusEnum { |
79 | CifsNew = 0, | 79 | CifsNew = 0, |
80 | CifsGood, | 80 | CifsGood, |
@@ -395,7 +395,7 @@ struct cifsFileInfo { | |||
395 | struct list_head llist; /* list of byte range locks we have. */ | 395 | struct list_head llist; /* list of byte range locks we have. */ |
396 | bool invalidHandle:1; /* file closed via session abend */ | 396 | bool invalidHandle:1; /* file closed via session abend */ |
397 | bool oplock_break_cancelled:1; | 397 | bool oplock_break_cancelled:1; |
398 | int count; /* refcount -- protected by cifs_file_list_lock */ | 398 | int count; /* refcount protected by cifs_file_list_lock */ |
399 | struct mutex fh_mutex; /* prevents reopen race after dead ses*/ | 399 | struct mutex fh_mutex; /* prevents reopen race after dead ses*/ |
400 | struct cifs_search_info srch_inf; | 400 | struct cifs_search_info srch_inf; |
401 | struct work_struct oplock_break; /* work for oplock breaks */ | 401 | struct work_struct oplock_break; /* work for oplock breaks */ |