From 40d9ea53c45b3057d66360b50ef78005efdaaa83 Mon Sep 17 00:00:00 2001
From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Tue, 31 Mar 2009 00:32:40 +0400
Subject: [PATCH] --- yaml --- r: 138996 b: refs/heads/master c:
 77e465867080c2d1e0c410e96dcdcd51e8584a6f h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/include/linux/reiserfs_acl.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4531fd431591..3208cc43eb28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfbbe89e197a77f2c8046a51c74e33e35f878080
+refs/heads/master: 77e465867080c2d1e0c410e96dcdcd51e8584a6f
diff --git a/trunk/include/linux/reiserfs_acl.h b/trunk/include/linux/reiserfs_acl.h
index 52240e02de02..8cc65757e47a 100644
--- a/trunk/include/linux/reiserfs_acl.h
+++ b/trunk/include/linux/reiserfs_acl.h
@@ -80,7 +80,8 @@ static inline int reiserfs_acl_chmod(struct inode *inode)
 }
 
 static inline int
-reiserfs_inherit_default_acl(const struct inode *dir, struct dentry *dentry,
+reiserfs_inherit_default_acl(struct reiserfs_transaction_handle *th,
+			     const struct inode *dir, struct dentry *dentry,
 			     struct inode *inode)
 {
 	return 0;