Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French.
* git://git.samba.org/sfrench/cifs-2.6:
Use correct conversion specifiers in cifs_show_options
CIFS: Show backupuid/gid in /proc/mounts
cifs: fix offset handling in cifs_iovec_write
+16
-11
+8
-4
fs/cifs/cifsfs.c
+8
-4
fs/cifs/cifsfs.c
···
370
370
(int)(srcaddr->sa_family));
371
371
}
372
372
373
-
seq_printf(s, ",uid=%d", cifs_sb->mnt_uid);
373
+
seq_printf(s, ",uid=%u", cifs_sb->mnt_uid);
374
374
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_UID)
375
375
seq_printf(s, ",forceuid");
376
376
else
377
377
seq_printf(s, ",noforceuid");
378
378
379
-
seq_printf(s, ",gid=%d", cifs_sb->mnt_gid);
379
+
seq_printf(s, ",gid=%u", cifs_sb->mnt_gid);
380
380
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID)
381
381
seq_printf(s, ",forcegid");
382
382
else
···
434
434
seq_printf(s, ",noperm");
435
435
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO)
436
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);
439
-
seq_printf(s, ",wsize=%d", cifs_sb->wsize);
442
+
seq_printf(s, ",rsize=%u", cifs_sb->rsize);
443
+
seq_printf(s, ",wsize=%u", cifs_sb->wsize);
440
444
/* convert actimeo and display it in seconds */
441
445
seq_printf(s, ",actimeo=%lu", cifs_sb->actimeo / HZ);
442
446
+6
-6
fs/cifs/connect.c
+6
-6
fs/cifs/connect.c
···
3228
3228
3229
3229
cifs_sb->mnt_uid = pvolume_info->linux_uid;
3230
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
3231
cifs_sb->mnt_file_mode = pvolume_info->file_mode;
3236
3232
cifs_sb->mnt_dir_mode = pvolume_info->dir_mode;
3237
3233
cFYI(1, "file mode: 0x%hx dir mode: 0x%hx",
···
3258
3262
cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_RWPIDFORWARD;
3259
3263
if (pvolume_info->cifs_acl)
3260
3264
cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_CIFS_ACL;
3261
-
if (pvolume_info->backupuid_specified)
3265
+
if (pvolume_info->backupuid_specified) {
3262
3266
cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_CIFS_BACKUPUID;
3263
-
if (pvolume_info->backupgid_specified)
3267
+
cifs_sb->mnt_backupuid = pvolume_info->backupuid;
3268
+
}
3269
+
if (pvolume_info->backupgid_specified) {
3264
3270
cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_CIFS_BACKUPGID;
3271
+
cifs_sb->mnt_backupgid = pvolume_info->backupgid;
3272
+
}
3265
3273
if (pvolume_info->override_uid)
3266
3274
cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_OVERR_UID;
3267
3275
if (pvolume_info->override_gid)
+2
-1
fs/cifs/file.c
+2
-1
fs/cifs/file.c
···
2178
2178
unsigned long nr_pages, i;
2179
2179
size_t copied, len, cur_len;
2180
2180
ssize_t total_written = 0;
2181
-
loff_t offset = *poffset;
2181
+
loff_t offset;
2182
2182
struct iov_iter it;
2183
2183
struct cifsFileInfo *open_file;
2184
2184
struct cifs_tcon *tcon;
···
2200
2200
cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
2201
2201
open_file = file->private_data;
2202
2202
tcon = tlink_tcon(open_file->tlink);
2203
+
offset = *poffset;
2203
2204
2204
2205
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD)
2205
2206
pid = open_file->pid;