---

yaml --- r: 138996 b: refs/heads/master c: 77e4658 h: refs/heads/master v: v3
git-mirror · Mar 30, 2009 · 40d9ea5 · 40d9ea5
1 parent 99d35c6
commit 40d9ea5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;