diff options
| -rw-r--r-- | fs/cifs/cifsfs.c | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 3ef0299ed43e..be66533c0f58 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
| @@ -298,7 +298,7 @@ cifs_show_address(struct seq_file *s, struct TCP_Server_Info *server) | |||
| 298 | struct sockaddr_in *sa = (struct sockaddr_in *) &server->dstaddr; | 298 | struct sockaddr_in *sa = (struct sockaddr_in *) &server->dstaddr; |
| 299 | struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *) &server->dstaddr; | 299 | struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *) &server->dstaddr; |
| 300 | 300 | ||
| 301 | seq_printf(s, ",addr="); | 301 | seq_puts(s, ",addr="); |
| 302 | 302 | ||
| 303 | switch (server->dstaddr.ss_family) { | 303 | switch (server->dstaddr.ss_family) { |
| 304 | case AF_INET: | 304 | case AF_INET: |
| @@ -310,7 +310,7 @@ cifs_show_address(struct seq_file *s, struct TCP_Server_Info *server) | |||
| 310 | seq_printf(s, "%%%u", sa6->sin6_scope_id); | 310 | seq_printf(s, "%%%u", sa6->sin6_scope_id); |
| 311 | break; | 311 | break; |
| 312 | default: | 312 | default: |
| 313 | seq_printf(s, "(unknown)"); | 313 | seq_puts(s, "(unknown)"); |
| 314 | } | 314 | } |
| 315 | } | 315 | } |
| 316 | 316 | ||
| @@ -320,45 +320,45 @@ cifs_show_security(struct seq_file *s, struct cifs_ses *ses) | |||
| 320 | if (ses->sectype == Unspecified) | 320 | if (ses->sectype == Unspecified) |
| 321 | return; | 321 | return; |
| 322 | 322 | ||
| 323 | seq_printf(s, ",sec="); | 323 | seq_puts(s, ",sec="); |
| 324 | 324 | ||
| 325 | switch (ses->sectype) { | 325 | switch (ses->sectype) { |
| 326 | case LANMAN: | 326 | case LANMAN: |
| 327 | seq_printf(s, "lanman"); | 327 | seq_puts(s, "lanman"); |
| 328 | break; | 328 | break; |
| 329 | case NTLMv2: | 329 | case NTLMv2: |
| 330 | seq_printf(s, "ntlmv2"); | 330 | seq_puts(s, "ntlmv2"); |
| 331 | break; | 331 | break; |
| 332 | case NTLM: | 332 | case NTLM: |
| 333 | seq_printf(s, "ntlm"); | 333 | seq_puts(s, "ntlm"); |
| 334 | break; | 334 | break; |
| 335 | case Kerberos: | 335 | case Kerberos: |
| 336 | seq_printf(s, "krb5"); | 336 | seq_puts(s, "krb5"); |
| 337 | break; | 337 | break; |
| 338 | case RawNTLMSSP: | 338 | case RawNTLMSSP: |
| 339 | seq_printf(s, "ntlmssp"); | 339 | seq_puts(s, "ntlmssp"); |
| 340 | break; | 340 | break; |
| 341 | default: | 341 | default: |
| 342 | /* shouldn't ever happen */ | 342 | /* shouldn't ever happen */ |
| 343 | seq_printf(s, "unknown"); | 343 | seq_puts(s, "unknown"); |
| 344 | break; | 344 | break; |
| 345 | } | 345 | } |
| 346 | 346 | ||
| 347 | if (ses->sign) | 347 | if (ses->sign) |
| 348 | seq_printf(s, "i"); | 348 | seq_puts(s, "i"); |
| 349 | } | 349 | } |
| 350 | 350 | ||
| 351 | static void | 351 | static void |
| 352 | cifs_show_cache_flavor(struct seq_file *s, struct cifs_sb_info *cifs_sb) | 352 | cifs_show_cache_flavor(struct seq_file *s, struct cifs_sb_info *cifs_sb) |
| 353 | { | 353 | { |
| 354 | seq_printf(s, ",cache="); | 354 | seq_puts(s, ",cache="); |
| 355 | 355 | ||
| 356 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO) | 356 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO) |
| 357 | seq_printf(s, "strict"); | 357 | seq_puts(s, "strict"); |
| 358 | else if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DIRECT_IO) | 358 | else if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DIRECT_IO) |
| 359 | seq_printf(s, "none"); | 359 | seq_puts(s, "none"); |
| 360 | else | 360 | else |
| 361 | seq_printf(s, "loose"); | 361 | seq_puts(s, "loose"); |
| 362 | } | 362 | } |
| 363 | 363 | ||
| 364 | static void | 364 | static void |
| @@ -391,7 +391,7 @@ cifs_show_options(struct seq_file *s, struct dentry *root) | |||
| 391 | cifs_show_cache_flavor(s, cifs_sb); | 391 | cifs_show_cache_flavor(s, cifs_sb); |
| 392 | 392 | ||
| 393 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MULTIUSER) | 393 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MULTIUSER) |
| 394 | seq_printf(s, ",multiuser"); | 394 | seq_puts(s, ",multiuser"); |
| 395 | else if (tcon->ses->user_name) | 395 | else if (tcon->ses->user_name) |
| 396 | seq_printf(s, ",username=%s", tcon->ses->user_name); | 396 | seq_printf(s, ",username=%s", tcon->ses->user_name); |
| 397 | 397 | ||
| @@ -417,16 +417,16 @@ cifs_show_options(struct seq_file *s, struct dentry *root) | |||
| 417 | seq_printf(s, ",uid=%u", | 417 | seq_printf(s, ",uid=%u", |
| 418 | from_kuid_munged(&init_user_ns, cifs_sb->mnt_uid)); | 418 | from_kuid_munged(&init_user_ns, cifs_sb->mnt_uid)); |
| 419 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_UID) | 419 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_UID) |
| 420 | seq_printf(s, ",forceuid"); | 420 | seq_puts(s, ",forceuid"); |
| 421 | else | 421 | else |
| 422 | seq_printf(s, ",noforceuid"); | 422 | seq_puts(s, ",noforceuid"); |
| 423 | 423 | ||
| 424 | seq_printf(s, ",gid=%u", | 424 | seq_printf(s, ",gid=%u", |
| 425 | from_kgid_munged(&init_user_ns, cifs_sb->mnt_gid)); | 425 | from_kgid_munged(&init_user_ns, cifs_sb->mnt_gid)); |
| 426 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID) | 426 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID) |
| 427 | seq_printf(s, ",forcegid"); | 427 | seq_puts(s, ",forcegid"); |
| 428 | else | 428 | else |
| 429 | seq_printf(s, ",noforcegid"); | 429 | seq_puts(s, ",noforcegid"); |
| 430 | 430 | ||
| 431 | cifs_show_address(s, tcon->ses->server); | 431 | cifs_show_address(s, tcon->ses->server); |
| 432 | 432 | ||
| @@ -438,47 +438,47 @@ cifs_show_options(struct seq_file *s, struct dentry *root) | |||
| 438 | cifs_show_nls(s, cifs_sb->local_nls); | 438 | cifs_show_nls(s, cifs_sb->local_nls); |
| 439 | 439 | ||
| 440 | if (tcon->seal) | 440 | if (tcon->seal) |
| 441 | seq_printf(s, ",seal"); | 441 | seq_puts(s, ",seal"); |
| 442 | if (tcon->nocase) | 442 | if (tcon->nocase) |
| 443 | seq_printf(s, ",nocase"); | 443 | seq_puts(s, ",nocase"); |
| 444 | if (tcon->retry) | 444 | if (tcon->retry) |
| 445 | seq_printf(s, ",hard"); | 445 | seq_puts(s, ",hard"); |
| 446 | if (tcon->unix_ext) | 446 | if (tcon->unix_ext) |
| 447 | seq_printf(s, ",unix"); | 447 | seq_puts(s, ",unix"); |
| 448 | else | 448 | else |
| 449 | seq_printf(s, ",nounix"); | 449 | seq_puts(s, ",nounix"); |
| 450 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) | 450 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) |
| 451 | seq_printf(s, ",posixpaths"); | 451 | seq_puts(s, ",posixpaths"); |
| 452 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) | 452 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) |
| 453 | seq_printf(s, ",setuids"); | 453 | seq_puts(s, ",setuids"); |
| 454 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) | 454 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) |
| 455 | seq_printf(s, ",serverino"); | 455 | seq_puts(s, ",serverino"); |
| 456 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD) | 456 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD) |
| 457 | seq_printf(s, ",rwpidforward"); | 457 | seq_puts(s, ",rwpidforward"); |
| 458 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) | 458 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) |
| 459 | seq_printf(s, ",forcemand"); | 459 | seq_puts(s, ",forcemand"); |
| 460 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_XATTR) | 460 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_XATTR) |
| 461 | seq_printf(s, ",nouser_xattr"); | 461 | seq_puts(s, ",nouser_xattr"); |
| 462 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR) | 462 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR) |
| 463 | seq_printf(s, ",mapchars"); | 463 | seq_puts(s, ",mapchars"); |
| 464 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) | 464 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) |
| 465 | seq_printf(s, ",sfu"); | 465 | seq_puts(s, ",sfu"); |
| 466 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL) | 466 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL) |
| 467 | seq_printf(s, ",nobrl"); | 467 | seq_puts(s, ",nobrl"); |
| 468 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) | 468 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) |
| 469 | seq_printf(s, ",cifsacl"); | 469 | seq_puts(s, ",cifsacl"); |
| 470 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DYNPERM) | 470 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DYNPERM) |
| 471 | seq_printf(s, ",dynperm"); | 471 | seq_puts(s, ",dynperm"); |
| 472 | if (root->d_sb->s_flags & MS_POSIXACL) | 472 | if (root->d_sb->s_flags & MS_POSIXACL) |
| 473 | seq_printf(s, ",acl"); | 473 | seq_puts(s, ",acl"); |
| 474 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS) | 474 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS) |
| 475 | seq_printf(s, ",mfsymlinks"); | 475 | seq_puts(s, ",mfsymlinks"); |
| 476 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_FSCACHE) | 476 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_FSCACHE) |
| 477 | seq_printf(s, ",fsc"); | 477 | seq_puts(s, ",fsc"); |
| 478 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOSSYNC) | 478 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOSSYNC) |
| 479 | seq_printf(s, ",nostrictsync"); | 479 | seq_puts(s, ",nostrictsync"); |
| 480 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM) | 480 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM) |
| 481 | seq_printf(s, ",noperm"); | 481 | seq_puts(s, ",noperm"); |
| 482 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPUID) | 482 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPUID) |
| 483 | seq_printf(s, ",backupuid=%u", | 483 | seq_printf(s, ",backupuid=%u", |
| 484 | from_kuid_munged(&init_user_ns, | 484 | from_kuid_munged(&init_user_ns, |
