fs/cifs: squashed updates from upstream 3.4.x