diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 00:15:42 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 00:15:42 -0500 |
| commit | 9468482bd4c3b89abe04a770848d5eaa1ea830b0 (patch) | |
| tree | 7bac4349702c6414e78d83e6d6febd633177f52a /fs/cifs/cifsfs.h | |
| parent | 551a10c7fc14640d484ee3dda699758041d8123f (diff) | |
| parent | 8af18971584d1e05770560206cfdfd1d6ba8a17f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] on reconnect to Samba - reset the unix capabilities
[CIFS] Allow update of EOF on remote extend of file
[CIFS] POSIX CIFS Extensions (continued) - POSIX Open
[CIFS] Additional POSIX CIFS Extensions infolevels
Diffstat (limited to 'fs/cifs/cifsfs.h')
| -rw-r--r-- | fs/cifs/cifsfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h index 01ae24af9cfd..c97c08eb481a 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h | |||
| @@ -100,5 +100,5 @@ extern ssize_t cifs_getxattr(struct dentry *, const char *, void *, size_t); | |||
| 100 | extern ssize_t cifs_listxattr(struct dentry *, char *, size_t); | 100 | extern ssize_t cifs_listxattr(struct dentry *, char *, size_t); |
| 101 | extern int cifs_ioctl (struct inode * inode, struct file * filep, | 101 | extern int cifs_ioctl (struct inode * inode, struct file * filep, |
| 102 | unsigned int command, unsigned long arg); | 102 | unsigned int command, unsigned long arg); |
| 103 | #define CIFS_VERSION "1.47" | 103 | #define CIFS_VERSION "1.48" |
| 104 | #endif /* _CIFSFS_H */ | 104 | #endif /* _CIFSFS_H */ |