Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e4636d535e32768c8c500641ddb144f56e3dc5c0

Authored by J. Bruce Fields
1 parent d911df7b8d

nfsd: minor nfsd_vfs_write cleanup 

There's no need to check host_err >= 0 every time here when we could
check host_err < 0 once, following the usual kernel style.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

Showing 1 changed file with 8 additions and 7 deletions Side-by-side Diff

... ... @@ -1053,19 +1053,20 @@
1053 1053 oldfs = get_fs(); set_fs(KERNEL_DS);
1054 1054 host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset);
1055 1055 set_fs(oldfs);
1056   - if (host_err >= 0) {
1057   - *cnt = host_err;
1058   - nfsdstats.io_write += host_err;
1059   - fsnotify_modify(file->f_path.dentry);
1060   - }
  1056 + if (host_err < 0)
  1057 + goto out_nfserr;
  1058 + *cnt = host_err;
  1059 + nfsdstats.io_write += host_err;
  1060 + fsnotify_modify(file->f_path.dentry);
1061 1061  
1062 1062 /* clear setuid/setgid flag after write */
1063   - if (host_err >= 0 && (inode->i_mode & (S_ISUID | S_ISGID)))
  1063 + if (inode->i_mode & (S_ISUID | S_ISGID))
1064 1064 kill_suid(dentry);
1065 1065  
1066   - if (host_err >= 0 && stable && use_wgather)
  1066 + if (stable && use_wgather)
1067 1067 host_err = wait_for_concurrent_writes(file);
1068 1068  
  1069 +out_nfserr:
1069 1070 dprintk("nfsd: write complete host_err=%d\n", host_err);
1070 1071 if (host_err >= 0)
1071 1072 err = 0;