diff options
Diffstat (limited to 'fs/cifs/inode.c')
-rw-r--r-- | fs/cifs/inode.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index d4cf7509c106..737643940540 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
@@ -1249,14 +1249,14 @@ cifs_mkdir_qinfo(struct inode *parent, struct dentry *dentry, umode_t mode, | |||
1249 | .device = 0, | 1249 | .device = 0, |
1250 | }; | 1250 | }; |
1251 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) { | 1251 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) { |
1252 | args.uid = (__u64)current_fsuid(); | 1252 | args.uid = current_fsuid(); |
1253 | if (parent->i_mode & S_ISGID) | 1253 | if (parent->i_mode & S_ISGID) |
1254 | args.gid = (__u64)parent->i_gid; | 1254 | args.gid = parent->i_gid; |
1255 | else | 1255 | else |
1256 | args.gid = (__u64)current_fsgid(); | 1256 | args.gid = current_fsgid(); |
1257 | } else { | 1257 | } else { |
1258 | args.uid = NO_CHANGE_64; | 1258 | args.uid = INVALID_UID; /* no change */ |
1259 | args.gid = NO_CHANGE_64; | 1259 | args.gid = INVALID_GID; /* no change */ |
1260 | } | 1260 | } |
1261 | CIFSSMBUnixSetPathInfo(xid, tcon, full_path, &args, | 1261 | CIFSSMBUnixSetPathInfo(xid, tcon, full_path, &args, |
1262 | cifs_sb->local_nls, | 1262 | cifs_sb->local_nls, |
@@ -2017,12 +2017,12 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs) | |||
2017 | if (attrs->ia_valid & ATTR_UID) | 2017 | if (attrs->ia_valid & ATTR_UID) |
2018 | args->uid = attrs->ia_uid; | 2018 | args->uid = attrs->ia_uid; |
2019 | else | 2019 | else |
2020 | args->uid = NO_CHANGE_64; | 2020 | args->uid = INVALID_UID; /* no change */ |
2021 | 2021 | ||
2022 | if (attrs->ia_valid & ATTR_GID) | 2022 | if (attrs->ia_valid & ATTR_GID) |
2023 | args->gid = attrs->ia_gid; | 2023 | args->gid = attrs->ia_gid; |
2024 | else | 2024 | else |
2025 | args->gid = NO_CHANGE_64; | 2025 | args->gid = INVALID_GID; /* no change */ |
2026 | 2026 | ||
2027 | if (attrs->ia_valid & ATTR_ATIME) | 2027 | if (attrs->ia_valid & ATTR_ATIME) |
2028 | args->atime = cifs_UnixTimeToNT(attrs->ia_atime); | 2028 | args->atime = cifs_UnixTimeToNT(attrs->ia_atime); |