Commit 8a1eaa6a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a044a1b1 f534dc99

fs/cifs/misc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -720,7 +720,7 @@ void 
cifs_autodisable_serverino(struct cifs_sb_info *cifs_sb)

cifs_autodisable_serverino(struct cifs_sb_info *cifs_sb)

{

{

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) {

	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 "

		cERROR(1, ("Autodisabling the use of server inode numbers on "

			   "%s. This server doesn't seem to support them "

			   "%s. This server doesn't seem to support them "

			   "properly. Hardlinks will not be recognized on this "

			   "properly. Hardlinks will not be recognized on this "