linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Li Zefan <lizf@cn.fujitsu.com>
To: Chris Mason <chris.mason@oracle.com>
Cc: "linux-btrfs@vger.kernel.org" <linux-btrfs@vger.kernel.org>
Subject: [PATCH 08/16] Btrfs: make acl functions really no-op if acl is not enabled
Date: Thu, 14 Jul 2011 11:17:39 +0800	[thread overview]
Message-ID: <4E1E5FD3.4020408@cn.fujitsu.com> (raw)
In-Reply-To: <4E1E5F59.5030208@cn.fujitsu.com>

So there's no overhead for something we don't use.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
 fs/btrfs/Makefile |    4 +++-
 fs/btrfs/acl.c    |   17 -----------------
 fs/btrfs/ctree.h  |   15 ++++++++++++---
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile
index 9b72dcf..40e6ac0 100644
--- a/fs/btrfs/Makefile
+++ b/fs/btrfs/Makefile
@@ -6,5 +6,7 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \
 	   transaction.o inode.o file.o tree-defrag.o \
 	   extent_map.o sysfs.o struct-funcs.o xattr.o ordered-data.o \
 	   extent_io.o volumes.o async-thread.o ioctl.o locking.o orphan.o \
-	   export.o tree-log.o acl.o free-space-cache.o zlib.o lzo.o \
+	   export.o tree-log.o free-space-cache.o zlib.o lzo.o \
 	   compression.o delayed-ref.o relocation.o delayed-inode.o scrub.o
+
+btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index f66fc99..b206d4c 100644
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -28,8 +28,6 @@
 #include "btrfs_inode.h"
 #include "xattr.h"
 
-#ifdef CONFIG_BTRFS_FS_POSIX_ACL
-
 static struct posix_acl *btrfs_get_acl(struct inode *inode, int type)
 {
 	int size;
@@ -318,18 +316,3 @@ const struct xattr_handler btrfs_xattr_acl_access_handler = {
 	.get	= btrfs_xattr_acl_get,
 	.set	= btrfs_xattr_acl_set,
 };
-
-#else /* CONFIG_BTRFS_FS_POSIX_ACL */
-
-int btrfs_acl_chmod(struct inode *inode)
-{
-	return 0;
-}
-
-int btrfs_init_acl(struct btrfs_trans_handle *trans,
-		   struct inode *inode, struct inode *dir)
-{
-	return 0;
-}
-
-#endif /* CONFIG_BTRFS_FS_POSIX_ACL */
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 60e13ef..b5097e2 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2644,12 +2644,21 @@ do {								\
 /* acl.c */
 #ifdef CONFIG_BTRFS_FS_POSIX_ACL
 int btrfs_check_acl(struct inode *inode, int mask, unsigned int flags);
-#else
-#define btrfs_check_acl NULL
-#endif
 int btrfs_init_acl(struct btrfs_trans_handle *trans,
 		   struct inode *inode, struct inode *dir);
 int btrfs_acl_chmod(struct inode *inode);
+#else
+#define btrfs_check_acl NULL
+static inline int btrfs_init_acl(struct btrfs_trans_handle *trans,
+				 struct inode *inode, struct inode *dir)
+{
+	return 0;
+}
+static inline int btrfs_acl_chmod(struct inode *inode)
+{
+	return 0;
+}
+#endif
 
 /* relocation.c */
 int btrfs_relocate_block_group(struct btrfs_root *root, u64 group_start);
-- 
1.7.3.1

  parent reply	other threads:[~2011-07-14  3:17 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-14  3:15 [PATCH 00/16] Btrfs: fixes and cleanups for 3.1 Li Zefan
2011-07-14  3:16 ` [PATCH 01/16] Btrfs: copy string correctly in INO_LOOKUP ioctl Li Zefan
2011-07-14  3:16 ` [PATCH 02/16] Btrfs: fix space leak when skipping small extents during trimming Li Zefan
2011-07-14  3:16 ` [PATCH 03/16] Btrfs: fix space leak when trimming free extents Li Zefan
2011-07-14  3:16 ` [PATCH 04/16] Btrfs: check the nodatasum flag when writing compressed files Li Zefan
2011-07-14  3:17 ` [PATCH 05/16] Btrfs: use wait_event() Li Zefan
2011-07-14  3:17 ` [PATCH 06/16] Btrfs: remove a BUG_ON() in btrfs_commit_transaction() Li Zefan
2011-07-14  3:17 ` [PATCH 07/16] Btrfs: remove remaining ref-cache code Li Zefan
2011-07-14  3:17 ` Li Zefan [this message]
2011-07-14  3:17 ` [PATCH 09/16] Btrfs: remove redundant code for dir item lookup Li Zefan
2011-07-14  3:18 ` [PATCH 10/16] Btrfs: clean up search_extent_mapping() Li Zefan
2011-07-14  3:18 ` [PATCH 11/16] Btrfs: clean up code for extent_map lookup Li Zefan
2011-07-22 13:20   ` David Sterba
2011-07-14  3:18 ` [PATCH 12/16] Btrfs: clean up code for merging extent maps Li Zefan
2011-07-14  3:18 ` [PATCH 13/16] Btrfs: remove unused members from struct extent_state Li Zefan
2011-07-14  3:19 ` [PATCH 14/16] Btrfs: clean up for insert_state() Li Zefan
2011-07-14  3:19 ` [PATCH 15/16] Btrfs: clean up for wait_extent_bit() Li Zefan
2011-07-14  3:19 ` [PATCH 16/16] Btrfs: clean up for find_first_extent_bit() Li Zefan
2011-07-14  3:21 ` [PATCH 00/16] Btrfs: fixes and cleanups for 3.1 Li Zefan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4E1E5FD3.4020408@cn.fujitsu.com \
    --to=lizf@cn.fujitsu.com \
    --cc=chris.mason@oracle.com \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).