Skip to content

Commit

Permalink
cifs: minor kernel style fixes for comments
Browse files Browse the repository at this point in the history
Trivial fix for a few comments which didn't follow kernel style

Signed-off-by: Steve French <stfrench@microsoft.com>
  • Loading branch information
Steve French committed Dec 14, 2020
1 parent e73a42e commit bc04499
Showing 1 changed file with 15 additions and 10 deletions.
25 changes: 15 additions & 10 deletions fs/cifs/connect.c
Original file line number Diff line number Diff line change
Expand Up @@ -1024,9 +1024,9 @@ cifs_demultiplex_thread(void *p)
module_put_and_exit(0);
}

/** Returns true if srcaddr isn't specified and rhs isn't
* specified, or if srcaddr is specified and
* matches the IP address of the rhs argument.
/**
* Returns true if srcaddr isn't specified and rhs isn't specified, or
* if srcaddr is specified and matches the IP address of the rhs argument
*/
bool
cifs_match_ipaddr(struct sockaddr *srcaddr, struct sockaddr *rhs)
Expand Down Expand Up @@ -2544,15 +2544,17 @@ ip_connect(struct TCP_Server_Info *server)
void reset_cifs_unix_caps(unsigned int xid, struct cifs_tcon *tcon,
struct cifs_sb_info *cifs_sb, struct smb3_fs_context *ctx)
{
/* if we are reconnecting then should we check to see if
/*
* If we are reconnecting then should we check to see if
* any requested capabilities changed locally e.g. via
* remount but we can not do much about it here
* if they have (even if we could detect it by the following)
* Perhaps we could add a backpointer to array of sb from tcon
* or if we change to make all sb to same share the same
* sb as NFS - then we only have one backpointer to sb.
* What if we wanted to mount the server share twice once with
* and once without posixacls or posix paths? */
* and once without posixacls or posix paths?
*/
__u64 saved_cap = le64_to_cpu(tcon->fsUnixInfo.Capability);

if (ctx && ctx->no_linux_ext) {
Expand All @@ -2571,11 +2573,15 @@ void reset_cifs_unix_caps(unsigned int xid, struct cifs_tcon *tcon,
if (!CIFSSMBQFSUnixInfo(xid, tcon)) {
__u64 cap = le64_to_cpu(tcon->fsUnixInfo.Capability);
cifs_dbg(FYI, "unix caps which server supports %lld\n", cap);
/* check for reconnect case in which we do not
want to change the mount behavior if we can avoid it */
/*
* check for reconnect case in which we do not
* want to change the mount behavior if we can avoid it
*/
if (ctx == NULL) {
/* turn off POSIX ACL and PATHNAMES if not set
originally at mount time */
/*
* turn off POSIX ACL and PATHNAMES if not set
* originally at mount time
*/
if ((saved_cap & CIFS_UNIX_POSIX_ACL_CAP) == 0)
cap &= ~CIFS_UNIX_POSIX_ACL_CAP;
if ((saved_cap & CIFS_UNIX_POSIX_PATHNAMES_CAP) == 0) {
Expand Down Expand Up @@ -2977,7 +2983,6 @@ build_unc_path_to_root(const struct smb3_fs_context *ctx,
/**
* expand_dfs_referral - Perform a dfs referral query and update the cifs_sb
*
*
* If a referral is found, cifs_sb->ctx->mount_options will be (re-)allocated
* to a string containing updated options for the submount. Otherwise it
* will be left untouched.
Expand Down

0 comments on commit bc04499

Please sign in to comment.