Commit 8908c94d 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 updates from Steve French:
 "Various small CIFS and SMB3 fixes (including some for stable)"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  remove directory incorrectly tries to set delete on close on non-empty directories
  Update cifs.ko version to 2.09
  fs/cifs: correctly to anonymous authentication for the NTLM(v2) authentication
  fs/cifs: correctly to anonymous authentication for the NTLM(v1) authentication
  fs/cifs: correctly to anonymous authentication for the LANMAN authentication
  fs/cifs: correctly to anonymous authentication via NTLMSSP
  cifs: remove any preceding delimiter from prefix_path
  cifs: Use file_dentry()
parents 0b7962a6 897fba11

fs/cifs/cifs_dfs_ref.c

+5 −1
Original line number Diff line number Diff line
@@ -151,8 +151,12 @@ char *cifs_compose_mount_options(const char *sb_mountdata, 
	if (sb_mountdata == NULL)

		return ERR_PTR(-EINVAL);



	if (strlen(fullpath) - ref->path_consumed)

	if (strlen(fullpath) - ref->path_consumed) {

		prepath = fullpath + ref->path_consumed;

		/* skip initial delimiter */

		if (*prepath == '/' || *prepath == '\\')

			prepath++;

	}



	*devname = cifs_build_devname(ref->node_name, prepath);

	if (IS_ERR(*devname)) {

fs/cifs/cifsfs.h

+1 −1
Original line number Diff line number Diff line
@@ -134,5 +134,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.08"

#define CIFS_VERSION   "2.09"

#endif				/* _CIFSFS_H */

fs/cifs/connect.c

+6 −2
Original line number Diff line number Diff line
@@ -1196,8 +1196,12 @@ cifs_parse_devname(const char *devname, struct smb_vol *vol) 


	convert_delimiter(vol->UNC, '\\');



	/* If pos is NULL, or is a bogus trailing delimiter then no prepath */

	if (!*pos++ || !*pos)

	/* skip any delimiter */

	if (*pos == '/' || *pos == '\\')

		pos++;



	/* If pos is NULL then no prepath */

	if (!*pos)

		return 0;



	vol->prepath = kstrdup(pos, GFP_KERNEL);

fs/cifs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ struct cifsFileInfo * 
cifs_new_fileinfo(struct cifs_fid *fid, struct file *file,

		  struct tcon_link *tlink, __u32 oplock)

{

	struct dentry *dentry = file->f_path.dentry;

	struct dentry *dentry = file_dentry(file);

	struct inode *inode = d_inode(dentry);

	struct cifsInodeInfo *cinode = CIFS_I(inode);

	struct cifsFileInfo *cfile;
@@ -461,7 +461,7 @@ int cifs_open(struct inode *inode, struct file *file) 
	tcon = tlink_tcon(tlink);

	server = tcon->ses->server;



	full_path = build_path_from_dentry(file->f_path.dentry);

	full_path = build_path_from_dentry(file_dentry(file));

	if (full_path == NULL) {

		rc = -ENOMEM;

		goto out;

fs/cifs/readdir.c

+2 −2
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ initiate_cifs_search(const unsigned int xid, struct file *file) 
	cifsFile->invalidHandle = true;

	cifsFile->srch_inf.endOfSearch = false;



	full_path = build_path_from_dentry(file->f_path.dentry);

	full_path = build_path_from_dentry(file_dentry(file));

	if (full_path == NULL) {

		rc = -ENOMEM;

		goto error_exit;
@@ -762,7 +762,7 @@ static int cifs_filldir(char *find_entry, struct file *file, 
		 */

		fattr.cf_flags |= CIFS_FATTR_NEED_REVAL;



	cifs_prime_dcache(file->f_path.dentry, &name, &fattr);

	cifs_prime_dcache(file_dentry(file), &name, &fattr);



	ino = cifs_uniqueid_to_ino_t(fattr.cf_uniqueid);

	return !dir_emit(ctx, name.name, name.len, ino, fattr.cf_dtype);

CRA Git | Maintained and supported by SUSTech CRA and CCSE