Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a492fde authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  cifs: trivial white space
  [CIFS] checkpatch cleanup
  cifs: add cifs_revalidate_file
  cifs: add a CIFSSMBUnixQFileInfo function
  cifs: add a CIFSSMBQFileInfo function
  cifs: overhaul cifs_revalidate and rename to cifs_revalidate_dentry
parents 39710479 8212cf75

fs/cifs/cifsfs.c

+2 −1
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ cifs_alloc_inode(struct super_block *sb) 
	cifs_inode->clientCanCacheRead = false;

	cifs_inode->clientCanCacheAll = false;

	cifs_inode->delete_pending = false;

	cifs_inode->invalid_mapping = false;

	cifs_inode->vfs_inode.i_blkbits = 14;  /* 2**14 = CIFS_MAX_MSGSIZE */

	cifs_inode->server_eof = 0;
@@ -638,7 +639,7 @@ static loff_t cifs_llseek(struct file *file, loff_t offset, int origin) 
		   setting the revalidate time to zero */

		CIFS_I(file->f_path.dentry->d_inode)->time = 0;



		retval = cifs_revalidate(file->f_path.dentry);

		retval = cifs_revalidate_file(file);

		if (retval < 0)

			return (loff_t)retval;

	}

fs/cifs/cifsfs.h

+2 −1
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ extern int cifs_mkdir(struct inode *, struct dentry *, int); 
extern int cifs_rmdir(struct inode *, struct dentry *);

extern int cifs_rename(struct inode *, struct dentry *, struct inode *,

		       struct dentry *);

extern int cifs_revalidate(struct dentry *);

extern int cifs_revalidate_file(struct file *filp);

extern int cifs_revalidate_dentry(struct dentry *);

extern int cifs_getattr(struct vfsmount *, struct dentry *, struct kstat *);

extern int cifs_setattr(struct dentry *, struct iattr *);

fs/cifs/cifsglob.h

+1 −0
Original line number Diff line number Diff line
@@ -389,6 +389,7 @@ struct cifsInodeInfo { 
	bool clientCanCacheRead:1;	/* read oplock */

	bool clientCanCacheAll:1;	/* read and writebehind oplock */

	bool delete_pending:1;		/* DELETE_ON_CLOSE is set */

	bool invalid_mapping:1;		/* pagecache is invalid */

	u64  server_eof;		/* current file size on server */

	u64  uniqueid;			/* server inode number */

	struct inode vfs_inode;

fs/cifs/cifsproto.h

+6 −0
Original line number Diff line number Diff line
@@ -104,10 +104,12 @@ extern void cifs_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr); 
extern struct inode *cifs_iget(struct super_block *sb,

			       struct cifs_fattr *fattr);



extern int cifs_get_file_info(struct file *filp);

extern int cifs_get_inode_info(struct inode **pinode,

			const unsigned char *search_path,

			FILE_ALL_INFO *pfile_info,

			struct super_block *sb, int xid, const __u16 *pfid);

extern int cifs_get_file_info_unix(struct file *filp);

extern int cifs_get_inode_info_unix(struct inode **pinode,

			const unsigned char *search_path,

			struct super_block *sb, int xid);
@@ -142,6 +144,8 @@ extern int CIFSFindNext(const int xid, struct cifsTconInfo *tcon, 
extern int CIFSFindClose(const int, struct cifsTconInfo *tcon,

			const __u16 search_handle);



extern int CIFSSMBQFileInfo(const int xid, struct cifsTconInfo *tcon,

			u16 netfid, FILE_ALL_INFO *pFindData);

extern int CIFSSMBQPathInfo(const int xid, struct cifsTconInfo *tcon,

			const unsigned char *searchName,

			FILE_ALL_INFO *findData,
@@ -152,6 +156,8 @@ extern int SMBQueryInformation(const int xid, struct cifsTconInfo *tcon, 
			FILE_ALL_INFO *findData,

			const struct nls_table *nls_codepage, int remap);



extern int CIFSSMBUnixQFileInfo(const int xid, struct cifsTconInfo *tcon,

			u16 netfid, FILE_UNIX_BASIC_INFO *pFindData);

extern int CIFSSMBUnixQPathInfo(const int xid,

			struct cifsTconInfo *tcon,

			const unsigned char *searchName,

fs/cifs/cifssmb.c

+134 −1
Original line number Diff line number Diff line
@@ -3230,8 +3230,72 @@ int SMBQueryInformation(const int xid, struct cifsTconInfo *tcon, 
	return rc;

}



int

CIFSSMBQFileInfo(const int xid, struct cifsTconInfo *tcon,

		 u16 netfid, FILE_ALL_INFO *pFindData)

{

	struct smb_t2_qfi_req *pSMB = NULL;

	struct smb_t2_qfi_rsp *pSMBr = NULL;

	int rc = 0;

	int bytes_returned;

	__u16 params, byte_count;



QFileInfoRetry:

	rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB,

		      (void **) &pSMBr);

	if (rc)

		return rc;



	params = 2 /* level */ + 2 /* fid */;

	pSMB->t2.TotalDataCount = 0;

	pSMB->t2.MaxParameterCount = cpu_to_le16(4);

	/* BB find exact max data count below from sess structure BB */

	pSMB->t2.MaxDataCount = cpu_to_le16(CIFSMaxBufSize);

	pSMB->t2.MaxSetupCount = 0;

	pSMB->t2.Reserved = 0;

	pSMB->t2.Flags = 0;

	pSMB->t2.Timeout = 0;

	pSMB->t2.Reserved2 = 0;

	pSMB->t2.ParameterOffset = cpu_to_le16(offsetof(struct smb_t2_qfi_req,

					       Fid) - 4);

	pSMB->t2.DataCount = 0;

	pSMB->t2.DataOffset = 0;

	pSMB->t2.SetupCount = 1;

	pSMB->t2.Reserved3 = 0;

	pSMB->t2.SubCommand = cpu_to_le16(TRANS2_QUERY_FILE_INFORMATION);

	byte_count = params + 1 /* pad */ ;

	pSMB->t2.TotalParameterCount = cpu_to_le16(params);

	pSMB->t2.ParameterCount = pSMB->t2.TotalParameterCount;

	pSMB->InformationLevel = cpu_to_le16(SMB_QUERY_FILE_ALL_INFO);

	pSMB->Pad = 0;

	pSMB->Fid = netfid;

	pSMB->hdr.smb_buf_length += byte_count;



	rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,

			 (struct smb_hdr *) pSMBr, &bytes_returned, 0);

	if (rc) {

		cFYI(1, ("Send error in QPathInfo = %d", rc));

	} else {		/* decode response */

		rc = validate_t2((struct smb_t2_rsp *)pSMBr);



		if (rc) /* BB add auto retry on EOPNOTSUPP? */

			rc = -EIO;

		else if (pSMBr->ByteCount < 40)

			rc = -EIO;	/* bad smb */

		else if (pFindData) {

			__u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset);

			memcpy((char *) pFindData,

			       (char *) &pSMBr->hdr.Protocol +

			       data_offset, sizeof(FILE_ALL_INFO));

		} else

		    rc = -ENOMEM;

	}

	cifs_buf_release(pSMB);

	if (rc == -EAGAIN)

		goto QFileInfoRetry;



	return rc;

}



