TRIM support

Commit Message

Leonidas Spyropoulos July 3, 2011, 3:28 p.m. UTC

On Sun, Jul 3, 2011 at 3:54 PM, Hubert Kario <[e-mail]> wrote:
> On Sunday 03 of July 2011 14:56:40 Leonidas Spyropoulos wrote:
>> On Sun, Jul 3, 2011 at 1:20 PM, Hubert Kario <[e-mail]> wrote:
>> > On Sunday 03 of July 2011 00:40:46 Leonidas Spyropoulos wrote:
>> >> On Sat, Jul 2, 2011 at 11:39 PM, Leonidas Spyropoulos
>> >>
>> >> <[e-mail]> wrote:
>> >> > On Sat, Jul 2, 2011 at 8:45 PM, Calvin Walton
>> >> > <[e-mail]>
>> >
>> > wrote:
>> >> >> On Sat, 2011-07-02 at 19:08 +0100, Leonidas Spyropoulos wrote:
>> >> >>> Hello,
>> >> >>>
>> >> >>> I just installed an archlinux with btrfs root partition and would
>> >> >>> like to set the correct mount properties
>> >> >>> Following this:
>> >> >>> https://wiki.archlinux.org/index.php/Solid_State_Drives
>> >> >>> it says there that I should use the discard mount parameter to
>> >> >>> enable TRIM.
>> >> >>>
>> >> >>> I would like to ask by using ssd mount parameter would TRIM be
>> >> >>> enabled? The SSD is Intel 320 Series 120Gb
>> >> >>
>> >> >> No, the "ssd" mount parameter has nothing to do with TRIM.
>> >> >>
>> >> >> The "ssd" mount parameter adjusts a couple of tuning parameters where
>> >> >> the default setting is designed to improve performance on spinning
>> >> >> HDD, and instead tunes for the random-access ability of an SSD.
>> >> >>
>> >> >> The ssd option is automatically enabled if the kernel detects that
>> >> >> your drive is an SSD (you can check with 'cat /proc/mounts').
>> >> >>
>> >> >> The discard option is not currently automatically enabled; I think
>> >> >> there may have been some performance issues in certain cases with
>> >> >> drives that have slow trim implementations. But feel free to give it
>> >> >> a try.
>> >> >>
>> >> >> --
>> >> >> Calvin Walton <[e-mail]>
>> >>
>> >> On the same system when I try to compile the btrfs-tools I get an error.
>> >> Since on the wiki you mention only the packages for Fedora and Debian,
>> >>
>> >> Which are the requirements for the btrfs tools?
>> >>
>> >> PS: AUR package is broken as well.
>> >
>> > the AUR package is OK, problem is that the sources don't compile with new
>> > gcc.
>> >
>> > Download Hugo's integration branch
>> > http://git.darksatanic.net/repo/btrfs-progs-unstable.git/
>> > integration-20110630
>>
>> I download the files:
>>
>> git clone  http://git.darksatanic.net/repo/btrfs-progs-unstable.git/
>> integration-20110630
>>
>> > and apply my patch to it:
>> > http://www.spinics.net/lists/linux-btrfs/msg10965.html
>>
>> Then I tried to apply the patch you mentioned:
>>
>> patch < rem.diff
>>
>> but it's failing:
>> The rem.diff is the file attached
>>
>> > --
>> > Hubert Kario
>> > QBS - Quality Business Software
>> > 02-656 Warszawa, ul. Ksawerów 30/85
>> > tel. [phone]
>> > www.qbs.com.pl
>>
>> Here is the error I am getting:
>> patching file mkfs.c
>> Hunk #1 FAILED at 1060.
>> Hunk #2 FAILED at 1070.
>> 2 out of 2 hunks FAILED -- saving rejects to file mkfs.c.rej
>> patching file volumes.c
>> Hunk #1 FAILED at 868.
>> Hunk #2 FAILED at 920.
>> 2 out of 2 hunks FAILED -- saving rejects to file volumes.c.rej
>>
>> I think the file I created is wrong.
>> What is the accepted format for the patch command?
>
> You may also want to try
> git checkout integration-20110626
> there were some problems with 20110630 AFAICR
>
> Hubert
>
Hey Hubert,

Thanks for the suggestions
I think I am using the wrong format for the patch.
Can you confirm that the patch file named rem.diff should be like the
one I attach on the email?

I get the same error when trying git apply on both integrations:
git apply ../rem.diff
error: patch failed: mkfs.c:1060
error: mkfs.c: patch does not apply
error: patch failed: volumes.c:888
error: volumes.c: patch does not apply

I finally got it to compile the integration-20110626 by manually
finding the four lines and deleting them.

Here is the git diff
---
Thanks for the help

Leonidas

P.S.: I always forget to Reply to All Sorry for double email Hubert
--
Caution: breathing may be hazardous to your health.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/mkfs.c b/mkfs.c
index 1b5ef06..d40b2e8 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -1060,7 +1060,6 @@  static int make_image(char *source_dir, struct
btrfs_root *root, int
       struct btrfs_trans_handle *trans;

       struct stat root_st;
-       int root_len;

       struct directory_name_entry dir_head;

@@ -1070,8 +1069,6 @@  static int make_image(char *source_dir, struct
btrfs_root *root, int
               goto fail;
       }

-       root_len = strlen(source_dir);
-
       INIT_LIST_HEAD(&dir_head.list);

       trans = btrfs_start_transaction(root, 1);
diff --git a/volumes.c b/volumes.c
index 61af845..95c2e0d 100644
--- a/volumes.c
+++ b/volumes.c
@@ -868,7 +868,6 @@  int btrfs_alloc_data_chunk(struct btrfs_trans_handle *trans,
       struct list_head *dev_list = &extent_root->fs_info->fs_devices->devices;
       struct list_head *cur;
       struct map_lookup *map;
-       u64 physical;
       u64 calc_size = 8 * 1024 * 1024;
       int num_stripes = 1;
       int sub_stripes = 0;
@@ -920,7 +919,6 @@  int btrfs_alloc_data_chunk(struct btrfs_trans_handle *trans,
               btrfs_set_stack_stripe_devid(stripe, device->devid);
               btrfs_set_stack_stripe_offset(stripe, dev_offset);
               memcpy(stripe->dev_uuid, device->uuid, BTRFS_UUID_SIZE);
-               physical = dev_offset;
               index++;
       }