[PATCH] fs: btrfs: Shuffle preprocessor macros

[Sankar P]

The function btree_migratepage will be extended from the baseclass
only when CONFIG_MIGRATION option is enabled. So, it's useful to
define/build this function only when that config option is enabled.

Fixes an unused function  compiler warning when CONFIG_MIGRATION
is not enabled and also removes an return -ENOSYS statement,
whose scenario will not happen.

Signed-off-by: Sankar P sankar.curios...@gmail.com
---
 fs/btrfs/disk-io.c |6 ++
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index c547cca..7199239 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -696,6 +696,7 @@ static int btree_submit_bio_hook(struct inode *inode, int 
rw, struct bio *bio,
   __btree_submit_bio_done);
 }
 
+#ifdef CONFIG_MIGRATION
 static int btree_migratepage(struct address_space *mapping,
struct page *newpage, struct page *page)
 {
@@ -712,12 +713,9 @@ static int btree_migratepage(struct address_space *mapping,
if (page_has_private(page) 
!try_to_release_page(page, GFP_KERNEL))
return -EAGAIN;
-#ifdef CONFIG_MIGRATION
return migrate_page(mapping, newpage, page);
-#else
-   return -ENOSYS;
-#endif
 }
+#endif
 
 static int btree_writepage(struct page *page, struct writeback_control *wbc)
 {
-- 
1.7.1

--
To unsubscribe from this list: send the line unsubscribe linux-btrfs in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] Spelling fix in btrfs code comment

[Sankar P]

On Mon, May 11, 2009 at 9:16 PM, Jiri Kosina jkos...@suse.cz wrote:
 On Sat, 9 May 2009, Sankar P wrote:

 Fix a trivial spelling error in a comment

 Signed-off-by: Sankar P sankar.curios...@gmail.com

 ---
 diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
 index e496644..3e2c7c7 100644
 --- a/fs/btrfs/extent-tree.c
 +++ b/fs/btrfs/extent-tree.c
 @@ -312,7 +312,7 @@ btrfs_lookup_first_block_group(struct btrfs_fs_info 
 *info, u64 bytenr)
  }

  /*
 - * return the block group that contains teh given bytenr
 + * return the block group that contains the given bytenr
   */
  struct btrfs_block_group_cache *btrfs_lookup_block_group(
                                                struct btrfs_fs_info *info,

 Appplied to trivial tree. If it has been already applied to btrfs pileup,
 please let me know so that I could drop it.

This is now available in the btrfs tree and Linus' tree. Thanks.


 Thanks,

 --
 Jiri Kosina
 SUSE Labs


--
Sankar
--
To unsubscribe from this list: send the line unsubscribe linux-btrfs in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] Spelling fix in btrfs code comment

[Sankar P]

Fix a trivial spelling error in a comment

Signed-off-by: Sankar P sankar.curios...@gmail.com

---
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index e496644..3e2c7c7 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -312,7 +312,7 @@ btrfs_lookup_first_block_group(struct btrfs_fs_info *info, 
u64 bytenr)
 }
 
 /*
- * return the block group that contains teh given bytenr
+ * return the block group that contains the given bytenr
  */
 struct btrfs_block_group_cache *btrfs_lookup_block_group(
 struct btrfs_fs_info *info,


--
To unsubscribe from this list: send the line unsubscribe linux-btrfs in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html