diff options
author | Sachin Prabhu <sprabhu@redhat.com> | 2012-04-24 10:28:14 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2012-04-24 12:36:22 -0400 |
commit | 3c7c87fd5bd71f57c68a64d11a15170d0dc4f7aa (patch) | |
tree | 0bc095535ad62f5cd235a856f1e190fb7a4b6c6e | |
parent | 3af9d8f227a31e25b3110ef175d105798fc147a6 (diff) |
CIFS: Show backupuid/gid in /proc/mounts
Show backupuid/backupgid in /proc/mounts for cifs shares mounted with
the backupuid/backupgid feature.
Also consolidate the two separate checks for
pvolume_info->backupuid_specified into a single if condition in
cifs_setup_cifs_sb().
Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
-rw-r--r-- | fs/cifs/cifsfs.c | 4 | ||||
-rw-r--r-- | fs/cifs/connect.c | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index d34212822444..ea8eb92b65b4 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
@@ -434,6 +434,10 @@ cifs_show_options(struct seq_file *s, struct dentry *root) | |||
434 | seq_printf(s, ",noperm"); | 434 | seq_printf(s, ",noperm"); |
435 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO) | 435 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO) |
436 | seq_printf(s, ",strictcache"); | 436 | seq_printf(s, ",strictcache"); |
437 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPUID) | ||
438 | seq_printf(s, ",backupuid=%u", cifs_sb->mnt_backupuid); | ||
439 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPGID) | ||
440 | seq_printf(s, ",backupgid=%u", cifs_sb->mnt_backupgid); | ||
437 | 441 | ||
438 | seq_printf(s, ",rsize=%d", cifs_sb->rsize); | 442 | seq_printf(s, ",rsize=%d", cifs_sb->rsize); |
439 | seq_printf(s, ",wsize=%d", cifs_sb->wsize); | 443 | seq_printf(s, ",wsize=%d", cifs_sb->wsize); |
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index f31dc9ac37b7..f4d381e331ce 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
@@ -3228,10 +3228,6 @@ void cifs_setup_cifs_sb(struct smb_vol *pvolume_info, | |||
3228 | 3228 | ||
3229 | cifs_sb->mnt_uid = pvolume_info->linux_uid; | 3229 | cifs_sb->mnt_uid = pvolume_info->linux_uid; |
3230 | cifs_sb->mnt_gid = pvolume_info->linux_gid; | 3230 | cifs_sb->mnt_gid = pvolume_info->linux_gid; |
3231 | if (pvolume_info->backupuid_specified) | ||
3232 | cifs_sb->mnt_backupuid = pvolume_info->backupuid; | ||
3233 | if (pvolume_info->backupgid_specified) | ||
3234 | cifs_sb->mnt_backupgid = pvolume_info->backupgid; | ||
3235 | cifs_sb->mnt_file_mode = pvolume_info->file_mode; | 3231 | cifs_sb->mnt_file_mode = pvolume_info->file_mode; |
3236 | cifs_sb->mnt_dir_mode = pvolume_info->dir_mode; | 3232 | cifs_sb->mnt_dir_mode = pvolume_info->dir_mode; |
3237 | cFYI(1, "file mode: 0x%hx dir mode: 0x%hx", | 3233 | cFYI(1, "file mode: 0x%hx dir mode: 0x%hx", |
@@ -3262,10 +3258,14 @@ void cifs_setup_cifs_sb(struct smb_vol *pvolume_info, | |||
3262 | cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_RWPIDFORWARD; | 3258 | cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_RWPIDFORWARD; |
3263 | if (pvolume_info->cifs_acl) | 3259 | if (pvolume_info->cifs_acl) |
3264 | cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_CIFS_ACL; | 3260 | cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_CIFS_ACL; |
3265 | if (pvolume_info->backupuid_specified) | 3261 | if (pvolume_info->backupuid_specified) { |
3266 | cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_CIFS_BACKUPUID; | 3262 | cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_CIFS_BACKUPUID; |
3267 | if (pvolume_info->backupgid_specified) | 3263 | cifs_sb->mnt_backupuid = pvolume_info->backupuid; |
3264 | } | ||
3265 | if (pvolume_info->backupgid_specified) { | ||
3268 | cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_CIFS_BACKUPGID; | 3266 | cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_CIFS_BACKUPGID; |
3267 | cifs_sb->mnt_backupgid = pvolume_info->backupgid; | ||
3268 | } | ||
3269 | if (pvolume_info->override_uid) | 3269 | if (pvolume_info->override_uid) |
3270 | cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_OVERR_UID; | 3270 | cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_OVERR_UID; |
3271 | if (pvolume_info->override_gid) | 3271 | if (pvolume_info->override_gid) |