projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'topic/core-stuff-2014-08-15' of git://anongit.freedesktop.org/drm-intel...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
bad_inode.c
diff --git
a/fs/bad_inode.c
b/fs/bad_inode.c
index 7c93953030fbe5eda13d76b6a8c53d6f2a31902d..afd2b4408adf53d78c716043c847ba48cf5c3bef 100644
(file)
--- a/
fs/bad_inode.c
+++ b/
fs/bad_inode.c
@@
-218,8
+218,9
@@
static int bad_inode_mknod (struct inode *dir, struct dentry *dentry,
return -EIO;
}
return -EIO;
}
-static int bad_inode_rename (struct inode *old_dir, struct dentry *old_dentry,
- struct inode *new_dir, struct dentry *new_dentry)
+static int bad_inode_rename2(struct inode *old_dir, struct dentry *old_dentry,
+ struct inode *new_dir, struct dentry *new_dentry,
+ unsigned int flags)
{
return -EIO;
}
{
return -EIO;
}
@@
-279,7
+280,7
@@
static const struct inode_operations bad_inode_ops =
.mkdir = bad_inode_mkdir,
.rmdir = bad_inode_rmdir,
.mknod = bad_inode_mknod,
.mkdir = bad_inode_mkdir,
.rmdir = bad_inode_rmdir,
.mknod = bad_inode_mknod,
- .rename
= bad_inode_rename
,
+ .rename
2 = bad_inode_rename2
,
.readlink = bad_inode_readlink,
/* follow_link must be no-op, otherwise unmounting this inode
won't work */
.readlink = bad_inode_readlink,
/* follow_link must be no-op, otherwise unmounting this inode
won't work */