xfs: use file_modified() helper (8c3f406c) · Commits · 戴 / test

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>

fs/xfs/xfs_file.c

+1 −14

Original line number	Diff line number	Diff line
		@@ -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

Admin message