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

Commit 9c488de2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 

Pull CIFS fixes from Steve French:
 "Two small cifs fixes"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  [CIFS] mount option sec=none not displayed properly in /proc/mounts
  CIFS: fix type confusion in copy offload ioctl
parents 57e6bbcb eda2116f

fs/cifs/cifsfs.c

+4 −1
Original line number Diff line number Diff line
@@ -325,8 +325,11 @@ cifs_show_address(struct seq_file *s, struct TCP_Server_Info *server) 
static void

cifs_show_security(struct seq_file *s, struct cifs_ses *ses)

{

	if (ses->sectype == Unspecified)

	if (ses->sectype == Unspecified) {

		if (ses->user_name == NULL)

			seq_puts(s, ",sec=none");

		return;

	}



	seq_puts(s, ",sec=");

fs/cifs/ioctl.c

+6 −0
Original line number Diff line number Diff line
@@ -67,6 +67,12 @@ static long cifs_ioctl_clone(unsigned int xid, struct file *dst_file, 
		goto out_drop_write;

	}



	if (src_file.file->f_op->unlocked_ioctl != cifs_ioctl) {

		rc = -EBADF;

		cifs_dbg(VFS, "src file seems to be from a different filesystem type\n");

		goto out_fput;

	}



	if ((!src_file.file->private_data) || (!dst_file->private_data)) {

		rc = -EBADF;

		cifs_dbg(VFS, "missing cifsFileInfo on copy range src file\n");