Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

convert cifs_ioctl_copychunk()

Browse Source 
fdput() moved past mnt_drop_file_write(); harmless, if somewhat cringeworthy.
Reordering could be avoided either by adding an explicit scope or by making
mnt_drop_file_write() called via __cleanup.

Reviewed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2024-07-23 01:05:06 -04:00
parent 44b11a56c3
commit 9bd812744d
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/smb/client/ioctl.c
View File

@ -72,7 +72,6 @@ static long cifs_ioctl_copychunk(unsigned int xid, struct file *dst_file,
unsigned long srcfd) unsigned long srcfd)
{ {
int rc; int rc;
struct fd src_file;
struct inode *src_inode; struct inode *src_inode;
cifs_dbg(FYI, "ioctl copychunk range\n"); cifs_dbg(FYI, "ioctl copychunk range\n");
@ -89,8 +88,8 @@ static long cifs_ioctl_copychunk(unsigned int xid, struct file *dst_file,
return rc; return rc;
} }
src_file = fdget(srcfd); CLASS(fd, src_file)(srcfd);
if (!fd_file(src_file)) { if (fd_empty(src_file)) {
rc = -EBADF; rc = -EBADF;
goto out_drop_write; goto out_drop_write;
} }
@ -98,20 +97,18 @@ static long cifs_ioctl_copychunk(unsigned int xid, struct file *dst_file,
if (fd_file(src_file)->f_op->unlocked_ioctl != cifs_ioctl) { if (fd_file(src_file)->f_op->unlocked_ioctl != cifs_ioctl) {
rc = -EBADF; rc = -EBADF;
cifs_dbg(VFS, "src file seems to be from a different filesystem type\n"); cifs_dbg(VFS, "src file seems to be from a different filesystem type\n");
goto out_fput; goto out_drop_write;
} }
src_inode = file_inode(fd_file(src_file)); src_inode = file_inode(fd_file(src_file));
rc = -EINVAL; rc = -EINVAL;
if (S_ISDIR(src_inode->i_mode)) if (S_ISDIR(src_inode->i_mode))
goto out_fput; goto out_drop_write;
rc = cifs_file_copychunk_range(xid, fd_file(src_file), 0, dst_file, 0, rc = cifs_file_copychunk_range(xid, fd_file(src_file), 0, dst_file, 0,
src_inode->i_size, 0); src_inode->i_size, 0);
if (rc > 0) if (rc > 0)
rc = 0; rc = 0;
out_fput:
fdput(src_file);
out_drop_write: out_drop_write:
mnt_drop_write_file(dst_file); mnt_drop_write_file(dst_file);
return rc; return rc;