Commit 372b1dbd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull cifs fixes from Steve French:
 "Most important fixes in this set include three SMB3 fixes for stable
  (including fix for possible kernel oops), and a workaround to allow
  writes to Mac servers (only cifs dialect, not more current SMB2.1,
  worked to Mac servers).  Also fallocate support added, and lease fix
  from Jeff"

* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
  [SMB3] Enable fallocate -z support for SMB3 mounts
  enable fallocate punch hole ("fallocate -p") for SMB3
  Incorrect error returned on setting file compressed on SMB2
  CIFS: Fix wrong directory attributes after rename
  CIFS: Fix SMB2 readdir error handling
  [CIFS] Possible null ptr deref in SMB2_tcon
  [CIFS] Workaround MacOS server problem with SMB2.1 write  response
  cifs: handle lease F_UNLCK requests properly
  Cleanup sparse file support by creating worker function for it
  Add sparse file support to SMB2/SMB3 mounts
  Add missing definitions for CIFS File System Attributes
  cifs: remove unused function cifs_oplock_break_wait
parents 92075f9f 30175628

fs/cifs/cifsfs.c

+22 −2
Original line number Diff line number Diff line
@@ -207,6 +207,19 @@ cifs_statfs(struct dentry *dentry, struct kstatfs *buf) 
	return 0;

}



static long cifs_fallocate(struct file *file, int mode, loff_t off, loff_t len)

{

	struct super_block *sb = file->f_path.dentry->d_sb;

	struct cifs_sb_info *cifs_sb = CIFS_SB(sb);

	struct cifs_tcon *tcon = cifs_sb_master_tcon(cifs_sb);

	struct TCP_Server_Info *server = tcon->ses->server;



	if (server->ops->fallocate)

		return server->ops->fallocate(file, tcon, mode, off, len);



	return -EOPNOTSUPP;

}



static int cifs_permission(struct inode *inode, int mask)

