Commit a5c984cc 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:
 "Small set of cifs fixes.  Most important is Jeff's fix that works
  around disconnection problems which can be caused by simultaneous use
  of user space tools (starting a long running smbclient backup then
  doing a cifs kernel mount) or multiple cifs mounts through a NAT, and
  Jim's fix to deal with reexport of cifs share.

  I expect to send two more cifs fixes next week (being tested now) -
  fixes to address an SMB2 unmount hang when server dies and a fix for
  cifs symlink handling of Windows "NFS" symlinks"

* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
  [CIFS] update cifs.ko version
  [CIFS] Remove ext2 flags that have been moved to fs.h
  [CIFS] Provide sane values for nlink
  cifs: stop trying to use virtual circuits
  CIFS: FS-Cache: Uncache unread pages in cifs_readpages() before freeing them
parents 95167aad ffe67b58

fs/cifs/cifsfs.h

+1 −1
Original line number Diff line number Diff line
@@ -132,5 +132,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); 
extern const struct export_operations cifs_export_ops;

#endif /* CONFIG_CIFS_NFSD_EXPORT */



#define CIFS_VERSION   "2.01"

#define CIFS_VERSION   "2.02"

#endif				/* _CIFSFS_H */

fs/cifs/cifsglob.h

+1 −4
Original line number Diff line number Diff line
@@ -547,9 +547,6 @@ struct TCP_Server_Info { 
	unsigned int max_rw;	/* maxRw specifies the maximum */

	/* message size the server can send or receive for */

	/* SMB_COM_WRITE_RAW or SMB_COM_READ_RAW. */

	unsigned int max_vcs;	/* maximum number of smb sessions, at least

				   those that can be specified uniquely with

				   vcnumbers */

	unsigned int capabilities; /* selective disabling of caps by smb sess */

	int timeAdj;  /* Adjust for difference in server time zone in sec */

	__u64 CurrentMid;         /* multiplex id - rotating counter */
@@ -715,7 +712,6 @@ struct cifs_ses { 
	enum statusEnum status;

	unsigned overrideSecFlg;  /* if non-zero override global sec flags */

	__u16 ipc_tid;		/* special tid for connection to IPC share */

	__u16 vcnum;

	char *serverOS;		/* name of operating system underlying server */

	char *serverNOS;	/* name of network operating system of server */

	char *serverDomain;	/* security realm of server */
@@ -1272,6 +1268,7 @@ struct dfs_info3_param { 
#define CIFS_FATTR_DELETE_PENDING	0x2

#define CIFS_FATTR_NEED_REVAL		0x4

#define CIFS_FATTR_INO_COLLISION	0x8

#define CIFS_FATTR_UNKNOWN_NLINK	0x10



struct cifs_fattr {

	u32		cf_flags;

fs/cifs/cifspdu.h

+1 −20
Original line number Diff line number Diff line
@@ -2652,26 +2652,7 @@ typedef struct file_xattr_info { 
} __attribute__((packed)) FILE_XATTR_INFO; /* extended attribute info

					      level 0x205 */





/* flags for chattr command */

#define EXT_SECURE_DELETE		0x00000001 /* EXT3_SECRM_FL */

#define EXT_ENABLE_UNDELETE		0x00000002 /* EXT3_UNRM_FL */

/* Reserved for compress file 0x4 */

#define EXT_SYNCHRONOUS			0x00000008 /* EXT3_SYNC_FL */

#define EXT_IMMUTABLE_FL		0x00000010 /* EXT3_IMMUTABLE_FL */

#define EXT_OPEN_APPEND_ONLY		0x00000020 /* EXT3_APPEND_FL */

#define EXT_DO_NOT_BACKUP		0x00000040 /* EXT3_NODUMP_FL */

#define EXT_NO_UPDATE_ATIME		0x00000080 /* EXT3_NOATIME_FL */

/* 0x100 through 0x800 reserved for compression flags and are GET-ONLY */

#define EXT_HASH_TREE_INDEXED_DIR	0x00001000 /* GET-ONLY EXT3_INDEX_FL */

/* 0x2000 reserved for IMAGIC_FL */

#define EXT_JOURNAL_THIS_FILE	0x00004000 /* GET-ONLY EXT3_JOURNAL_DATA_FL */

/* 0x8000 reserved for EXT3_NOTAIL_FL */

#define EXT_SYNCHRONOUS_DIR		0x00010000 /* EXT3_DIRSYNC_FL */

#define EXT_TOPDIR			0x00020000 /* EXT3_TOPDIR_FL */



#define EXT_SET_MASK			0x000300FF

#define EXT_GET_MASK			0x0003DFFF

/* flags for lsattr and chflags commands removed arein uapi/linux/fs.h */



typedef struct file_chattr_info {

	__le64	mask; /* list of all possible attribute bits */

fs/cifs/cifssmb.c

+0 −1
Original line number Diff line number Diff line
@@ -463,7 +463,6 @@ decode_lanman_negprot_rsp(struct TCP_Server_Info *server, NEGOTIATE_RSP *pSMBr) 
			       cifs_max_pending);

	set_credits(server, server->maxReq);

	server->maxBuf = le16_to_cpu(rsp->MaxBufSize);

	server->max_vcs = le16_to_cpu(rsp->MaxNumberVcs);

	/* even though we do not use raw we might as well set this

	accurately, in case we ever find a need for it */

	if ((le16_to_cpu(rsp->RawMode) & RAW_ENABLE) == RAW_ENABLE) {

fs/cifs/file.c

+8 −0
Original line number Diff line number Diff line
@@ -3254,6 +3254,9 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, 
	/*

	 * Reads as many pages as possible from fscache. Returns -ENOBUFS

	 * immediately if the cookie is negative

	 *

	 * After this point, every page in the list might have PG_fscache set,

	 * so we will need to clean that up off of every page we don't use.

	 */

	rc = cifs_readpages_from_fscache(mapping->host, mapping, page_list,

					 &num_pages);
@@ -3376,6 +3379,11 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, 
		kref_put(&rdata->refcount, cifs_readdata_release);

	}



	/* Any pages that have been shown to fscache but didn't get added to

	 * the pagecache must be uncached before they get returned to the

	 * allocator.

	 */

	cifs_fscache_readpages_cancel(mapping->host, page_list);

	return rc;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE