projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'ovl/rename2' into for-linus
[cascardo/linux.git]
/
fs
/
orangefs
/
namei.c
diff --git
a/fs/orangefs/namei.c
b/fs/orangefs/namei.c
index
5f015c5
..
0dfa868
100644
(file)
--- a/
fs/orangefs/namei.c
+++ b/
fs/orangefs/namei.c
@@
-81,7
+81,7
@@
static int orangefs_create(struct inode *dir,
dentry->d_name.name);
SetMtimeFlag(parent);
dentry->d_name.name);
SetMtimeFlag(parent);
- dir->i_mtime = dir->i_ctime = current_
fs_time(dir->i_sb
);
+ dir->i_mtime = dir->i_ctime = current_
time(dir
);
mark_inode_dirty_sync(dir);
ret = 0;
out:
mark_inode_dirty_sync(dir);
ret = 0;
out:
@@
-254,7
+254,7
@@
static int orangefs_unlink(struct inode *dir, struct dentry *dentry)
drop_nlink(inode);
SetMtimeFlag(parent);
drop_nlink(inode);
SetMtimeFlag(parent);
- dir->i_mtime = dir->i_ctime = current_
fs_time(dir->i_sb
);
+ dir->i_mtime = dir->i_ctime = current_
time(dir
);
mark_inode_dirty_sync(dir);
}
return ret;
mark_inode_dirty_sync(dir);
}
return ret;
@@
-331,7
+331,7
@@
static int orangefs_symlink(struct inode *dir,
dentry->d_name.name);
SetMtimeFlag(parent);
dentry->d_name.name);
SetMtimeFlag(parent);
- dir->i_mtime = dir->i_ctime = current_
fs_time(dir->i_sb
);
+ dir->i_mtime = dir->i_ctime = current_
time(dir
);
mark_inode_dirty_sync(dir);
ret = 0;
out:
mark_inode_dirty_sync(dir);
ret = 0;
out:
@@
-399,7
+399,7
@@
static int orangefs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode
* across clients; keep constant at 1.
*/
SetMtimeFlag(parent);
* across clients; keep constant at 1.
*/
SetMtimeFlag(parent);
- dir->i_mtime = dir->i_ctime = current_
fs_time(dir->i_sb
);
+ dir->i_mtime = dir->i_ctime = current_
time(dir
);
mark_inode_dirty_sync(dir);
out:
op_release(new_op);
mark_inode_dirty_sync(dir);
out:
op_release(new_op);
@@
-447,7
+447,7
@@
static int orangefs_rename(struct inode *old_dir,
ret);
if (new_dentry->d_inode)
ret);
if (new_dentry->d_inode)
- new_dentry->d_inode->i_ctime =
CURRENT_TIME
;
+ new_dentry->d_inode->i_ctime =
current_time(new_dentry->d_inode)
;
op_release(new_op);
return ret;
op_release(new_op);
return ret;