Commit 1f9ccaab authored by Steve French's avatar Steve French

Fix cifs_show_options to display mount options in a way that is more

consistent with other filesystems
parent afbf875b
Version 0.76
------------
Clean up options displayed in /proc/mounts by show_options to
be more consistent with other filesystems.
Version 0.75
------------
Fix delete of readonly file to Windows servers. Reflect
......
......@@ -22,7 +22,7 @@ struct cifs_sb_info {
struct cifsTconInfo *tcon; /* primary mount */
struct list_head nested_tcon_q;
struct nls_table *local_nls;
unsigned int rsize;
unsigned int wsize;
unsigned int rsize;
unsigned int wsize;
};
#endif /* _CIFS_FS_SB_H */
......@@ -209,8 +209,8 @@ cifs_destroy_inode(struct inode *inode)
/*
* cifs_show_options() is for displaying mount options in /proc/mounts.
* It tries to avoid showing settings that were not changed from their
* defaults.
* Not all settable options are displayed but most of the important
* ones are.
*/
static int
cifs_show_options(struct seq_file *s, struct vfsmount *m)
......@@ -219,15 +219,19 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)
cifs_sb = CIFS_SB(m->mnt_sb);
if (cifs_sb)
if (cifs_sb) {
if (cifs_sb->tcon) {
seq_printf(s, ", TARGET: %s ", cifs_sb->tcon->treeName);
seq_printf(s, "FS TYPE: %s ",
cifs_sb->tcon->nativeFileSystem);
seq_printf(s, ",unc=%s", cifs_sb->tcon->treeName);
if (cifs_sb->tcon->ses->userName)
seq_printf(s, " USER: %s ",
seq_printf(s, ",username=%s",
cifs_sb->tcon->ses->userName);
if(cifs_sb->tcon->ses->domainName)
seq_printf(s, ",domain=%s",
cifs_sb->tcon->ses->domainName);
}
seq_printf(s, ",rsize=%d",cifs_sb->rsize);
seq_printf(s, ",wsize=%d",cifs_sb->wsize);
}
return 0;
}
......
......@@ -157,8 +157,8 @@ struct cifsSesInfo {
int capabilities;
char serverName[SERVER_NAME_LEN_WITH_NULL * 2]; /* BB make bigger for tcp names - will ipv6 and sctp addresses fit here?? */
char userName[MAX_USERNAME_SIZE + 1];
char domainName[MAX_USERNAME_SIZE + 1];
char password_with_pad[CIFS_ENCPWD_SIZE];
char domainName[MAX_USERNAME_SIZE + 1];
char password_with_pad[CIFS_ENCPWD_SIZE];
};
/*
......
......@@ -57,8 +57,8 @@ struct smb_vol {
mode_t file_mode;
mode_t dir_mode;
int rw;
unsigned int rsize;
unsigned int wsize;
unsigned int rsize;
unsigned int wsize;
unsigned short int port;
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment