summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-03-17 09:03:10 +0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-03-21 05:29:42 +0400
commita3063ab88fcbe5249f841cb95dfd626b8bf2674f (patch)
treebb3304f3317a4075cee2926b39867336cae708b0
parentc45ac8887e778c4fa2b572c51a94a681a0955d4d (diff)
downloadlinux-a3063ab88fcbe5249f841cb95dfd626b8bf2674f.tar.xz
move reiserfs_acl.h to fs/reiserfs/acl.h
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/reiserfs/acl.h (renamed from include/linux/reiserfs_acl.h)0
-rw-r--r--fs/reiserfs/file.c2
-rw-r--r--fs/reiserfs/inode.c2
-rw-r--r--fs/reiserfs/namei.c2
-rw-r--r--fs/reiserfs/super.c2
-rw-r--r--fs/reiserfs/xattr.c2
-rw-r--r--fs/reiserfs/xattr_acl.c2
7 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/reiserfs_acl.h b/fs/reiserfs/acl.h
index f096b80e73d8..f096b80e73d8 100644
--- a/include/linux/reiserfs_acl.h
+++ b/fs/reiserfs/acl.h
diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
index e26ee4988e78..3fa5915dea6e 100644
--- a/fs/reiserfs/file.c
+++ b/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/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 894c7316e9c6..b696493d6b66 100644
--- a/fs/reiserfs/inode.c
+++ b/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/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index cb67ebf882a9..34bdab29883b 100644
--- a/fs/reiserfs/namei.c
+++ b/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/fs/reiserfs/super.c b/fs/reiserfs/super.c
index a67fc7d28de5..cf68a6ba0ec6 100644
--- a/fs/reiserfs/super.c
+++ b/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/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
index ead5d8aab440..61c9b5633e27 100644
--- a/fs/reiserfs/xattr.c
+++ b/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/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c
index c0a8c519b2e1..f09094057eaa 100644
--- a/fs/reiserfs/xattr_acl.c
+++ b/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,