Commit cd607737 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '5.6-rc6-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs fixes from Steve French:
 "Three small smb3 fixes, two for stable"

* tag '5.6-rc6-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  CIFS: fiemap: do not return EINVAL if get nothing
  CIFS: Increment num_remote_opens stats counter even in case of smb2_query_dir_first
  cifs: potential unintitliazed error code in cifs_getattr()
parents 207f75c4 979a2665

fs/cifs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -2191,7 +2191,7 @@ int cifs_getattr(const struct path *path, struct kstat *stat, 
		if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID))

			stat->gid = current_fsgid();

	}

	return rc;

	return 0;

}



int cifs_fiemap(struct inode *inode, struct fiemap_extent_info *fei, u64 start,

fs/cifs/smb2ops.c

+3 −1
Original line number Diff line number Diff line
@@ -2222,6 +2222,8 @@ smb2_query_dir_first(const unsigned int xid, struct cifs_tcon *tcon, 
		goto qdf_free;

	}



	atomic_inc(&tcon->num_remote_opens);



	qd_rsp = (struct smb2_query_directory_rsp *)rsp_iov[1].iov_base;

	if (qd_rsp->sync_hdr.Status == STATUS_NO_MORE_FILES) {

		trace_smb3_query_dir_done(xid, fid->persistent_fid,
@@ -3417,7 +3419,7 @@ static int smb3_fiemap(struct cifs_tcon *tcon, 
	if (rc)

		goto out;



	if (out_data_len < sizeof(struct file_allocated_range_buffer)) {

	if (out_data_len && out_data_len < sizeof(struct file_allocated_range_buffer)) {

		rc = -EINVAL;

		goto out;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE