Merge tag 'upstream-4.9-rc1' of git://git.infradead.org/linux-ubifs

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

diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index 4617d45..096035e 100644 (file)
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -157,6 +157,7 @@ enum {
        WB_MUTEX_1 = 0,
        WB_MUTEX_2 = 1,
        WB_MUTEX_3 = 2,
+       WB_MUTEX_4 = 3,
 };
 
 /*
@@ -1520,10 +1521,15 @@ int ubifs_jnl_write_data(struct ubifs_info *c, const struct inode *inode,
                         const union ubifs_key *key, const void *buf, int len);
 int ubifs_jnl_write_inode(struct ubifs_info *c, const struct inode *inode);
 int ubifs_jnl_delete_inode(struct ubifs_info *c, const struct inode *inode);
+int ubifs_jnl_xrename(struct ubifs_info *c, const struct inode *fst_dir,
+                     const struct dentry *fst_dentry,
+                     const struct inode *snd_dir,
+                     const struct dentry *snd_dentry, int sync);
 int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir,
                     const struct dentry *old_dentry,
                     const struct inode *new_dir,
-                    const struct dentry *new_dentry, int sync);
+                    const struct dentry *new_dentry,
+                    const struct inode *whiteout, int sync);
 int ubifs_jnl_truncate(struct ubifs_info *c, const struct inode *inode,
                       loff_t old_size, loff_t new_size);
 int ubifs_jnl_delete_xattr(struct ubifs_info *c, const struct inode *host,