git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cifs: don't allow mmap'ed pages to be dirtied while under writeback (try #3)
[pandora-kernel.git]
/
fs
/
cifs
/
cifsfs.c
diff --git
a/fs/cifs/cifsfs.c
b/fs/cifs/cifsfs.c
index
f297013
..
5c412b3
100644
(file)
--- a/
fs/cifs/cifsfs.c
+++ b/
fs/cifs/cifsfs.c
@@
-53,7
+53,6
@@
int cifsFYI = 0;
int cifsERROR = 1;
int traceSMB = 0;
unsigned int oplockEnabled = 1;
int cifsERROR = 1;
int traceSMB = 0;
unsigned int oplockEnabled = 1;
-unsigned int experimEnabled = 0;
unsigned int linuxExtEnabled = 1;
unsigned int lookupCacheEnabled = 1;
unsigned int multiuser_mount = 0;
unsigned int linuxExtEnabled = 1;
unsigned int lookupCacheEnabled = 1;
unsigned int multiuser_mount = 0;
@@
-127,6
+126,7
@@
cifs_read_super(struct super_block *sb, void *data,
kfree(cifs_sb);
return rc;
}
kfree(cifs_sb);
return rc;
}
+ cifs_sb->bdi.ra_pages = default_backing_dev_info.ra_pages;
#ifdef CONFIG_CIFS_DFS_UPCALL
/* copy mount params to sb for use in submounts */
#ifdef CONFIG_CIFS_DFS_UPCALL
/* copy mount params to sb for use in submounts */
@@
-409,8
+409,8
@@
cifs_show_options(struct seq_file *s, struct vfsmount *m)
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MULTIUSER)
seq_printf(s, ",multiuser");
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MULTIUSER)
seq_printf(s, ",multiuser");
- else if (tcon->ses->user
N
ame)
- seq_printf(s, ",username=%s", tcon->ses->user
N
ame);
+ else if (tcon->ses->user
_n
ame)
+ seq_printf(s, ",username=%s", tcon->ses->user
_n
ame);
if (tcon->ses->domainName)
seq_printf(s, ",domain=%s", tcon->ses->domainName);
if (tcon->ses->domainName)
seq_printf(s, ",domain=%s", tcon->ses->domainName);