Message ID | 1644689575-1235-2-git-send-email-dai.ngo@oracle.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | nfsd: Initial implementation of NFSv4 Courteous Server | expand |
> On Feb 12, 2022, at 1:12 PM, Dai Ngo <dai.ngo@oracle.com> wrote: > > Update lock usage of lock_manager_operations' functions. > > Signed-off-by: Dai Ngo <dai.ngo@oracle.com> I can apply this one to the nfsd tree if Jeff acks it. Also I think I want to amend the commit description to mention 6109c85037e5 ("locks: add a dedicated spinlock to protect i_flctx lists"), which is the commit that did the locking conversion, if that's OK with everyone. > --- > Documentation/filesystems/locking.rst | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/Documentation/filesystems/locking.rst b/Documentation/filesystems/locking.rst > index 3f9b1497ebb8..aaca0b601819 100644 > --- a/Documentation/filesystems/locking.rst > +++ b/Documentation/filesystems/locking.rst > @@ -438,13 +438,13 @@ prototypes:: > locking rules: > > ====================== ============= ================= ========= > -ops inode->i_lock blocked_lock_lock may block > +ops flc_lock blocked_lock_lock may block > ====================== ============= ================= ========= > -lm_notify: yes yes no > +lm_notify: no yes no > lm_grant: no no no > lm_break: yes no no > lm_change yes no no > -lm_breaker_owns_lease: no no no > +lm_breaker_owns_lease: yes no no > ====================== ============= ================= ========= > > buffer_head > -- > 2.9.5 > -- Chuck Lever
On Mon, 2022-02-14 at 17:03 +0000, Chuck Lever III wrote: > > > On Feb 12, 2022, at 1:12 PM, Dai Ngo <dai.ngo@oracle.com> wrote: > > > > Update lock usage of lock_manager_operations' functions. > > > > Signed-off-by: Dai Ngo <dai.ngo@oracle.com> > > I can apply this one to the nfsd tree if Jeff acks it. > > Also I think I want to amend the commit description to mention > 6109c85037e5 ("locks: add a dedicated spinlock to protect i_flctx lists"), > which is the commit that did the locking conversion, if that's > OK with everyone. > > Works for me. > > --- > > Documentation/filesystems/locking.rst | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/Documentation/filesystems/locking.rst b/Documentation/filesystems/locking.rst > > index 3f9b1497ebb8..aaca0b601819 100644 > > --- a/Documentation/filesystems/locking.rst > > +++ b/Documentation/filesystems/locking.rst > > @@ -438,13 +438,13 @@ prototypes:: > > locking rules: > > > > ====================== ============= ================= ========= > > -ops inode->i_lock blocked_lock_lock may block > > +ops flc_lock blocked_lock_lock may block > > ====================== ============= ================= ========= > > -lm_notify: yes yes no > > +lm_notify: no yes no > > lm_grant: no no no > > lm_break: yes no no > > lm_change yes no no > > -lm_breaker_owns_lease: no no no > > +lm_breaker_owns_lease: yes no no > > ====================== ============= ================= ========= > > > > buffer_head > > -- > > 2.9.5 > > > > -- > Chuck Lever > > > Reviewed-by: Jeff Layton <jlayton@kernel.org>
diff --git a/Documentation/filesystems/locking.rst b/Documentation/filesystems/locking.rst index 3f9b1497ebb8..aaca0b601819 100644 --- a/Documentation/filesystems/locking.rst +++ b/Documentation/filesystems/locking.rst @@ -438,13 +438,13 @@ prototypes:: locking rules: ====================== ============= ================= ========= -ops inode->i_lock blocked_lock_lock may block +ops flc_lock blocked_lock_lock may block ====================== ============= ================= ========= -lm_notify: yes yes no +lm_notify: no yes no lm_grant: no no no lm_break: yes no no lm_change yes no no -lm_breaker_owns_lease: no no no +lm_breaker_owns_lease: yes no no ====================== ============= ================= ========= buffer_head
Update lock usage of lock_manager_operations' functions. Signed-off-by: Dai Ngo <dai.ngo@oracle.com> --- Documentation/filesystems/locking.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)