Commit fe7a719b 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:
 "Various fixes for stable for CIFS/SMB3 especially for better
  interoperability for SMB3 to Macs.

  It also includes Pavel's improvements to SMB3 async i/o support
  (which is much faster now)"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  CIFS: add misssing SFM mapping for doublequote
  SMB3: Work around mount failure when using SMB3 dialect to Macs
  cifs: fix CIFS_IOC_GET_MNT_INFO oops
  CIFS: fix mapping of SFM_SPACE and SFM_PERIOD
  CIFS: fix oplock break deadlocks
  cifs: fix CIFS_ENUMERATE_SNAPSHOTS oops
  cifs: fix leak in FSCTL_ENUM_SNAPS response handling
  Set unicode flag on cifs echo request to avoid Mac error
  CIFS: Add asynchronous write support through kernel AIO
  CIFS: Add asynchronous read support through kernel AIO
  CIFS: Add asynchronous context to support kernel AIO
  cifs: fix IPv6 link local, with scope id, address parsing
  cifs: small underflow in cnvrtDosUnixTm()
parents d484467c 85435d7a

fs/cifs/cifs_unicode.c

+6 −0
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ convert_sfm_char(const __u16 src_char, char *target) 
	case SFM_COLON:

		*target = ':';

		break;

	case SFM_DOUBLEQUOTE:

		*target = '"';

		break;

	case SFM_ASTERISK:

		*target = '*';

		break;
@@ -418,6 +421,9 @@ static __le16 convert_to_sfm_char(char src_char, bool end_of_string) 
	case ':':

		dest_char = cpu_to_le16(SFM_COLON);

		break;

	case '"':

		dest_char = cpu_to_le16(SFM_DOUBLEQUOTE);

		break;

	case '*':

		dest_char = cpu_to_le16(SFM_ASTERISK);

		break;

fs/cifs/cifs_unicode.h

+3 −2
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
 * not conflict (although almost does) with the mapping above.

 */



#define SFM_DOUBLEQUOTE ((__u16) 0xF020)

#define SFM_ASTERISK    ((__u16) 0xF021)

#define SFM_QUESTION    ((__u16) 0xF025)

#define SFM_COLON       ((__u16) 0xF022)
@@ -64,8 +65,8 @@ 
#define SFM_LESSTHAN    ((__u16) 0xF023)

#define SFM_PIPE        ((__u16) 0xF027)

#define SFM_SLASH       ((__u16) 0xF026)

#define SFM_PERIOD	((__u16) 0xF028)

#define SFM_SPACE	((__u16) 0xF029)

#define SFM_SPACE	((__u16) 0xF028)

#define SFM_PERIOD	((__u16) 0xF029)



/*

 * Mapping mechanism to use when one of the seven reserved characters is

fs/cifs/cifsfs.c

+13 −2
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ extern mempool_t *cifs_req_poolp; 
extern mempool_t *cifs_mid_poolp;



struct workqueue_struct	*cifsiod_wq;

struct workqueue_struct	*cifsoplockd_wq;

__u32 cifs_lock_secret;



/*
@@ -1375,9 +1376,16 @@ init_cifs(void) 
		goto out_clean_proc;

	}



	cifsoplockd_wq = alloc_workqueue("cifsoplockd",

					 WQ_FREEZABLE|WQ_MEM_RECLAIM, 0);

	if (!cifsoplockd_wq) {

		rc = -ENOMEM;

		goto out_destroy_cifsiod_wq;

	}



	rc = cifs_fscache_register();

	if (rc)

		goto out_destroy_wq;

		goto out_destroy_cifsoplockd_wq;



	rc = cifs_init_inodecache();

	if (rc)
@@ -1425,7 +1433,9 @@ out_destroy_inodecache: 
	cifs_destroy_inodecache();

out_unreg_fscache:

	cifs_fscache_unregister();

out_destroy_wq:

out_destroy_cifsoplockd_wq:

	destroy_workqueue(cifsoplockd_wq);

out_destroy_cifsiod_wq:

	destroy_workqueue(cifsiod_wq);

out_clean_proc:

	cifs_proc_clean();
@@ -1448,6 +1458,7 @@ exit_cifs(void) 
	cifs_destroy_mids();

	cifs_destroy_inodecache();

	cifs_fscache_unregister();

	destroy_workqueue(cifsoplockd_wq);

	destroy_workqueue(cifsiod_wq);

	cifs_proc_clean();

}

fs/cifs/cifsglob.h

+20 −0
Original line number Diff line number Diff line
@@ -1115,6 +1115,23 @@ struct cifs_io_parms { 
	struct cifs_tcon *tcon;

};



struct cifs_aio_ctx {

	struct kref		refcount;

	struct list_head	list;

	struct mutex		aio_mutex;

	struct completion	done;

	struct iov_iter		iter;

	struct kiocb		*iocb;

	struct cifsFileInfo	*cfile;

	struct bio_vec		*bv;

	loff_t			pos;

	unsigned int		npages;

	ssize_t			rc;

	unsigned int		len;

	unsigned int		total_len;

	bool			should_dirty;

};



struct cifs_readdata;



/* asynchronous read support */
@@ -1124,6 +1141,7 @@ struct cifs_readdata { 
	struct completion		done;

	struct cifsFileInfo		*cfile;

	struct address_space		*mapping;

	struct cifs_aio_ctx		*ctx;

	__u64				offset;

	unsigned int			bytes;

	unsigned int			got_bytes;
@@ -1154,6 +1172,7 @@ struct cifs_writedata { 
	enum writeback_sync_modes	sync_mode;

	struct work_struct		work;

	struct cifsFileInfo		*cfile;

	struct cifs_aio_ctx		*ctx;

	__u64				offset;

	pid_t				pid;

	unsigned int			bytes;
@@ -1683,6 +1702,7 @@ void cifs_oplock_break(struct work_struct *work); 


extern const struct slow_work_ops cifs_oplock_break_ops;

extern struct workqueue_struct *cifsiod_wq;

extern struct workqueue_struct *cifsoplockd_wq;

extern __u32 cifs_lock_secret;



extern mempool_t *cifs_mid_poolp;

fs/cifs/cifsproto.h

+3 −0
Original line number Diff line number Diff line
@@ -535,4 +535,7 @@ int __cifs_calc_signature(struct smb_rqst *rqst, 
			struct shash_desc *shash);

enum securityEnum cifs_select_sectype(struct TCP_Server_Info *,

					enum securityEnum);

struct cifs_aio_ctx *cifs_aio_ctx_alloc(void);

void cifs_aio_ctx_release(struct kref *refcount);

int setup_aio_ctx_iter(struct cifs_aio_ctx *ctx, struct iov_iter *iter, int rw);

#endif			/* _CIFSPROTO_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE