From 3a8d0567037d108b946b4a8ee83bc19beb9b7d34 Mon Sep 17 00:00:00 2001 From: Steve French Date: Thu, 9 Jul 2009 22:51:38 +0000 Subject: [PATCH] --- yaml --- r: 155155 b: refs/heads/master c: b77863bfa153e886f9f8faf1a791ba57a36efed0 h: refs/heads/master i: 155153: 82b3799418a6b7b953b6eb35df2311835f91a1e2 155151: 0464d435a309a133addad59fee1b8614c6f48f24 v: v3 --- [refs] | 2 +- trunk/fs/cifs/CHANGES | 6 +++++- trunk/fs/cifs/cifsfs.h | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2efca47fd506..44a69c352946 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bbeeb3c93a961bd01b969dd4395ecac0c09db8d +refs/heads/master: b77863bfa153e886f9f8faf1a791ba57a36efed0 diff --git a/trunk/fs/cifs/CHANGES b/trunk/fs/cifs/CHANGES index 3a9b7a58a51d..92888aa90749 100644 --- a/trunk/fs/cifs/CHANGES +++ b/trunk/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/trunk/fs/cifs/cifsfs.h b/trunk/fs/cifs/cifsfs.h index 586df24c9abb..6c170948300d 100644 --- a/trunk/fs/cifs/cifsfs.h +++ b/trunk/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 */