int

CIFSSMBQPathInfo(const int xid, struct cifsTconInfo *tcon,
@@ -3334,6 +3398,75 @@ CIFSSMBQPathInfo(const int xid, struct cifsTconInfo *tcon, 
	return rc;

}



int

CIFSSMBUnixQFileInfo(const int xid, struct cifsTconInfo *tcon,

		 u16 netfid, FILE_UNIX_BASIC_INFO *pFindData)

{

	struct smb_t2_qfi_req *pSMB = NULL;

	struct smb_t2_qfi_rsp *pSMBr = NULL;

	int rc = 0;

	int bytes_returned;

	__u16 params, byte_count;



UnixQFileInfoRetry:

	rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB,

		      (void **) &pSMBr);

	if (rc)

		return rc;



	params = 2 /* level */ + 2 /* fid */;

	pSMB->t2.TotalDataCount = 0;

	pSMB->t2.MaxParameterCount = cpu_to_le16(4);

	/* BB find exact max data count below from sess structure BB */

	pSMB->t2.MaxDataCount = cpu_to_le16(CIFSMaxBufSize);

	pSMB->t2.MaxSetupCount = 0;

	pSMB->t2.Reserved = 0;

	pSMB->t2.Flags = 0;

	pSMB->t2.Timeout = 0;

	pSMB->t2.Reserved2 = 0;

	pSMB->t2.ParameterOffset = cpu_to_le16(offsetof(struct smb_t2_qfi_req,

					       Fid) - 4);

	pSMB->t2.DataCount = 0;

	pSMB->t2.DataOffset = 0;

	pSMB->t2.SetupCount = 1;

	pSMB->t2.Reserved3 = 0;

	pSMB->t2.SubCommand = cpu_to_le16(TRANS2_QUERY_FILE_INFORMATION);

	byte_count = params + 1 /* pad */ ;

	pSMB->t2.TotalParameterCount = cpu_to_le16(params);

	pSMB->t2.ParameterCount = pSMB->t2.TotalParameterCount;

	pSMB->InformationLevel = cpu_to_le16(SMB_QUERY_FILE_UNIX_BASIC);

	pSMB->Pad = 0;

	pSMB->Fid = netfid;

	pSMB->hdr.smb_buf_length += byte_count;



	rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,

			 (struct smb_hdr *) pSMBr, &bytes_returned, 0);

	if (rc) {

		cFYI(1, ("Send error in QPathInfo = %d", rc));

	} else {		/* decode response */

		rc = validate_t2((struct smb_t2_rsp *)pSMBr);



		if (rc || (pSMBr->ByteCount < sizeof(FILE_UNIX_BASIC_INFO))) {

			cERROR(1, ("Malformed FILE_UNIX_BASIC_INFO response.\n"

				   "Unix Extensions can be disabled on mount "

				   "by specifying the nosfu mount option."));

			rc = -EIO;	/* bad smb */

		} else {

			__u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset);

			memcpy((char *) pFindData,

			       (char *) &pSMBr->hdr.Protocol +

			       data_offset,

			       sizeof(FILE_UNIX_BASIC_INFO));

		}

	}



	cifs_buf_release(pSMB);

	if (rc == -EAGAIN)

		goto UnixQFileInfoRetry;



	return rc;

}



int

CIFSSMBUnixQPathInfo(const int xid, struct cifsTconInfo *tcon,

		     const unsigned char *searchName,