[CIFS] Fix minor merge conflict in fs/cifs/dir.c