diff mbox

[22/24] Btrfs: sysfs: don't fail seeding for the sake of sysfs kobject issue

Message ID 1423439785-10260-23-git-send-email-anand.jain@oracle.com (mailing list archive)
State Superseded
Headers show

Commit Message

Anand Jain Feb. 8, 2015, 11:56 p.m. UTC
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
 fs/btrfs/volumes.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

David Sterba Feb. 11, 2015, 6:40 p.m. UTC | #1
On Mon, Feb 09, 2015 at 07:56:23AM +0800, Anand Jain wrote:
> Signed-off-by: Anand Jain <anand.jain@oracle.com>
> ---
>  fs/btrfs/volumes.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
> index 51873ec..1490723 100644
> --- a/fs/btrfs/volumes.c
> +++ b/fs/btrfs/volumes.c
> @@ -2249,7 +2249,8 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
>  						root->fs_info->fsid);
>  		if (kobject_rename(&root->fs_info->fs_devices->super_kobj,
>  								fsid_buf))
> -			goto error_trans;
> +			printk(KERN_WARNING\
> +			"BTRFS: sysfs: failed to create fsid for sprout\n");

You can safely use btrfs_warn here.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Anand Jain Feb. 12, 2015, 3:22 a.m. UTC | #2
On 02/12/2015 02:40 AM, David Sterba wrote:
> On Mon, Feb 09, 2015 at 07:56:23AM +0800, Anand Jain wrote:
>> Signed-off-by: Anand Jain <anand.jain@oracle.com>
>> ---
>>   fs/btrfs/volumes.c | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
>> index 51873ec..1490723 100644
>> --- a/fs/btrfs/volumes.c
>> +++ b/fs/btrfs/volumes.c
>> @@ -2249,7 +2249,8 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
>>   						root->fs_info->fsid);
>>   		if (kobject_rename(&root->fs_info->fs_devices->super_kobj,
>>   								fsid_buf))
>> -			goto error_trans;
>> +			printk(KERN_WARNING\
>> +			"BTRFS: sysfs: failed to create fsid for sprout\n");
>
> You can safely use btrfs_warn here.
>

right. I tried to know what to use before, but wasn't sure. would you be 
able to accept it as it is ? OR I can send a new patch to correct this. 
Just that changing this commit would fail further commits like
   Btrfs: sysfs: support seed devices in the sysfs layout.

Thanks, Anand

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Sterba Feb. 13, 2015, 4:15 p.m. UTC | #3
On Thu, Feb 12, 2015 at 11:22:38AM +0800, Anand Jain wrote:
> 
> 
> On 02/12/2015 02:40 AM, David Sterba wrote:
> > On Mon, Feb 09, 2015 at 07:56:23AM +0800, Anand Jain wrote:
> >> Signed-off-by: Anand Jain <anand.jain@oracle.com>
> >> ---
> >>   fs/btrfs/volumes.c | 3 ++-
> >>   1 file changed, 2 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
> >> index 51873ec..1490723 100644
> >> --- a/fs/btrfs/volumes.c
> >> +++ b/fs/btrfs/volumes.c
> >> @@ -2249,7 +2249,8 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
> >>   						root->fs_info->fsid);
> >>   		if (kobject_rename(&root->fs_info->fs_devices->super_kobj,
> >>   								fsid_buf))
> >> -			goto error_trans;
> >> +			printk(KERN_WARNING\
> >> +			"BTRFS: sysfs: failed to create fsid for sprout\n");
> >
> > You can safely use btrfs_warn here.
> >
> 
> right. I tried to know what to use before, but wasn't sure.

There's already btrfs_error used in the function. The only context where
the message macros are not usable is during mount when fs_info is not
available.

> would you be 
> able to accept it as it is ? OR I can send a new patch to correct this. 
> Just that changing this commit would fail further commits like
>    Btrfs: sysfs: support seed devices in the sysfs layout.

But this patch also needs to apply the same sort of change, please
resend. Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Anand Jain March 9, 2015, 5:10 p.m. UTC | #4
On 02/13/2015 11:15 AM, David Sterba wrote:
> On Thu, Feb 12, 2015 at 11:22:38AM +0800, Anand Jain wrote:
>>
>>
>> On 02/12/2015 02:40 AM, David Sterba wrote:
>>> On Mon, Feb 09, 2015 at 07:56:23AM +0800, Anand Jain wrote:
>>>> Signed-off-by: Anand Jain <anand.jain@oracle.com>
>>>> ---
>>>>    fs/btrfs/volumes.c | 3 ++-
>>>>    1 file changed, 2 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
>>>> index 51873ec..1490723 100644
>>>> --- a/fs/btrfs/volumes.c
>>>> +++ b/fs/btrfs/volumes.c
>>>> @@ -2249,7 +2249,8 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
>>>>    						root->fs_info->fsid);
>>>>    		if (kobject_rename(&root->fs_info->fs_devices->super_kobj,
>>>>    								fsid_buf))
>>>> -			goto error_trans;
>>>> +			printk(KERN_WARNING\
>>>> +			"BTRFS: sysfs: failed to create fsid for sprout\n");
>>>
>>> You can safely use btrfs_warn here.
>>>
>>
>> right. I tried to know what to use before, but wasn't sure.
>
> There's already btrfs_error used in the function. The only context where
> the message macros are not usable is during mount when fs_info is not
> available.
>
>> would you be
>> able to accept it as it is ? OR I can send a new patch to correct this.
>> Just that changing this commit would fail further commits like
>>     Btrfs: sysfs: support seed devices in the sysfs layout.
>
> But this patch also needs to apply the same sort of change, please
> resend. Thanks.

I got this in my local ws. Will be sending it out.

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

Patch

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 51873ec..1490723 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2249,7 +2249,8 @@  int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
 						root->fs_info->fsid);
 		if (kobject_rename(&root->fs_info->fs_devices->super_kobj,
 								fsid_buf))
-			goto error_trans;
+			printk(KERN_WARNING\
+			"BTRFS: sysfs: failed to create fsid for sprout\n");
 	}
 
 	root->fs_info->num_tolerated_disk_barrier_failures =