Merge branch 'cifs-3.2' of git://git.samba.org/jlayton/linux into temp-3.2-jeff

diff --combined fs/cifs/cifsfs.c
index 96a48ba,fa67245..f219dcc
--- 1/fs/cifs/cifsfs.c
--- 2/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@@ -74,7 -74,7 +74,7 @@@ module_param(cifs_min_small, int, 0)
  MODULE_PARM_DESC(cifs_min_small, "Small network buffers in pool. Default: 30 "
                                 "Range: 2 to 256");
  unsigned int cifs_max_pending = CIFS_MAX_REQ;
- module_param(cifs_max_pending, int, 0);
+ module_param(cifs_max_pending, int, 0444);
  MODULE_PARM_DESC(cifs_max_pending, "Simultaneous requests to server. "
                                   "Default: 50 Range: 2 to 256");
  unsigned short echo_retries = 5;
@@@ -436,10 -436,6 +436,10 @@@ cifs_show_options(struct seq_file *s, s
                seq_printf(s, ",mfsymlinks");
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_FSCACHE)
                seq_printf(s, ",fsc");
 +      if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOSSYNC)
 +              seq_printf(s, ",nostrictsync");
 +      if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM)
 +              seq_printf(s, ",noperm");
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO)
                seq_printf(s, ",strictcache");