Merge tag 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford...

[cascardo/linux.git] / fs / affs / affs.h

diff --git a/fs/affs/affs.h b/fs/affs/affs.h
index cc2b2ef..2f08877 100644 (file)
--- a/fs/affs/affs.h
+++ b/fs/affs/affs.h
@@ -173,7 +173,8 @@ extern int  affs_link(struct dentry *olddentry, struct inode *dir,
 extern int     affs_symlink(struct inode *dir, struct dentry *dentry,
                             const char *symname);
 extern int     affs_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);
 
 /* inode.c */