Merge branch 'for-3.1' of git://linux-nfs.org/~bfields/linux

* 'for-3.1' of git://linux-nfs.org/~bfields/linux:
  nfsd: don't break lease on CLAIM_DELEGATE_CUR
  locks: rename lock-manager ops
  nfsd4: update nfsv4.1 implementation notes
  nfsd: turn on reply cache for NFSv4
  nfsd4: call nfsd4_release_compoundargs from pc_release
  nfsd41: Deny new lock before RECLAIM_COMPLETE done
  fs: locks: remove init_once
  nfsd41: check the size of request
  nfsd41: error out when client sets maxreq_sz or maxresp_sz too small
  nfsd4: fix file leak on open_downgrade
  nfsd4: remember to put RW access on stateid destruction
  NFSD: Added TEST_STATEID operation
  NFSD: added FREE_STATEID operation
  svcrpc: fix list-corrupting race on nfsd shutdown
  rpc: allow autoloading of gss mechanisms
  svcauth_unix.c: quiet sparse noise
  svcsock.c: include sunrpc.h to quiet sparse noise
  nfsd: Remove deprecated nfsctl system call and related code.
  NFSD: allow OP_DESTROY_CLIENTID to be only op in COMPOUND

Fix up trivial conflicts in Documentation/feature-removal-schedule.txt

1 files changed, 5 insertions, 5 deletions

diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c
index e2b878004364..01fd5c11a7fb 100644
--- a/fs/dlm/plock.c
+++ b/fs/dlm/plock.c
@@ -92,7 +92,7 @@ static void do_unlock_close(struct dlm_ls *ls, u64 number,
         op->info.number         = number;
         op->info.start          = 0;
         op->info.end            = OFFSET_MAX;
-        if (fl->fl_lmops && fl->fl_lmops->fl_grant)
+        if (fl->fl_lmops && fl->fl_lmops->lm_grant)
                 op->info.owner  = (__u64) fl->fl_pid;
         else
                 op->info.owner  = (__u64)(long) fl->fl_owner;
@@ -128,11 +128,11 @@ int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file,
         op->info.number         = number;
         op->info.start          = fl->fl_start;
         op->info.end            = fl->fl_end;
-        if (fl->fl_lmops && fl->fl_lmops->fl_grant) {
+        if (fl->fl_lmops && fl->fl_lmops->lm_grant) {
                 /* fl_owner is lockd which doesn't distinguish
                    processes on the nfs client */
                 op->info.owner  = (__u64) fl->fl_pid;
-                xop->callback   = fl->fl_lmops->fl_grant;
+                xop->callback   = fl->fl_lmops->lm_grant;
                 locks_init_lock(&xop->flc);
                 locks_copy_lock(&xop->flc, fl);
                 xop->fl         = fl;
@@ -268,7 +268,7 @@ int dlm_posix_unlock(dlm_lockspace_t *lockspace, u64 number, struct file *file,
         op->info.number         = number;
         op->info.start          = fl->fl_start;
         op->info.end            = fl->fl_end;
-        if (fl->fl_lmops && fl->fl_lmops->fl_grant)
+        if (fl->fl_lmops && fl->fl_lmops->lm_grant)
                 op->info.owner  = (__u64) fl->fl_pid;
         else
                 op->info.owner  = (__u64)(long) fl->fl_owner;
@@ -327,7 +327,7 @@ int dlm_posix_get(dlm_lockspace_t *lockspace, u64 number, struct file *file,
         op->info.number         = number;
         op->info.start          = fl->fl_start;
         op->info.end            = fl->fl_end;
-        if (fl->fl_lmops && fl->fl_lmops->fl_grant)
+        if (fl->fl_lmops && fl->fl_lmops->lm_grant)
                 op->info.owner  = (__u64) fl->fl_pid;
         else
                 op->info.owner  = (__u64)(long) fl->fl_owner;