[CIFS] Cleanup various minor breakage in previous cFYI cleanup

Signed-off-by: Steve French <sfrench@us.ibm.com>

diff --cc fs/cifs/cifsfs.h
Simple merge

diff --cc fs/cifs/cifssmb.c
Simple merge

diff --cc fs/cifs/file.c
Simple merge

diff --cc fs/cifs/inode.c
Simple merge