projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[cascardo/linux.git]
/
fs
/
hfsplus
/
dir.c
diff --git
a/fs/hfsplus/dir.c
b/fs/hfsplus/dir.c
index
9cbe430
..
31d5e3f
100644
(file)
--- a/
fs/hfsplus/dir.c
+++ b/
fs/hfsplus/dir.c
@@
-347,7
+347,7
@@
static int hfsplus_link(struct dentry *src_dentry, struct inode *dst_dir,
inc_nlink(inode);
hfsplus_instantiate(dst_dentry, inode, cnid);
ihold(inode);
inc_nlink(inode);
hfsplus_instantiate(dst_dentry, inode, cnid);
ihold(inode);
- inode->i_ctime =
CURRENT_TIME_SEC
;
+ inode->i_ctime =
current_time(inode)
;
mark_inode_dirty(inode);
sbi->file_count++;
hfsplus_mark_mdb_dirty(dst_dir->i_sb);
mark_inode_dirty(inode);
sbi->file_count++;
hfsplus_mark_mdb_dirty(dst_dir->i_sb);
@@
-406,7
+406,7
@@
static int hfsplus_unlink(struct inode *dir, struct dentry *dentry)
hfsplus_delete_inode(inode);
} else
sbi->file_count--;
hfsplus_delete_inode(inode);
} else
sbi->file_count--;
- inode->i_ctime =
CURRENT_TIME_SEC
;
+ inode->i_ctime =
current_time(inode)
;
mark_inode_dirty(inode);
out:
mutex_unlock(&sbi->vh_mutex);
mark_inode_dirty(inode);
out:
mutex_unlock(&sbi->vh_mutex);
@@
-427,7
+427,7
@@
static int hfsplus_rmdir(struct inode *dir, struct dentry *dentry)
if (res)
goto out;
clear_nlink(inode);
if (res)
goto out;
clear_nlink(inode);
- inode->i_ctime =
CURRENT_TIME_SEC
;
+ inode->i_ctime =
current_time(inode)
;
hfsplus_delete_inode(inode);
mark_inode_dirty(inode);
out:
hfsplus_delete_inode(inode);
mark_inode_dirty(inode);
out:
@@
-530,10
+530,14
@@
static int hfsplus_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
}
static int hfsplus_rename(struct inode *old_dir, struct dentry *old_dentry,
}
static int hfsplus_rename(struct inode *old_dir, struct dentry *old_dentry,
- struct inode *new_dir, struct dentry *new_dentry)
+ struct inode *new_dir, struct dentry *new_dentry,
+ unsigned int flags)
{
int res;
{
int res;
+ if (flags & ~RENAME_NOREPLACE)
+ return -EINVAL;
+
/* Unlink destination if it already exists */
if (d_really_is_positive(new_dentry)) {
if (d_is_dir(new_dentry))
/* Unlink destination if it already exists */
if (d_really_is_positive(new_dentry)) {
if (d_is_dir(new_dentry))