From 11d53f3d91b0e5c7d78d401feebc79a7158124a8 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 17 Mar 2012 01:03:10 -0400
Subject: [PATCH] --- yaml --- r: 292349 b: refs/heads/master c:
 a3063ab88fcbe5249f841cb95dfd626b8bf2674f h: refs/heads/master i:   292347:
 6d3adb2595d36a5314c54682b7fa9a67d6c215b0 v: v3

---
 [refs]                                                    | 2 +-
 trunk/{include/linux/reiserfs_acl.h => fs/reiserfs/acl.h} | 0
 trunk/fs/reiserfs/file.c                                  | 2 +-
 trunk/fs/reiserfs/inode.c                                 | 2 +-
 trunk/fs/reiserfs/namei.c                                 | 2 +-
 trunk/fs/reiserfs/super.c                                 | 2 +-
 trunk/fs/reiserfs/xattr.c                                 | 2 +-
 trunk/fs/reiserfs/xattr_acl.c                             | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename trunk/{include/linux/reiserfs_acl.h => fs/reiserfs/acl.h} (100%)

diff --git a/[refs] b/[refs]
index 9c479dfa56d6..3928f2db1daf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c45ac8887e778c4fa2b572c51a94a681a0955d4d
+refs/heads/master: a3063ab88fcbe5249f841cb95dfd626b8bf2674f
diff --git a/trunk/include/linux/reiserfs_acl.h b/trunk/fs/reiserfs/acl.h
similarity index 100%
rename from trunk/include/linux/reiserfs_acl.h
rename to trunk/fs/reiserfs/acl.h
diff --git a/trunk/fs/reiserfs/file.c b/trunk/fs/reiserfs/file.c
index e26ee4988e78..3fa5915dea6e 100644
--- a/trunk/fs/reiserfs/file.c
+++ b/trunk/fs/reiserfs/file.c
@@ -4,7 +4,7 @@
 
 #include <linux/time.h>
 #include <linux/reiserfs_fs.h>
-#include <linux/reiserfs_acl.h>
+#include "acl.h"
 #include "xattr.h"
 #include <asm/uaccess.h>
 #include <linux/pagemap.h>
diff --git a/trunk/fs/reiserfs/inode.c b/trunk/fs/reiserfs/inode.c
index 894c7316e9c6..b696493d6b66 100644
--- a/trunk/fs/reiserfs/inode.c
+++ b/trunk/fs/reiserfs/inode.c
@@ -5,7 +5,7 @@
 #include <linux/time.h>
 #include <linux/fs.h>
 #include <linux/reiserfs_fs.h>
-#include <linux/reiserfs_acl.h>
+#include "acl.h"
 #include "xattr.h"
 #include <linux/exportfs.h>
 #include <linux/pagemap.h>
diff --git a/trunk/fs/reiserfs/namei.c b/trunk/fs/reiserfs/namei.c
index cb67ebf882a9..34bdab29883b 100644
--- a/trunk/fs/reiserfs/namei.c
+++ b/trunk/fs/reiserfs/namei.c
@@ -15,7 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/slab.h>
 #include <linux/reiserfs_fs.h>
-#include <linux/reiserfs_acl.h>
+#include "acl.h"
 #include "xattr.h"
 #include <linux/quotaops.h>
 
diff --git a/trunk/fs/reiserfs/super.c b/trunk/fs/reiserfs/super.c
index a67fc7d28de5..cf68a6ba0ec6 100644
--- a/trunk/fs/reiserfs/super.c
+++ b/trunk/fs/reiserfs/super.c
@@ -17,7 +17,7 @@
 #include <linux/time.h>
 #include <asm/uaccess.h>
 #include <linux/reiserfs_fs.h>
-#include <linux/reiserfs_acl.h>
+#include "acl.h"
 #include "xattr.h"
 #include <linux/init.h>
 #include <linux/blkdev.h>
diff --git a/trunk/fs/reiserfs/xattr.c b/trunk/fs/reiserfs/xattr.c
index ead5d8aab440..61c9b5633e27 100644
--- a/trunk/fs/reiserfs/xattr.c
+++ b/trunk/fs/reiserfs/xattr.c
@@ -44,7 +44,7 @@
 #include <linux/pagemap.h>
 #include <linux/xattr.h>
 #include "xattr.h"
-#include <linux/reiserfs_acl.h>
+#include "acl.h"
 #include <asm/uaccess.h>
 #include <net/checksum.h>
 #include <linux/stat.h>
diff --git a/trunk/fs/reiserfs/xattr_acl.c b/trunk/fs/reiserfs/xattr_acl.c
index c0a8c519b2e1..f09094057eaa 100644
--- a/trunk/fs/reiserfs/xattr_acl.c
+++ b/trunk/fs/reiserfs/xattr_acl.c
@@ -8,7 +8,7 @@
 #include <linux/slab.h>
 #include <linux/posix_acl_xattr.h>
 #include "xattr.h"
-#include <linux/reiserfs_acl.h>
+#include "acl.h"
 #include <asm/uaccess.h>
 
 static int reiserfs_set_acl(struct reiserfs_transaction_handle *th,