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

diff --combined fs/Kconfig
index 488521ed9e9bdfd2e000263e626aa643aebe3e81,d57f363ea1abae60428b795108566fca881f9625..a722b5a3f752f1701c4f172fb1ac94dd8c576836
--- 1/fs/Kconfig
--- 2/fs/Kconfig
+++ b/fs/Kconfig
@@@ -426,6 -426,7 +426,6 @@@ config OCFS2_F
        select CONFIGFS_FS
        select JBD
        select CRC32
 -      select INET
        help
          OCFS2 is a general purpose extent based shared disk cluster file
          system with many similarities to ext3. It supports 64 bit inode
@@@ -674,6 -675,12 +674,6 @@@ config ZISOF
          necessary to create such a filesystem.  Say Y here if you want to be
          able to read such compressed CD-ROMs.
  
 -config ZISOFS_FS
 -# for fs/nls/Config.in
 -      tristate
 -      depends on ZISOFS
 -      default ISO9660_FS
 -
  config UDF_FS
        tristate "UDF file system support"
        help
@@@ -1088,7 -1095,7 +1088,7 @@@ config AFFS_F
  
  config ECRYPT_FS
        tristate "eCrypt filesystem layer support (EXPERIMENTAL)"
 -      depends on EXPERIMENTAL && KEYS && CRYPTO
 +      depends on EXPERIMENTAL && KEYS && CRYPTO && NET
        help
          Encrypted filesystem that operates on the VFS layer.  See
          <file:Documentation/ecryptfs.txt> to learn more about
@@@ -1864,20 -1871,14 +1864,14 @@@ config CIF
          file servers such as Windows 2000 (including Windows 2003, NT 4  
          and Windows XP) as well by Samba (which provides excellent CIFS
          server support for Linux and many other operating systems). Limited
-         support for Windows ME and similar servers is provided as well. 
-         You must use the smbfs client filesystem to access older SMB servers
-         such as OS/2 and DOS.
+         support for OS/2 and Windows ME and similar servers is provided as well.
  
          The intent of the cifs module is to provide an advanced
-         network file system client for mounting to CIFS compliant servers, 
+         network file system client for mounting to CIFS compliant servers,
          including support for dfs (hierarchical name space), secure per-user
          session establishment, safe distributed caching (oplock), optional
-         packet signing, Unicode and other internationalization improvements, 
-         and optional Winbind (nsswitch) integration. You do not need to enable
-         cifs if running only a (Samba) server. It is possible to enable both
-         smbfs and cifs (e.g. if you are using CIFS for accessing Windows 2003
-         and Samba 3 servers, and smbfs for accessing old servers). If you need 
-         to mount to Samba or Windows from this machine, say Y.
+         packet signing, Unicode and other internationalization improvements. 
+         If you need to mount to Samba or Windows from this machine, say Y.
  
  config CIFS_STATS
          bool "CIFS statistics"
@@@ -1970,14 -1971,13 +1964,13 @@@ config CIFS_EXPERIMENTA
          depends on CIFS && EXPERIMENTAL
          help
            Enables cifs features under testing. These features are
-           experimental and currently include support for writepages
-           (multipage writebehind performance improvements) and directory
-           change notification ie fcntl(F_DNOTIFY) as well as some security
-           improvements.  Some also depend on setting at runtime the
-           pseudo-file /proc/fs/cifs/Experimental (which is disabled by
-           default). See the file fs/cifs/README for more details.
- 
-           If unsure, say N.
+           experimental and currently include DFS support and directory 
+           change notification ie fcntl(F_DNOTIFY), as well as the upcall
+           mechanism which will be used for Kerberos session negotiation
+           and uid remapping.  Some of these features also may depend on 
+           setting a value of 1 to the pseudo-file /proc/fs/cifs/Experimental
+           (which is disabled by default). See the file fs/cifs/README 
+           for more details.  If unsure, say N.
  
  config CIFS_UPCALL
          bool "Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)"

diff --combined fs/cifs/cifsfs.h
index 01ae24af9cfdca48a55ca21acb086d9c4b5a444a,e36b0d43e90941789e09a7d6488cde5ce53ac9c2..c97c08eb481a38b926a63f039b27ad57068c2b78
--- 1/fs/cifs/cifsfs.h
--- 2/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
@@@ -36,13 -36,13 +36,13 @@@ extern const struct address_space_opera
  extern const struct address_space_operations cifs_addr_ops_smallbuf;
  
  /* Functions related to super block operations */
 -/* extern struct super_operations cifs_super_ops;*/
 +/* extern const struct super_operations cifs_super_ops;*/
  extern void cifs_read_inode(struct inode *);
  extern void cifs_delete_inode(struct inode *);
  /* extern void cifs_write_inode(struct inode *); *//* BB not needed yet */
  
  /* Functions related to inodes */
 -extern struct inode_operations cifs_dir_inode_ops;
 +extern const 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 *,
@@@ -58,8 -58,8 +58,8 @@@ extern int cifs_revalidate(struct dentr
  extern int cifs_getattr(struct vfsmount *, struct dentry *, struct kstat *);
  extern int cifs_setattr(struct dentry *, struct iattr *);
  
 -extern struct inode_operations cifs_file_inode_ops;
 -extern struct inode_operations cifs_symlink_inode_ops;
 +extern const struct inode_operations cifs_file_inode_ops;
 +extern const struct inode_operations cifs_symlink_inode_ops;
  
  /* Functions related to files and directories */
  extern const struct file_operations cifs_file_ops;
@@@ -100,5 -100,5 +100,5 @@@ extern ssize_t     cifs_getxattr(struct den
  extern ssize_t        cifs_listxattr(struct dentry *, char *, size_t);
  extern int cifs_ioctl (struct inode * inode, struct file * filep,
                       unsigned int command, unsigned long arg);
- #define CIFS_VERSION   "1.47"
+ #define CIFS_VERSION   "1.48"
  #endif                                /* _CIFSFS_H */