aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2008-05-16 23:12:45 -0400
committerSteve French <sfrench@us.ibm.com>2008-05-16 23:12:45 -0400
commit2b280fab12b6697b6a7a24a13aaf9f4339edd075 (patch)
tree01f92bf0c17c62111e62b988b6823140a89a0391
parenta1fe78f16eac7d03d3c391dd5d54559826574982 (diff)
[CIFS] add more complete mount options to cifs_show_options
adds various options to cifs_show_options (displayed when you cat /proc/mounts with a cifs mount). I limited the new ones to values that are associated with the mount with the exception of "seal" (which is a per tree connection property, but I thought was important enough to show through). Eventually cifs's parse_mount_options also needs to be rewritten to use the match_token API but that would be a big enough change that I would prefer that changing parse_mount_options wait until next release. Signed-off-by: Steve French <sfrench@us.ibm.com>
-rw-r--r--fs/cifs/cifsfs.c31
1 files changed, 30 insertions, 1 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index b6436b888cf9..57e40c49d3b6 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * fs/cifs/cifsfs.c 2 * fs/cifs/cifsfs.c
3 * 3 *
4 * Copyright (C) International Business Machines Corp., 2002,2007 4 * Copyright (C) International Business Machines Corp., 2002,2008
5 * Author(s): Steve French (sfrench@us.ibm.com) 5 * Author(s): Steve French (sfrench@us.ibm.com)
6 * 6 *
7 * Common Internet FileSystem (CIFS) client 7 * Common Internet FileSystem (CIFS) client
@@ -353,9 +353,38 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)
353 if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID) || 353 if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID) ||
354 !(cifs_sb->tcon->unix_ext)) 354 !(cifs_sb->tcon->unix_ext))
355 seq_printf(s, ",gid=%d", cifs_sb->mnt_gid); 355 seq_printf(s, ",gid=%d", cifs_sb->mnt_gid);
356 if (!cifs_sb->tcon->unix_ext) {
357 seq_printf(s, ",file_mode=0%o,dir_mode=0%o",
358 cifs_sb->mnt_file_mode,
359 cifs_sb->mnt_dir_mode);
360 }
361 if (cifs_sb->tcon->seal)
362 seq_printf(s, ",seal");
363 seq_printf(s, ",nocase");
356 } 364 }
357 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) 365 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS)
358 seq_printf(s, ",posixpaths"); 366 seq_printf(s, ",posixpaths");
367 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID)
368 seq_printf(s, ",setuids");
369 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM)
370 seq_printf(s, ",serverino");
371 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DIRECT_IO)
372 seq_printf(s, ",directio");
373 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_XATTR)
374 seq_printf(s, ",nouser_xattr");
375 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR)
376 seq_printf(s, ",mapchars");
377 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL)
378 seq_printf(s, ",sfu");
379 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL)
380 seq_printf(s, ",nobrl");
381 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL)
382 seq_printf(s, ",cifsacl");
383 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DYNPERM)
384 seq_printf(s, ",dynperm");
385 if (m->mnt_sb->s_flags & MS_POSIXACL)
386 seq_printf(s, ",acl");
387
359 seq_printf(s, ",rsize=%d", cifs_sb->rsize); 388 seq_printf(s, ",rsize=%d", cifs_sb->rsize);
360 seq_printf(s, ",wsize=%d", cifs_sb->wsize); 389 seq_printf(s, ",wsize=%d", cifs_sb->wsize);
361 } 390 }