summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-17 09:20:38 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-17 09:20:38 -0800
commit8a1eaa6a5697c4554ecacbd021c668f51318c09e (patch)
tree2c840949d6a7b538228ded831753d659bf8cd628
parenta044a1b147a1c967e1a4b797c3e24c395f3d878a (diff)
parentf534dc994397560343be4a3223b9bbaa8e739e1f (diff)
downloadlinux-3.10-8a1eaa6a5697c4554ecacbd021c668f51318c09e.tar.gz
linux-3.10-8a1eaa6a5697c4554ecacbd021c668f51318c09e.tar.bz2
linux-3.10-8a1eaa6a5697c4554ecacbd021c668f51318c09e.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: clear server inode number flag while autodisabling
-rw-r--r--fs/cifs/misc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
index 1e25efcb55c..d27d4ec6579 100644
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@ -720,7 +720,7 @@ void
cifs_autodisable_serverino(struct cifs_sb_info *cifs_sb)
{
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) {
- cifs_sb->mnt_cifs_flags &= CIFS_MOUNT_SERVER_INUM;
+ cifs_sb->mnt_cifs_flags &= ~CIFS_MOUNT_SERVER_INUM;
cERROR(1, ("Autodisabling the use of server inode numbers on "
"%s. This server doesn't seem to support them "
"properly. Hardlinks will not be recognized on this "