mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-09-22 04:31:58 +08:00
fs/cifs: Remove unnecessary casts of private_data
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
parent
3feb41cff8
commit
c21dfb699f
@ -427,7 +427,7 @@ static int cifs_reopen_file(struct file *file, bool can_flush)
|
|||||||
__u16 netfid;
|
__u16 netfid;
|
||||||
|
|
||||||
if (file->private_data)
|
if (file->private_data)
|
||||||
pCifsFile = (struct cifsFileInfo *)file->private_data;
|
pCifsFile = file->private_data;
|
||||||
else
|
else
|
||||||
return -EBADF;
|
return -EBADF;
|
||||||
|
|
||||||
@ -565,8 +565,7 @@ int cifs_close(struct inode *inode, struct file *file)
|
|||||||
int xid, timeout;
|
int xid, timeout;
|
||||||
struct cifs_sb_info *cifs_sb;
|
struct cifs_sb_info *cifs_sb;
|
||||||
struct cifsTconInfo *pTcon;
|
struct cifsTconInfo *pTcon;
|
||||||
struct cifsFileInfo *pSMBFile =
|
struct cifsFileInfo *pSMBFile = file->private_data;
|
||||||
(struct cifsFileInfo *)file->private_data;
|
|
||||||
|
|
||||||
xid = GetXid();
|
xid = GetXid();
|
||||||
|
|
||||||
@ -641,8 +640,7 @@ int cifs_closedir(struct inode *inode, struct file *file)
|
|||||||
{
|
{
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
int xid;
|
int xid;
|
||||||
struct cifsFileInfo *pCFileStruct =
|
struct cifsFileInfo *pCFileStruct = file->private_data;
|
||||||
(struct cifsFileInfo *)file->private_data;
|
|
||||||
char *ptmp;
|
char *ptmp;
|
||||||
|
|
||||||
cFYI(1, "Closedir inode = 0x%p", inode);
|
cFYI(1, "Closedir inode = 0x%p", inode);
|
||||||
@ -863,8 +861,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
|
|||||||
length, pfLock,
|
length, pfLock,
|
||||||
posix_lock_type, wait_flag);
|
posix_lock_type, wait_flag);
|
||||||
} else {
|
} else {
|
||||||
struct cifsFileInfo *fid =
|
struct cifsFileInfo *fid = file->private_data;
|
||||||
(struct cifsFileInfo *)file->private_data;
|
|
||||||
|
|
||||||
if (numLock) {
|
if (numLock) {
|
||||||
rc = CIFSSMBLock(xid, tcon, netfid, length,
|
rc = CIFSSMBLock(xid, tcon, netfid, length,
|
||||||
@ -965,7 +962,7 @@ ssize_t cifs_user_write(struct file *file, const char __user *write_data,
|
|||||||
|
|
||||||
if (file->private_data == NULL)
|
if (file->private_data == NULL)
|
||||||
return -EBADF;
|
return -EBADF;
|
||||||
open_file = (struct cifsFileInfo *) file->private_data;
|
open_file = file->private_data;
|
||||||
|
|
||||||
rc = generic_write_checks(file, poffset, &write_size, 0);
|
rc = generic_write_checks(file, poffset, &write_size, 0);
|
||||||
if (rc)
|
if (rc)
|
||||||
@ -1067,7 +1064,7 @@ static ssize_t cifs_write(struct file *file, const char *write_data,
|
|||||||
|
|
||||||
if (file->private_data == NULL)
|
if (file->private_data == NULL)
|
||||||
return -EBADF;
|
return -EBADF;
|
||||||
open_file = (struct cifsFileInfo *)file->private_data;
|
open_file = file->private_data;
|
||||||
|
|
||||||
xid = GetXid();
|
xid = GetXid();
|
||||||
|
|
||||||
@ -1651,8 +1648,7 @@ int cifs_fsync(struct file *file, int datasync)
|
|||||||
int xid;
|
int xid;
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
struct cifsTconInfo *tcon;
|
struct cifsTconInfo *tcon;
|
||||||
struct cifsFileInfo *smbfile =
|
struct cifsFileInfo *smbfile = file->private_data;
|
||||||
(struct cifsFileInfo *)file->private_data;
|
|
||||||
struct inode *inode = file->f_path.dentry->d_inode;
|
struct inode *inode = file->f_path.dentry->d_inode;
|
||||||
|
|
||||||
xid = GetXid();
|
xid = GetXid();
|
||||||
@ -1756,7 +1752,7 @@ ssize_t cifs_user_read(struct file *file, char __user *read_data,
|
|||||||
FreeXid(xid);
|
FreeXid(xid);
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
open_file = (struct cifsFileInfo *)file->private_data;
|
open_file = file->private_data;
|
||||||
|
|
||||||
if ((file->f_flags & O_ACCMODE) == O_WRONLY)
|
if ((file->f_flags & O_ACCMODE) == O_WRONLY)
|
||||||
cFYI(1, "attempting read on write only file instance");
|
cFYI(1, "attempting read on write only file instance");
|
||||||
@ -1837,7 +1833,7 @@ static ssize_t cifs_read(struct file *file, char *read_data, size_t read_size,
|
|||||||
FreeXid(xid);
|
FreeXid(xid);
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
open_file = (struct cifsFileInfo *)file->private_data;
|
open_file = file->private_data;
|
||||||
|
|
||||||
if ((file->f_flags & O_ACCMODE) == O_WRONLY)
|
if ((file->f_flags & O_ACCMODE) == O_WRONLY)
|
||||||
cFYI(1, "attempting read on write only file instance");
|
cFYI(1, "attempting read on write only file instance");
|
||||||
@ -1968,7 +1964,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,
|
|||||||
FreeXid(xid);
|
FreeXid(xid);
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
open_file = (struct cifsFileInfo *)file->private_data;
|
open_file = file->private_data;
|
||||||
cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
|
cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
|
||||||
pTcon = cifs_sb->tcon;
|
pTcon = cifs_sb->tcon;
|
||||||
|
|
||||||
|
@ -288,7 +288,7 @@ int cifs_get_file_info_unix(struct file *filp)
|
|||||||
struct inode *inode = filp->f_path.dentry->d_inode;
|
struct inode *inode = filp->f_path.dentry->d_inode;
|
||||||
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
|
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
|
||||||
struct cifsTconInfo *tcon = cifs_sb->tcon;
|
struct cifsTconInfo *tcon = cifs_sb->tcon;
|
||||||
struct cifsFileInfo *cfile = (struct cifsFileInfo *) filp->private_data;
|
struct cifsFileInfo *cfile = filp->private_data;
|
||||||
|
|
||||||
xid = GetXid();
|
xid = GetXid();
|
||||||
rc = CIFSSMBUnixQFileInfo(xid, tcon, cfile->netfid, &find_data);
|
rc = CIFSSMBUnixQFileInfo(xid, tcon, cfile->netfid, &find_data);
|
||||||
@ -515,7 +515,7 @@ int cifs_get_file_info(struct file *filp)
|
|||||||
struct inode *inode = filp->f_path.dentry->d_inode;
|
struct inode *inode = filp->f_path.dentry->d_inode;
|
||||||
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
|
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
|
||||||
struct cifsTconInfo *tcon = cifs_sb->tcon;
|
struct cifsTconInfo *tcon = cifs_sb->tcon;
|
||||||
struct cifsFileInfo *cfile = (struct cifsFileInfo *) filp->private_data;
|
struct cifsFileInfo *cfile = filp->private_data;
|
||||||
|
|
||||||
xid = GetXid();
|
xid = GetXid();
|
||||||
rc = CIFSSMBQFileInfo(xid, tcon, cfile->netfid, &find_data);
|
rc = CIFSSMBQFileInfo(xid, tcon, cfile->netfid, &find_data);
|
||||||
|
@ -41,8 +41,7 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg)
|
|||||||
__u64 ExtAttrMask = 0;
|
__u64 ExtAttrMask = 0;
|
||||||
__u64 caps;
|
__u64 caps;
|
||||||
struct cifsTconInfo *tcon;
|
struct cifsTconInfo *tcon;
|
||||||
struct cifsFileInfo *pSMBFile =
|
struct cifsFileInfo *pSMBFile = filep->private_data;
|
||||||
(struct cifsFileInfo *)filep->private_data;
|
|
||||||
#endif /* CONFIG_CIFS_POSIX */
|
#endif /* CONFIG_CIFS_POSIX */
|
||||||
|
|
||||||
xid = GetXid();
|
xid = GetXid();
|
||||||
|
Loading…
Reference in New Issue
Block a user