1. 24 Nov, 2014 1 commit
  2. 09 Sep, 2014 3 commits
    • Jeff Layton's avatar
      lockd: rip out deferred lock handling from testlock codepath · 09802fd2
      Jeff Layton authored
      As Kinglong points out, the nlm_block->b_fl field is no longer used at
      all. Also, vfs_test_lock in the generic locking code will only return
      FILE_LOCK_DEFERRED if FL_SLEEP is set, and it isn't here.
      The only other place that returns that value is the DLM lock code, but
      it only does that in dlm_posix_lock, never in dlm_posix_get.
      Remove all of the deferred locking code from the testlock codepath
      since it doesn't appear to ever be used anyway.
      I do have a small concern that this might cause a behavior change in the
      case where you have a block already sitting on the list when the
      testlock request comes in, but that looks like it doesn't really work
      properly anyway. I think it's best to just pass that down to
      vfs_test_lock and let the filesystem report that instead of trying to
      infer what's going on with the lock by looking at an existing block.
      Cc: cluster-devel@redhat.com
      Signed-off-by: default avatarJeff Layton <jlayton@primarydata.com>
      Reviewed-by: default avatarKinglong Mee <kinglongmee@gmail.com>
    • Kinglong Mee's avatar
      locks: Copy fl_lmops information for conflock in locks_copy_conflock() · f328296e
      Kinglong Mee authored
      Commit d5b9026a ([PATCH] knfsd: locks: flag NFSv4-owned locks) using
      fl_lmops field in file_lock for checking nfsd4 lockowner.
      But, commit 1a747ee0 (locks: don't call ->copy_lock methods on return
      of conflicting locks) causes the fl_lmops of conflock always be NULL.
      Also, commit 0996905f (lockd: posix_test_lock() should not call
      locks_copy_lock()) caused the fl_lmops of conflock always be NULL too.
      Make sure copy the private information by fl_copy_lock() in struct
      file_lock_operations, merge __locks_copy_lock() to fl_copy_lock().
      Jeff advice, "Set fl_lmops on conflocks, but don't set fl_ops.
      fl_ops are superfluous, since they are callbacks into the filesystem.
      There should be no need to bother the filesystem at all with info
      in a conflock. But, lock _ownership_ matters for conflocks and that's
      indicated by the fl_lmops. So you really do want to copy the fl_lmops
      for conflocks I think."
      v5: add missing calling of locks_release_private() in nlmsvc_testlock()
      v4: only copy fl_lmops for conflock, don't copy fl_ops
      Signed-off-by: default avatarKinglong Mee <kinglongmee@gmail.com>
      Signed-off-by: default avatarJeff Layton <jlayton@primarydata.com>
    • Joe Perches's avatar
      locks: Remove unused conf argument from lm_grant · d0449b90
      Joe Perches authored
      This argument is always NULL so don't pass it around.
      [jlayton: remove dependencies on previous patches in series]
      Signed-off-by: default avatarJoe Perches <joe@perches.com>
      Signed-off-by: default avatarJeff Layton <jlayton@primarydata.com>
  3. 13 Feb, 2014 1 commit
    • NeilBrown's avatar
      lockd: send correct lock when granting a delayed lock. · 2ec197db
      NeilBrown authored
      If an NFS client attempts to get a lock (using NLM) and the lock is
      not available, the server will remember the request and when the lock
      becomes available it will send a GRANT request to the client to
      provide the lock.
      If the client already held an adjacent lock, the GRANT callback will
      report the union of the existing and new locks, which can confuse the
      This happens because __posix_lock_file (called by vfs_lock_file)
      updates the passed-in file_lock structure when adjacent or
      over-lapping locks are found.
      To avoid this problem we take a copy of the two fields that can
      be changed (fl_start and fl_end) before the call and restore them
      An alternate would be to allocate a 'struct file_lock', initialise it,
      use locks_copy_lock() to take a copy, then locks_release_private()
      after the vfs_lock_file() call.  But that is a lot more work.
      Reported-by: default avatarOlaf Kirch <okir@suse.com>
      Signed-off-by: default avatarNeilBrown <neilb@suse.de>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      v1 had a couple of issues (large on-stack struct and didn't really work properly).
      This version is much better tested.
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
  4. 11 Jul, 2013 1 commit
    • David Jeffery's avatar
      lockd: protect nlm_blocked access in nlmsvc_retry_blocked · 1c327d96
      David Jeffery authored
      In nlmsvc_retry_blocked, the check that the list is non-empty and acquiring
      the pointer of the first entry is unprotected by any lock.  This allows a rare
      race condition when there is only one entry on the list.  A function such as
      nlmsvc_grant_callback() can be called, which will temporarily remove the entry
      from the list.  Between the list_empty() and list_entry(),the list may become
      empty, causing an invalid pointer to be used as an nlm_block, leading to a
      possible crash.
      This patch adds the nlm_block_lock around these calls to prevent concurrent
      use of the nlm_blocked list.
      This was a regression introduced by
      f904be9c  "lockd: Mostly remove BKL from
      the server".
      Cc: Bryan Schumaker <bjschuma@netapp.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarDavid Jeffery <djeffery@redhat.com>
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
  5. 29 Jun, 2013 2 commits
  6. 23 Feb, 2013 1 commit
  7. 23 Sep, 2012 1 commit
  8. 29 Jul, 2012 1 commit
  9. 27 Jul, 2012 1 commit
  10. 21 Mar, 2012 1 commit
    • Trond Myklebust's avatar
      SUNRPC/LOCKD: Fix build warnings when CONFIG_SUNRPC_DEBUG is undefined · ffa94db6
      Trond Myklebust authored
      Stephen Rothwell reports:
      net/sunrpc/rpcb_clnt.c: In function 'rpcb_enc_mapping':
      net/sunrpc/rpcb_clnt.c:820:19: warning: unused variable 'task' [-Wunused-variable]
      net/sunrpc/rpcb_clnt.c: In function 'rpcb_dec_getport':
      net/sunrpc/rpcb_clnt.c:837:19: warning: unused variable 'task' [-Wunused-variable]
      net/sunrpc/rpcb_clnt.c: In function 'rpcb_dec_set':
      net/sunrpc/rpcb_clnt.c:860:19: warning: unused variable 'task' [-Wunused-variable]
      net/sunrpc/rpcb_clnt.c: In function 'rpcb_enc_getaddr':
      net/sunrpc/rpcb_clnt.c:892:19: warning: unused variable 'task' [-Wunused-variable]
      net/sunrpc/rpcb_clnt.c: In function 'rpcb_dec_getaddr':
      net/sunrpc/rpcb_clnt.c:914:19: warning: unused variable 'task' [-Wunused-variable]
      fs/lockd/svclock.c:49:20: warning: 'nlmdbg_cookie2a' declared 'static' but never defined [-Wunused-function]
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
  11. 21 Jul, 2011 1 commit
    • J. Bruce Fields's avatar
      locks: rename lock-manager ops · 8fb47a4f
      J. Bruce Fields authored
      Both the filesystem and the lock manager can associate operations with a
      lock.  Confusingly, one of them (fl_release_private) actually has the
      same name in both operation structures.
      It would save some confusion to give the lock-manager ops different
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
  12. 16 Dec, 2010 2 commits
  13. 17 Nov, 2010 1 commit
  14. 27 Oct, 2010 1 commit
  15. 22 Sep, 2010 1 commit
  16. 30 Mar, 2010 1 commit
    • Tejun Heo's avatar
      include cleanup: Update gfp.h and slab.h includes to prepare for breaking... · 5a0e3ad6
      Tejun Heo authored
      include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
      percpu.h is included by sched.h and module.h and thus ends up being
      included when building most .c files.  percpu.h includes slab.h which
      in turn includes gfp.h making everything defined by the two files
      universally available and complicating inclusion dependencies.
      percpu.h -> slab.h dependency is about to be removed.  Prepare for
      this change by updating users of gfp and slab facilities include those
      headers directly instead of assuming availability.  As this conversion
      needs to touch large number of source files, the following script is
      used as the basis of conversion.
      The script does the followings.
      * Scan files for gfp and slab usages and update includes such that
        only the necessary includes are there.  ie. if only gfp is used,
        gfp.h, if slab is used, slab.h.
      * When the script inserts a new include, it looks at the include
        blocks and try to put the new include such that its order conforms
        to its surrounding.  It's put in the include block which contains
        core kernel includes, in the same order that the rest are ordered -
        alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
        doesn't seem to be any matching order.
      * If the script can't find a place to put a new include (mostly
        because the file doesn't have fitting include block), it prints out
        an error message indicating which .h file needs to be added to the
      The conversion was done in the following steps.
      1. The initial automatic conversion of all .c files updated slightly
         over 4000 files, deleting around 700 includes and adding ~480 gfp.h
         and ~3000 slab.h inclusions.  The script emitted errors for ~400
      2. Each error was manually checked.  Some didn't need the inclusion,
         some needed manual addition while adding it to implementation .h or
         embedding .c file was more appropriate for others.  This step added
         inclusions to around 150 files.
      3. The script was run again and the output was compared to the edits
         from #2 to make sure no file was left behind.
      4. Several build tests were done and a couple of problems were fixed.
         e.g. lib/decompress_*.c used malloc/free() wrappers around slab
         APIs requiring slab.h to be added manually.
      5. The script was run on all .h files but without automatically
         editing them as sprinkling gfp.h and slab.h inclusions around .h
         files could easily lead to inclusion dependency hell.  Most gfp.h
         inclusion directives were ignored as stuff from gfp.h was usually
         wildly available and often used in preprocessor macros.  Each
         slab.h inclusion directive was examined and added manually as
      6. percpu.h was updated not to include slab.h.
      7. Build test were done on the following configurations and failures
         were fixed.  CONFIG_GCOV_KERNEL was turned off for all tests (as my
         distributed build env didn't work with gcov compiles) and a few
         more options had to be turned off depending on archs to make things
         build (like ipr on powerpc/64 which failed due to missing writeq).
         * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
         * powerpc and powerpc64 SMP allmodconfig
         * sparc and sparc64 SMP allmodconfig
         * ia64 SMP allmodconfig
         * s390 SMP allmodconfig
         * alpha SMP allmodconfig
         * um on x86_64 SMP allmodconfig
      8. percpu.h modifications were reverted so that it could be applied as
         a separate patch and serve as bisection point.
      Given the fact that I had only a couple of failures from tests on step
      6, I'm fairly confident about the coverage of this conversion patch.
      If there is a breakage, it's likely to be something in one of the arch
      headers which should be easily discoverable easily on most builds of
      the specific arch.
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      Guess-its-ok-by: default avatarChristoph Lameter <cl@linux-foundation.org>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
  17. 22 Sep, 2009 1 commit
  18. 24 Apr, 2009 1 commit
    • Felix Blyakher's avatar
      lockd: call locks_release_private to cleanup per-filesystem state · a9e61e25
      Felix Blyakher authored
      For every lock request lockd creates a new file_lock object
      in nlmsvc_setgrantargs() by copying the passed in file_lock with
      locks_copy_lock(). A filesystem can attach it's own lock_operations
      vector to the file_lock. It has to be cleaned up at the end of the
      file_lock's life. However, lockd doesn't do it today, yet it
      asserts in nlmclnt_release_lockargs() that the per-filesystem
      state is clean.
      This patch fixes it by exporting locks_release_private() and adding
      it to nlmsvc_freegrantargs(), to be symmetrical to creating a
      file_lock in nlmsvc_setgrantargs().
      Signed-off-by: default avatarFelix Blyakher <felixb@sgi.com>
      Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
  19. 18 Mar, 2009 1 commit
  20. 09 Feb, 2009 1 commit
    • J. Bruce Fields's avatar
      lockd: fix regression in lockd's handling of blocked locks · 9d9b87c1
      J. Bruce Fields authored
      If a client requests a blocking lock, is denied, then requests it again,
      then here in nlmsvc_lock() we will call vfs_lock_file() without FL_SLEEP
      set, because we've already queued a block and don't need the locks code
      to do it again.
      But that means vfs_lock_file() will return -EAGAIN instead of
      FILE_LOCK_DENIED.  So we still need to translate that -EAGAIN return
      into a nlm_lck_blocked error in this case, and put ourselves back on
      lockd's block list.
      The bug was introduced by bde74e4b "locks: add special return
      value for asynchronous locks".
      Thanks to Frank van Maarseveen for the report; his original test
      case was essentially
      	for i in `seq 30`; do flock /nfsmount/foo sleep 10 & done
      Tested-by: default avatarFrank van Maarseveen <frankvm@frankvm.com>
      Reported-by: default avatarFrank van Maarseveen <frankvm@frankvm.com>
      Cc: Miklos Szeredi <mszeredi@suse.cz>
      Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
  21. 03 Oct, 2008 2 commits
    • J. Bruce Fields's avatar
      lockd: reject reclaims outside the grace period · d22b1cff
      J. Bruce Fields authored
      The current lockd does not reject reclaims that arrive outside of the
      grace period.
      Accepting a reclaim means promising to the client that no conflicting
      locks were granted since last it held the lock.  We can meet that
      promise if we assume the only lockers are nfs clients, and that they are
      sufficiently well-behaved to reclaim only locks that they held before,
      and that only reclaim locks have been permitted so far.  Once we leave
      the grace period (and start permitting non-reclaims), we can no longer
      keep that promise.  So we must start rejecting reclaims at that point.
      Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
    • J. Bruce Fields's avatar
      lockd: move grace period checks to common code · b2b50289
      J. Bruce Fields authored
      Do all the grace period checks in svclock.c.  This simplifies the code a
      bit, and will ease some later changes.
      Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
  22. 25 Jul, 2008 1 commit
    • Miklos Szeredi's avatar
      locks: add special return value for asynchronous locks · bde74e4b
      Miklos Szeredi authored
      Use a special error value FILE_LOCK_DEFERRED to mean that a locking
      operation returned asynchronously.  This is returned by
        posix_lock_file() for sleeping locks to mean that the lock has been
        queued on the block list, and will be woken up when it might become
        available and needs to be retried (either fl_lmops->fl_notify() is
        called or fl_wait is woken up).
        f_op->lock() to mean either the above, or that the filesystem will
        call back with fl_lmops->fl_grant() when the result of the locking
        operation is known.  The filesystem can do this for sleeping as well
        as non-sleeping locks.
      This is to make sure, that return values of -EAGAIN and -EINPROGRESS by
      filesystems are not mistaken to mean an asynchronous locking.
      This also makes error handling in fs/locks.c and lockd/svclock.c slightly
      Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
      Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
      Cc: "J. Bruce Fields" <bfields@fieldses.org>
      Cc: Matthew Wilcox <matthew@wil.cx>
      Cc: David Teigland <teigland@redhat.com>
      Cc: Christoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
  23. 15 Jul, 2008 5 commits
  24. 30 Apr, 2008 1 commit
  25. 25 Apr, 2008 1 commit
    • J. Bruce Fields's avatar
      locks: don't call ->copy_lock methods on return of conflicting locks · 1a747ee0
      J. Bruce Fields authored
      The file_lock structure is used both as a heavy-weight representation of
      an active lock, with pointers to reference-counted structures, etc., and
      as a simple container for parameters that describe a file lock.
      The conflicting lock returned from __posix_lock_file is an example of
      the latter; so don't call the filesystem or lock manager callbacks when
      copying to it.  This also saves the need for an unnecessary
      locks_init_lock in the nfsv4 server.
      Thanks to Trond for pointing out the error.
      Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
      Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
  26. 23 Apr, 2008 2 commits
    • J. Bruce Fields's avatar
      lockd: Fix stale nlmsvc_unlink_block comment · 3c61eecb
      J. Bruce Fields authored
      As of 5996a298 ("NLM: don't unlock on
      cancel requests") we no longer unlock in this case, so the comment is no
      longer accurate.
      Thanks to Stuart Friedberg for pointing out the inconsistency.
      Cc: Stuart Friedberg <sfriedberg@hp.com>
      Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
    • Jeff Layton's avatar
      NLM: Convert lockd to use kthreads · d751a7cd
      Jeff Layton authored
      Have lockd_up start lockd using kthread_run. With this change,
      lockd_down now blocks until lockd actually exits, so there's no longer
      need for the waitqueue code at the end of lockd_down. This also means
      that only one lockd can be running at a time which simplifies the code
      within lockd's main loop.
      This also adds a check for kthread_should_stop in the main loop of
      nlmsvc_retry_blocked and after that function returns. There's no sense
      continuing to retry blocks if lockd is coming down anyway.
      Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
      Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
  27. 10 Feb, 2008 2 commits
  28. 01 Feb, 2008 2 commits