RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

infra: remove unwanted sys_utimes()

This commit is contained in:
Thomas Schoebel-Theuer 2015-05-27 12:03:47 +02:00
parent 09c6b3112c
commit a1d4497a51
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/compat.h
View File

@ -42,10 +42,12 @@
#else /* HAS_MARS_PREPATCH */
#include <linux/compiler.h>
#include <linux/time.h>
extern int _compat_symlink(
const char __user *oldname,
const char __user *newname);
const char __user *newname,
struct timespec *mtime);
extern int _compat_mkdir(
const char __user *pathname,

29
kernel/sy_old/sy_generic.c
View File

@ -164,7 +164,8 @@ static int __path_parent(const char *name, struct path *path, unsigned flags)
* and later adapted to various kernels
*/
int _compat_symlink(const char __user *oldname,
const char __user *newname)
const char __user *newname,
struct timespec *mtime)
{
const int newdfd = AT_FDCWD;
int error;
@ -189,6 +190,21 @@ retry:
goto out_dput;
#endif
error = vfs_symlink(path.dentry->d_inode, dentry, from);
if (error >= 0 && mtime) {
struct iattr iattr = {
.ia_valid = ATTR_MTIME | ATTR_MTIME_SET | ATTR_TIMES_SET,
.ia_mtime.tv_sec = mtime->tv_sec,
.ia_mtime.tv_nsec = mtime->tv_nsec,
};
mutex_lock(&dentry->d_inode->i_mutex);
#ifdef FL_DELEG
error = notify_change(dentry, &iattr, NULL);
#else
error = notify_change(dentry, &iattr);
#endif
mutex_unlock(&dentry->d_inode->i_mutex);
}
#ifdef __NEW_PATH_CREATE
done_path_create(&path, dentry);
#else
@ -641,18 +657,15 @@ int mars_symlink(const char *oldpath, const char *newpath, const struct timespec
#ifdef HAS_MARS_PREPATCH
(void)sys_unlink(tmp);
status = sys_symlink(oldpath, tmp);
#else
(void)_compat_unlink(tmp);
status = _compat_symlink(oldpath, tmp);
#endif
if (status >= 0) {
#ifdef HAS_MARS_PREPATCH
sys_lchown(tmp, uid, 0);
#endif
memcpy(&times[1], &times[0], sizeof(struct timespec));
status = do_utimes(AT_FDCWD, tmp, times, AT_SYMLINK_NOFOLLOW);
}
#else
(void)_compat_unlink(tmp);
status = _compat_symlink(oldpath, tmp, &times[0]);
#endif
if (status >= 0) {
set_lamport(&times[0]);