projects
/
deliverable
/
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 'sound-asoc/for-next'
[deliverable/linux.git]
/
fs
/
reiserfs
/
namei.c
diff --git
a/fs/reiserfs/namei.c
b/fs/reiserfs/namei.c
index 8a36696d6df99c782353c033b070aa666f6db016..586260ed81c9e163b585e3a2f513f524c434be75 100644
(file)
--- a/
fs/reiserfs/namei.c
+++ b/
fs/reiserfs/namei.c
@@
-1306,7
+1306,8
@@
static void set_ino_in_dir_entry(struct reiserfs_dir_entry *de,
* get_empty_nodes or its clones
*/
static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
* get_empty_nodes or its clones
*/
static int reiserfs_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 retval;
INITIALIZE_PATH(old_entry_path);
{
int retval;
INITIALIZE_PATH(old_entry_path);
@@
-1321,6
+1322,9
@@
static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
unsigned long savelink = 1;
struct timespec ctime;
unsigned long savelink = 1;
struct timespec ctime;
+ if (flags & ~RENAME_NOREPLACE)
+ return -EINVAL;
+
/*
* three balancings: (1) old name removal, (2) new name insertion
* and (3) maybe "save" link insertion
/*
* three balancings: (1) old name removal, (2) new name insertion
* and (3) maybe "save" link insertion
This page took
0.053108 seconds
and
5
git commands to generate.