diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2013-02-06 04:20:20 -0500 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2013-02-13 10:28:54 -0500 |
commit | 1f68233c52e9f2bb53130a0063bc1e6864f6d204 (patch) | |
tree | af84a80e7ad103bf674cbc8c8a8f3ad38915bd31 /fs/cifs/cifsfs.c | |
parent | 3da46565043a3d7b9fd5c924e7de2d3e65e9d2a9 (diff) |
cifs: Convert struct cifs_sb_info to use kuids and kgids
Cc: Steve French <smfrench@gmail.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'fs/cifs/cifsfs.c')
-rw-r--r-- | fs/cifs/cifsfs.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index f653835d067b..17590731786d 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
@@ -376,13 +376,15 @@ cifs_show_options(struct seq_file *s, struct dentry *root) | |||
376 | (int)(srcaddr->sa_family)); | 376 | (int)(srcaddr->sa_family)); |
377 | } | 377 | } |
378 | 378 | ||
379 | seq_printf(s, ",uid=%u", cifs_sb->mnt_uid); | 379 | seq_printf(s, ",uid=%u", |
380 | from_kuid_munged(&init_user_ns, cifs_sb->mnt_uid)); | ||
380 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_UID) | 381 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_UID) |
381 | seq_printf(s, ",forceuid"); | 382 | seq_printf(s, ",forceuid"); |
382 | else | 383 | else |
383 | seq_printf(s, ",noforceuid"); | 384 | seq_printf(s, ",noforceuid"); |
384 | 385 | ||
385 | seq_printf(s, ",gid=%u", cifs_sb->mnt_gid); | 386 | seq_printf(s, ",gid=%u", |
387 | from_kgid_munged(&init_user_ns, cifs_sb->mnt_gid)); | ||
386 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID) | 388 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID) |
387 | seq_printf(s, ",forcegid"); | 389 | seq_printf(s, ",forcegid"); |
388 | else | 390 | else |
@@ -437,9 +439,13 @@ cifs_show_options(struct seq_file *s, struct dentry *root) | |||
437 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM) | 439 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM) |
438 | seq_printf(s, ",noperm"); | 440 | seq_printf(s, ",noperm"); |
439 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPUID) | 441 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPUID) |
440 | seq_printf(s, ",backupuid=%u", cifs_sb->mnt_backupuid); | 442 | seq_printf(s, ",backupuid=%u", |
443 | from_kuid_munged(&init_user_ns, | ||
444 | cifs_sb->mnt_backupuid)); | ||
441 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPGID) | 445 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPGID) |
442 | seq_printf(s, ",backupgid=%u", cifs_sb->mnt_backupgid); | 446 | seq_printf(s, ",backupgid=%u", |
447 | from_kgid_munged(&init_user_ns, | ||
448 | cifs_sb->mnt_backupgid)); | ||
443 | 449 | ||
444 | seq_printf(s, ",rsize=%u", cifs_sb->rsize); | 450 | seq_printf(s, ",rsize=%u", cifs_sb->rsize); |
445 | seq_printf(s, ",wsize=%u", cifs_sb->wsize); | 451 | seq_printf(s, ",wsize=%u", cifs_sb->wsize); |