{

	struct cifs_sb_info *cifs_sb;
@@ -812,8 +825,9 @@ static int cifs_setlease(struct file *file, long arg, struct file_lock **lease) 
	if (!(S_ISREG(inode->i_mode)))

		return -EINVAL;



	/* check if file is oplocked */

	if (((arg == F_RDLCK) && CIFS_CACHE_READ(CIFS_I(inode))) ||

	/* Check if file is oplocked if this is request for new lease */

	if (arg == F_UNLCK ||

	    ((arg == F_RDLCK) && CIFS_CACHE_READ(CIFS_I(inode))) ||

	    ((arg == F_WRLCK) && CIFS_CACHE_WRITE(CIFS_I(inode))))

		return generic_setlease(file, arg, lease);

	else if (tlink_tcon(cfile->tlink)->local_lease &&
@@ -908,6 +922,7 @@ const struct file_operations cifs_file_ops = { 
	.unlocked_ioctl	= cifs_ioctl,

#endif /* CONFIG_CIFS_POSIX */

	.setlease = cifs_setlease,

	.fallocate = cifs_fallocate,

};



const struct file_operations cifs_file_strict_ops = {
@@ -927,6 +942,7 @@ const struct file_operations cifs_file_strict_ops = { 
	.unlocked_ioctl	= cifs_ioctl,

#endif /* CONFIG_CIFS_POSIX */

	.setlease = cifs_setlease,

	.fallocate = cifs_fallocate,

};



const struct file_operations cifs_file_direct_ops = {
@@ -947,6 +963,7 @@ const struct file_operations cifs_file_direct_ops = { 
#endif /* CONFIG_CIFS_POSIX */

	.llseek = cifs_llseek,

	.setlease = cifs_setlease,

	.fallocate = cifs_fallocate,

};



const struct file_operations cifs_file_nobrl_ops = {
@@ -965,6 +982,7 @@ const struct file_operations cifs_file_nobrl_ops = { 
	.unlocked_ioctl	= cifs_ioctl,

#endif /* CONFIG_CIFS_POSIX */

	.setlease = cifs_setlease,

	.fallocate = cifs_fallocate,

};



const struct file_operations cifs_file_strict_nobrl_ops = {
@@ -983,6 +1001,7 @@ const struct file_operations cifs_file_strict_nobrl_ops = { 
	.unlocked_ioctl	= cifs_ioctl,

#endif /* CONFIG_CIFS_POSIX */

	.setlease = cifs_setlease,

	.fallocate = cifs_fallocate,

};



const struct file_operations cifs_file_direct_nobrl_ops = {
@@ -1002,6 +1021,7 @@ const struct file_operations cifs_file_direct_nobrl_ops = { 
#endif /* CONFIG_CIFS_POSIX */

	.llseek = cifs_llseek,

	.setlease = cifs_setlease,

	.fallocate = cifs_fallocate,

};



const struct file_operations cifs_dir_ops = {

fs/cifs/cifsglob.h

+5 −0
Original line number Diff line number Diff line
@@ -409,6 +409,10 @@ struct smb_version_operations { 
	/* get mtu credits */

	int (*wait_mtu_credits)(struct TCP_Server_Info *, unsigned int,

				unsigned int *, unsigned int *);

	/* check if we need to issue closedir */

	bool (*dir_needs_close)(struct cifsFileInfo *);

	long (*fallocate)(struct file *, struct cifs_tcon *, int, loff_t,

			  loff_t);

};



struct smb_version_values {
@@ -883,6 +887,7 @@ struct cifs_tcon { 
				for this mount even if server would support */

	bool local_lease:1; /* check leases (only) on local system not remote */

	bool broken_posix_open; /* e.g. Samba server versions < 3.3.2, 3.2.9 */

	bool broken_sparse_sup; /* if server or share does not support sparse */

	bool need_reconnect:1; /* connection reset, tid now invalid */

#ifdef CONFIG_CIFS_SMB2

	bool print:1;		/* set if connection to printer share */

fs/cifs/cifspdu.h

+23 −0
Original line number Diff line number Diff line
@@ -2253,6 +2253,29 @@ typedef struct { 
/* minimum includes first three fields, and empty FS Name */

#define MIN_FS_ATTR_INFO_SIZE 12





/* List of FileSystemAttributes - see 2.5.1 of MS-FSCC */

#define FILE_SUPPORT_INTEGRITY_STREAMS	0x04000000

#define FILE_SUPPORTS_USN_JOURNAL	0x02000000

#define FILE_SUPPORTS_OPEN_BY_FILE_ID	0x01000000

#define FILE_SUPPORTS_EXTENDED_ATTRIBUTES 0x00800000

#define FILE_SUPPORTS_HARD_LINKS	0x00400000

#define FILE_SUPPORTS_TRANSACTIONS	0x00200000

#define FILE_SEQUENTIAL_WRITE_ONCE	0x00100000

#define FILE_READ_ONLY_VOLUME		0x00080000

#define FILE_NAMED_STREAMS		0x00040000

#define FILE_SUPPORTS_ENCRYPTION	0x00020000

#define FILE_SUPPORTS_OBJECT_IDS	0x00010000

#define FILE_VOLUME_IS_COMPRESSED	0x00008000

#define FILE_SUPPORTS_REMOTE_STORAGE	0x00000100

#define FILE_SUPPORTS_REPARSE_POINTS	0x00000080

#define FILE_SUPPORTS_SPARSE_FILES	0x00000040

#define FILE_VOLUME_QUOTAS		0x00000020

#define FILE_FILE_COMPRESSION		0x00000010

#define FILE_PERSISTENT_ACLS		0x00000008

#define FILE_UNICODE_ON_DISK		0x00000004

#define FILE_CASE_PRESERVED_NAMES	0x00000002

#define FILE_CASE_SENSITIVE_SEARCH	0x00000001

typedef struct {

	__le32 Attributes;

	__le32 MaxPathNameComponentLength;

fs/cifs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ int cifs_closedir(struct inode *inode, struct file *file) 


	cifs_dbg(FYI, "Freeing private data in close dir\n");

	spin_lock(&cifs_file_list_lock);

	if (!cfile->srch_inf.endOfSearch && !cfile->invalidHandle) {

	if (server->ops->dir_needs_close(cfile)) {

		cfile->invalidHandle = true;

		spin_unlock(&cifs_file_list_lock);

		if (server->ops->close_dir)

fs/cifs/inode.c

+6 −0
Original line number Diff line number Diff line
@@ -1727,6 +1727,12 @@ unlink_target: 
				    target_dentry, to_name);

	}



	/* force revalidate to go get info when needed */

	CIFS_I(source_dir)->time = CIFS_I(target_dir)->time = 0;



	source_dir->i_ctime = source_dir->i_mtime = target_dir->i_ctime =

		target_dir->i_mtime = current_fs_time(source_dir->i_sb);



cifs_rename_exit:

	kfree(info_buf_source);

	kfree(from_name);

CRA Git | Maintained and supported by SUSTech CRA and CCSE