Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c629eaf8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4bbbf13f 28f88810

fs/cifs/cifsfs.c

+8 −4
Original line number Diff line number Diff line
@@ -370,13 +370,13 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 
				   (int)(srcaddr->sa_family));

	}



	seq_printf(s, ",uid=%d", cifs_sb->mnt_uid);

	seq_printf(s, ",uid=%u", cifs_sb->mnt_uid);

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_UID)

		seq_printf(s, ",forceuid");

	else

		seq_printf(s, ",noforceuid");



	seq_printf(s, ",gid=%d", cifs_sb->mnt_gid);

	seq_printf(s, ",gid=%u", cifs_sb->mnt_gid);

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID)

		seq_printf(s, ",forcegid");

	else
@@ -434,9 +434,13 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 
		seq_printf(s, ",noperm");

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO)

		seq_printf(s, ",strictcache");

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPUID)

		seq_printf(s, ",backupuid=%u", cifs_sb->mnt_backupuid);

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPGID)

		seq_printf(s, ",backupgid=%u", cifs_sb->mnt_backupgid);



	seq_printf(s, ",rsize=%d", cifs_sb->rsize);

	seq_printf(s, ",wsize=%d", cifs_sb->wsize);

	seq_printf(s, ",rsize=%u", cifs_sb->rsize);

	seq_printf(s, ",wsize=%u", cifs_sb->wsize);

	/* convert actimeo and display it in seconds */

		seq_printf(s, ",actimeo=%lu", cifs_sb->actimeo / HZ);

fs/cifs/connect.c

+6 −6
Original line number Diff line number Diff line
@@ -3228,10 +3228,6 @@ void cifs_setup_cifs_sb(struct smb_vol *pvolume_info, 


	cifs_sb->mnt_uid = pvolume_info->linux_uid;

	cifs_sb->mnt_gid = pvolume_info->linux_gid;

	if (pvolume_info->backupuid_specified)

		cifs_sb->mnt_backupuid = pvolume_info->backupuid;

	if (pvolume_info->backupgid_specified)

		cifs_sb->mnt_backupgid = pvolume_info->backupgid;

	cifs_sb->mnt_file_mode = pvolume_info->file_mode;

	cifs_sb->mnt_dir_mode = pvolume_info->dir_mode;

	cFYI(1, "file mode: 0x%hx  dir mode: 0x%hx",
@@ -3262,10 +3258,14 @@ void cifs_setup_cifs_sb(struct smb_vol *pvolume_info, 
		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_RWPIDFORWARD;

	if (pvolume_info->cifs_acl)

		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_CIFS_ACL;

	if (pvolume_info->backupuid_specified)

	if (pvolume_info->backupuid_specified) {

		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_CIFS_BACKUPUID;

	if (pvolume_info->backupgid_specified)

		cifs_sb->mnt_backupuid = pvolume_info->backupuid;

	}

	if (pvolume_info->backupgid_specified) {

		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_CIFS_BACKUPGID;

		cifs_sb->mnt_backupgid = pvolume_info->backupgid;

	}

	if (pvolume_info->override_uid)

		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_OVERR_UID;

	if (pvolume_info->override_gid)

fs/cifs/file.c

+2 −1
Original line number Diff line number Diff line
@@ -2178,7 +2178,7 @@ cifs_iovec_write(struct file *file, const struct iovec *iov, 
	unsigned long nr_pages, i;

	size_t copied, len, cur_len;

	ssize_t total_written = 0;

	loff_t offset = *poffset;

	loff_t offset;

	struct iov_iter it;

	struct cifsFileInfo *open_file;

	struct cifs_tcon *tcon;
@@ -2200,6 +2200,7 @@ cifs_iovec_write(struct file *file, const struct iovec *iov, 
	cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);

	open_file = file->private_data;

	tcon = tlink_tcon(open_file->tlink);

	offset = *poffset;



	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD)

		pid = open_file->pid;