Hi Jens,
Please consider to pull these changes for the 3.7 merge window.
Best,
Phil
The following changes since commit a0d271cbfed1dd50278c6b06bead3d00ba0a88f9:
Linux 3.6 (2012-09-30 16:47:46 -0700)
are available in the git repository at:
git://git.drbd.org/linux-drbd.git for-jens
for you to fetch changes up to a783d564a1badbb87b3f96aa8df581ed4167a9c9:
drbd: log request sector offset and size for IO errors (2012-10-02 14:52:24 +0200)
----------------------------------------------------------------
Lars Ellenberg (9):
drbd: introduce stop-sector to online verify
drbd: change error cleanup goto for failed kobject_init_and_add
drbd: panic on delayed completion of aborted requests
drbd: fix potential deadlock during bitmap (re-)allocation
drbd: a few more GFP_KERNEL -> GFP_NOIO
drbd: wait for meta data IO completion even with failed disk, unless force-detached
drbd: prepare for more than 32 bit flags
drbd: always write bitmap on detach
drbd: log request sector offset and size for IO errors
Philipp Reisner (6):
drbd: Add a drbd directory to sysfs
drbd: expose the data generation identifiers via sysfs
drbd: Protect accesses to the uuid set with a spinlock
drbd: Fix a potential issue with the DISCARD_CONCURRENT flag
drbd: Avoid NetworkFailure state during disconnect
drbd: Remove dead code
drivers/block/drbd/Makefile | 1 +
drivers/block/drbd/drbd_actlog.c | 19 ++--
drivers/block/drbd/drbd_bitmap.c | 24 ++---
drivers/block/drbd/drbd_int.h | 112 +++++++++++++++++------
drivers/block/drbd/drbd_main.c | 175 ++++++++++++++++++++++++------------
drivers/block/drbd/drbd_nl.c | 109 +++++++++++++---------
drivers/block/drbd/drbd_proc.c | 14 ++-
drivers/block/drbd/drbd_receiver.c | 147 ++++++++++++++++--------------
drivers/block/drbd/drbd_req.c | 43 ++++++---
drivers/block/drbd/drbd_sysfs.c | 86 ++++++++++++++++++
drivers/block/drbd/drbd_worker.c | 87 ++++++++++++++----
include/linux/drbd.h | 4 +-
include/linux/drbd_nl.h | 1 +
13 files changed, 571 insertions(+), 251 deletions(-)
create mode 100644 drivers/block/drbd/drbd_sysfs.c
On 2012-10-02 15:02, Philipp Reisner wrote:
> Hi Jens,
>
> Please consider to pull these changes for the 3.7 merge window.
>
> Best,
> Phil
>
> The following changes since commit a0d271cbfed1dd50278c6b06bead3d00ba0a88f9:
>
> Linux 3.6 (2012-09-30 16:47:46 -0700)
>
> are available in the git repository at:
>
> git://git.drbd.org/linux-drbd.git for-jens
>
> for you to fetch changes up to a783d564a1badbb87b3f96aa8df581ed4167a9c9:
>
> drbd: log request sector offset and size for IO errors (2012-10-02 14:52:24 +0200)
Not pulled. Two reasons:
- It's late (in the merge window)
- and it's not based off my for-3.7/drivers branch, hence I get a ton of
unrelated changes with a pull into that branch.
--
Jens Axboe
> Not pulled. Two reasons:
>
> - It's late (in the merge window)
> - and it's not based off my for-3.7/drivers branch, hence I get a ton of
> unrelated changes with a pull into that branch.
Hi Jens,
I can rebase it for you in a few hours. Would influence this your decission?
Best,
Phil
Am Mittwoch, 3. Oktober 2012, 11:24:09 schrieben Sie:
> > Not pulled. Two reasons:
> >
> > - It's late (in the merge window)
> > - and it's not based off my for-3.7/drivers branch, hence I get a ton of
> >
> > unrelated changes with a pull into that branch.
>
> Hi Jens,
>
> I can rebase it for you in a few hours. Would influence this your decission?
>
Hi Jens,
Is there a convenient way for me to find our when it is the right time
to send pull requests your way? (i.e. a notification when you create your
for-3.x/drivers branch)
Rebasing it on your drivers tree was trivial, here is the updated pull
request:
The following changes since commit fab74e7a8f0f8d0af2356c28aa60d55f9e6f5f8b:
loop: Make explicit loop device destruction lazy (2012-09-28 10:42:23 +0200)
are available in the git repository at:
git://git.drbd.org/linux-drbd.git for-jens
for you to fetch changes up to 61e8114a682b0e868696f8363ed03e5fd4c750d1:
drbd: log request sector offset and size for IO errors (2012-10-03 11:54:45 +0200)
----------------------------------------------------------------
Lars Ellenberg (9):
drbd: introduce stop-sector to online verify
drbd: change error cleanup goto for failed kobject_init_and_add
drbd: panic on delayed completion of aborted requests
drbd: fix potential deadlock during bitmap (re-)allocation
drbd: a few more GFP_KERNEL -> GFP_NOIO
drbd: wait for meta data IO completion even with failed disk, unless force-detached
drbd: prepare for more than 32 bit flags
drbd: always write bitmap on detach
drbd: log request sector offset and size for IO errors
Philipp Reisner (6):
drbd: Add a drbd directory to sysfs
drbd: expose the data generation identifiers via sysfs
drbd: Protect accesses to the uuid set with a spinlock
drbd: Fix a potential issue with the DISCARD_CONCURRENT flag
drbd: Avoid NetworkFailure state during disconnect
drbd: Remove dead code
drivers/block/drbd/Makefile | 1 +
drivers/block/drbd/drbd_actlog.c | 19 ++--
drivers/block/drbd/drbd_bitmap.c | 24 ++---
drivers/block/drbd/drbd_int.h | 112 +++++++++++++++++------
drivers/block/drbd/drbd_main.c | 175 ++++++++++++++++++++++++------------
drivers/block/drbd/drbd_nl.c | 109 +++++++++++++---------
drivers/block/drbd/drbd_proc.c | 14 ++-
drivers/block/drbd/drbd_receiver.c | 147 ++++++++++++++++--------------
drivers/block/drbd/drbd_req.c | 43 ++++++---
drivers/block/drbd/drbd_sysfs.c | 86 ++++++++++++++++++
drivers/block/drbd/drbd_worker.c | 87 ++++++++++++++----
include/linux/drbd.h | 4 +-
include/linux/drbd_nl.h | 1 +
13 files changed, 571 insertions(+), 251 deletions(-)
create mode 100644 drivers/block/drbd/drbd_sysfs.c
Best,
Phil
On 2012-10-03 12:07, Philipp Reisner wrote:
> Am Mittwoch, 3. Oktober 2012, 11:24:09 schrieben Sie:
>>> Not pulled. Two reasons:
>>>
>>> - It's late (in the merge window)
>>> - and it's not based off my for-3.7/drivers branch, hence I get a ton of
>>>
>>> unrelated changes with a pull into that branch.
>>
>> Hi Jens,
>>
>> I can rebase it for you in a few hours. Would influence this your decission?
>>
>
> Hi Jens,
>
> Is there a convenient way for me to find our when it is the right time
> to send pull requests your way? (i.e. a notification when you create your
> for-3.x/drivers branch)
The right time is anytime between -rc1 and -rcN for the previous
release, where N is the last released -rc for that series. IOW, I should
have it before the next merge window opens, not a days into that window.
> Rebasing it on your drivers tree was trivial, here is the updated pull
> request:
>
> The following changes since commit fab74e7a8f0f8d0af2356c28aa60d55f9e6f5f8b:
>
> loop: Make explicit loop device destruction lazy (2012-09-28 10:42:23 +0200)
>
> are available in the git repository at:
>
> git://git.drbd.org/linux-drbd.git for-jens
>
> for you to fetch changes up to 61e8114a682b0e868696f8363ed03e5fd4c750d1:
>
> drbd: log request sector offset and size for IO errors (2012-10-03 11:54:45 +0200)
Thanks, one question before this is pulled in:
> Philipp Reisner (6):
> drbd: Add a drbd directory to sysfs
> drbd: expose the data generation identifiers via sysfs
What are these? It's sitting in /sys/block/<dev>/drbd/, I don't see any
documentation or justification for that.
Why isn't it off in debugfs or similar instead?
--
Jens Axboe
> Thanks, one question before this is pulled in:
> > Philipp Reisner (6):
> > drbd: Add a drbd directory to sysfs
> > drbd: expose the data generation identifiers via sysfs
>
> What are these? It's sitting in /sys/block/<dev>/drbd/, I don't see any
> documentation or justification for that.
>
> Why isn't it off in debugfs or similar instead?
The long-time goal is to get rid of the /proc/drbd virtual file, and
present the information that was there in a more structured way in /sys.
This patch adds a very first step into that direction. Later we intend to
have here things like the connections state, device roles, statistics
counters there.
When coming up with the layout we used the sysfs presence of software raid
as example.
I have removed it from this pull-request, so that there is more time for
consideration before the next merge window.
The following changes since commit fab74e7a8f0f8d0af2356c28aa60d55f9e6f5f8b:
loop: Make explicit loop device destruction lazy (2012-09-28 10:42:23 +0200)
are available in the git repository at:
git://git.drbd.org/linux-drbd.git for-jens
for you to fetch changes up to 56a2dabd4d953b70c4630387368d79d6d1625c1d:
drbd: log request sector offset and size for IO errors (2012-10-03 15:46:04 +0200)
----------------------------------------------------------------
Lars Ellenberg (8):
drbd: introduce stop-sector to online verify
drbd: panic on delayed completion of aborted requests
drbd: fix potential deadlock during bitmap (re-)allocation
drbd: a few more GFP_KERNEL -> GFP_NOIO
drbd: wait for meta data IO completion even with failed disk, unless force-detached
drbd: prepare for more than 32 bit flags
drbd: always write bitmap on detach
drbd: log request sector offset and size for IO errors
Philipp Reisner (4):
drbd: Protect accesses to the uuid set with a spinlock
drbd: Fix a potential issue with the DISCARD_CONCURRENT flag
drbd: Avoid NetworkFailure state during disconnect
drbd: Remove dead code
drivers/block/drbd/drbd_actlog.c | 19 ++--
drivers/block/drbd/drbd_bitmap.c | 24 ++---
drivers/block/drbd/drbd_int.h | 108 +++++++++++++++++------
drivers/block/drbd/drbd_main.c | 170 ++++++++++++++++++++++++------------
drivers/block/drbd/drbd_nl.c | 74 +++++++++-------
drivers/block/drbd/drbd_proc.c | 14 ++-
drivers/block/drbd/drbd_receiver.c | 147 ++++++++++++++++---------------
drivers/block/drbd/drbd_req.c | 43 ++++++---
drivers/block/drbd/drbd_worker.c | 87 ++++++++++++++----
include/linux/drbd.h | 4 +-
include/linux/drbd_nl.h | 1 +
11 files changed, 451 insertions(+), 240 deletions(-)
Best,
Phil
On 2012-10-03 15:49, Philipp Reisner wrote:
>> Thanks, one question before this is pulled in:
>>> Philipp Reisner (6):
>>> drbd: Add a drbd directory to sysfs
>>> drbd: expose the data generation identifiers via sysfs
>>
>> What are these? It's sitting in /sys/block/<dev>/drbd/, I don't see any
>> documentation or justification for that.
>>
>> Why isn't it off in debugfs or similar instead?
>
> The long-time goal is to get rid of the /proc/drbd virtual file, and
> present the information that was there in a more structured way in /sys.
>
> This patch adds a very first step into that direction. Later we intend to
> have here things like the connections state, device roles, statistics
> counters there.
>
> When coming up with the layout we used the sysfs presence of software raid
> as example.
Software raid is different, though, in that it's a class/type of device.
So for drbd, I'd still recommend you look outside of the regular
/sys/block hierarchy for adding something like this.
> I have removed it from this pull-request, so that there is more time for
> consideration before the next merge window.
Thanks, pulled.
--
Jens Axboe