ChangeSet 1.2194, 2005/03/22 22:51:15-06:00, [EMAIL PROTECTED]
[CIFS] clean up source code formatting
Signed-off-by: Steve French ([EMAIL PROTECTED])
CHANGES | 7 +++++++
cifsencrypt.h | 2 +-
cifsfs.h | 11 +++++++----
ntlmssp.h | 2 +-
4 files changed, 16 insertions(+), 6 deletions(-)
diff -Nru a/fs/cifs/CHANGES b/fs/cifs/CHANGES
--- a/fs/cifs/CHANGES 2005-03-30 12:09:14 -08:00
+++ b/fs/cifs/CHANGES 2005-03-30 12:09:14 -08:00
@@ -1,3 +1,10 @@
+Version 1.31
+------------
+Fix oops in ls when Transact2 FindFirst (or FindNext) returns more than one
+transact response for an SMB request and search entry split across two frames.
+Fix updates of DOS attributes and time fields so that files on NT4 servers
+do not get marked delete on close.
+
Version 1.30
------------
Allow new nouser_xattr mount parm to disable xattr support for user namespace.
diff -Nru a/fs/cifs/cifsencrypt.h b/fs/cifs/cifsencrypt.h
--- a/fs/cifs/cifsencrypt.h 2005-03-30 12:09:14 -08:00
+++ b/fs/cifs/cifsencrypt.h 2005-03-30 12:09:14 -08:00
@@ -28,7 +28,7 @@
extern void E_P16(unsigned char *p14, unsigned char *p16);
extern void E_P24(unsigned char *p21, unsigned char *c8, unsigned char *p24);
extern void D_P16(unsigned char *p14, unsigned char *in, unsigned char *out);
-extern void E_old_pw_hash(unsigned char *p14, unsigned char *in, unsigned char
*out);
+extern void E_old_pw_hash(unsigned char *, unsigned char *, unsigned char *);
diff -Nru a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
--- a/fs/cifs/cifsfs.h 2005-03-30 12:09:14 -08:00
+++ b/fs/cifs/cifsfs.h 2005-03-30 12:09:14 -08:00
@@ -42,8 +42,10 @@
/* Functions related to inodes */
extern struct inode_operations cifs_dir_inode_ops;
-extern int cifs_create(struct inode *, struct dentry *, int, struct nameidata
*);
-extern struct dentry *cifs_lookup(struct inode *, struct dentry *, struct
nameidata *);
+extern int cifs_create(struct inode *, struct dentry *, int,
+ struct nameidata *);
+extern struct dentry * cifs_lookup(struct inode *, struct dentry *,
+ struct nameidata *);
extern int cifs_unlink(struct inode *, struct dentry *);
extern int cifs_hardlink(struct dentry *, struct inode *, struct dentry *);
extern int cifs_mknod(struct inode *, struct dentry *, int, dev_t);
@@ -82,7 +84,8 @@
/* Functions related to symlinks */
extern int cifs_follow_link(struct dentry *direntry, struct nameidata *nd);
extern void cifs_put_link(struct dentry *direntry, struct nameidata *nd);
-extern int cifs_readlink(struct dentry *direntry, char __user *buffer, int
buflen);
+extern int cifs_readlink(struct dentry *direntry, char __user *buffer,
+ int buflen);
extern int cifs_symlink(struct inode *inode, struct dentry *direntry,
const char *symname);
extern int cifs_removexattr(struct dentry *, const char *);
@@ -90,5 +93,5 @@
size_t, int);
extern ssize_t cifs_getxattr(struct dentry *, const char *, void *, size_t);
extern ssize_t cifs_listxattr(struct dentry *, char *, size_t);
-#define CIFS_VERSION "1.30"
+#define CIFS_VERSION "1.31"
#endif /* _CIFSFS_H */
diff -Nru a/fs/cifs/ntlmssp.h b/fs/cifs/ntlmssp.h
--- a/fs/cifs/ntlmssp.h 2005-03-30 12:09:14 -08:00
+++ b/fs/cifs/ntlmssp.h 2005-03-30 12:09:14 -08:00
@@ -35,7 +35,7 @@
#define NTLMSSP_NEGOTIATE_SIGN 0x0010 // Request signature capability
#define NTLMSSP_NEGOTIATE_SEAL 0x0020 // Request confidentiality
#define NTLMSSP_NEGOTIATE_DGRAM 0x0040
-#define NTLMSSP_NEGOTIATE_LM_KEY 0x0080 // Use LM session key for
sign/seal
+#define NTLMSSP_NEGOTIATE_LM_KEY 0x0080 // Use LM session key for
sign/seal
#define NTLMSSP_NEGOTIATE_NTLM 0x0200 // NTLM authentication
#define NTLMSSP_NEGOTIATE_DOMAIN_SUPPLIED 0x1000
#define NTLMSSP_NEGOTIATE_WORKSTATION_SUPPLIED 0x2000
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
