summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2009-07-09 22:51:38 +0000
committerSteve French <sfrench@us.ibm.com>2009-07-09 22:51:38 +0000
commitb77863bfa153e886f9f8faf1a791ba57a36efed0 (patch)
tree72b97cd304a58b46ba5cf80e4d4549d289d73594 /fs
parent3bbeeb3c93a961bd01b969dd4395ecac0c09db8d (diff)
downloadlinux-3.10-b77863bfa153e886f9f8faf1a791ba57a36efed0.tar.gz
linux-3.10-b77863bfa153e886f9f8faf1a791ba57a36efed0.tar.bz2
linux-3.10-b77863bfa153e886f9f8faf1a791ba57a36efed0.zip
[CIFS] update cifs version number
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/CHANGES6
-rw-r--r--fs/cifs/cifsfs.h2
2 files changed, 6 insertions, 2 deletions
diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES
index 3a9b7a58a51..92888aa9074 100644
--- a/fs/cifs/CHANGES
+++ b/fs/cifs/CHANGES
@@ -5,7 +5,11 @@ client generated ones by default (mount option "serverino" turned
on by default if server supports it). Add forceuid and forcegid
mount options (so that when negotiating unix extensions specifying
which uid mounted does not immediately force the server's reported
-uids to be overridden). Add support for scope moutn parm.
+uids to be overridden). Add support for scope mount parm. Improve
+hard link detection to use same inode for both. Do not set
+read-only dos attribute on directories (for chmod) since Windows
+explorer special cases this attribute bit for directories for
+a different purpose.
Version 1.58
------------
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
index 586df24c9ab..6c170948300 100644
--- a/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
@@ -113,5 +113,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg);
extern const struct export_operations cifs_export_ops;
#endif /* EXPERIMENTAL */
-#define CIFS_VERSION "1.59"
+#define CIFS_VERSION "1.60"
#endif /* _CIFSFS_H */