diff options
| author | Amir Goldstein | 2019-06-05 17:04:50 +0200 |
|---|---|---|
| committer | Darrick J. Wong | 2019-06-09 19:06:19 +0200 |
| commit | 8c3f406c097b83846c7d18438a905b49d17ae528 (patch) | |
| tree | cc850f4ba8fc05e5e0c11e8c03521b6b108bd1ff /fs/xfs/xfs_file.c | |
| parent | vfs: introduce file_modified() helper (diff) | |
| download | kernel-qcow2-linux-8c3f406c097b83846c7d18438a905b49d17ae528.tar.gz kernel-qcow2-linux-8c3f406c097b83846c7d18438a905b49d17ae528.tar.xz kernel-qcow2-linux-8c3f406c097b83846c7d18438a905b49d17ae528.zip | |
xfs: use file_modified() helper
Note that by using the helper, the order of calling file_remove_privs()
after file_update_mtime() in xfs_file_aio_write_checks() has changed.
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Diffstat (limited to 'fs/xfs/xfs_file.c')
| -rw-r--r-- | fs/xfs/xfs_file.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 76748255f843..916a35cae5e9 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -367,20 +367,7 @@ restart: * lock above. Eventually we should look into a way to avoid * the pointless lock roundtrip. */ - if (likely(!(file->f_mode & FMODE_NOCMTIME))) { - error = file_update_time(file); - if (error) - return error; - } - - /* - * If we're writing the file then make sure to clear the setuid and - * setgid bits if the process is not being run by root. This keeps - * people from modifying setuid and setgid binaries. - */ - if (!IS_NOSEC(inode)) - return file_remove_privs(file); - return 0; + return file_modified(file); } static int |