Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

* git://git.linux-nfs.org/pub/linux/nfs-2.6: (103 commits)
  SUNRPC,RPCSEC_GSS: spkm3--fix config dependencies
  SUNRPC,RPCSEC_GSS: spkm3: import contexts using NID_cast5_cbc
  LOCKD: Make nlmsvc_traverse_shares return void
  LOCKD: nlmsvc_traverse_blocks return is unused
  SUNRPC,RPCSEC_GSS: fix krb5 sequence numbers.
  NFSv4: Dont list system.nfs4_acl for filesystems that don't support it.
  SUNRPC,RPCSEC_GSS: remove unnecessary kmalloc of a checksum
  SUNRPC: Ensure rpc_call_async() always calls tk_ops->rpc_release()
  SUNRPC: Fix memory barriers for req->rq_received
  NFS: Fix a race in nfs_sync_inode()
  NFS: Clean up nfs_flush_list()
  NFS: Fix a race with PG_private and nfs_release_page()
  NFSv4: Ensure the callback daemon flushes signals
  SUNRPC: Fix a 'Busy inodes' error in rpc_pipefs
  NFS, NLM: Allow blocking locks to respect signals
  NFS: Make nfs_fhget() return appropriate error values
  NFSv4: Fix an oops in nfs4_fill_super
  lockd: blocks should hold a reference to the nlm_file
  NFSv4: SETCLIENTID_CONFIRM should handle NFS4ERR_DELAY/NFS4ERR_RESOURCE
  NFSv4: Send the delegation stateid for SETATTR calls
  ...

2 files changed, 8 insertions, 7 deletions

diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 8d3d23c8a4d2..c872bd07fc10 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -326,6 +326,8 @@ out:
         .p_encode = (kxdrproc_t) nfs4_xdr_##argtype,                    \
         .p_decode = (kxdrproc_t) nfs4_xdr_##restype,                    \
         .p_bufsiz = MAX(NFS4_##argtype##_sz,NFS4_##restype##_sz) << 2,  \
+        .p_statidx = NFSPROC4_CB_##call,                                \
+        .p_name   = #proc,                                              \
 }
 
 static struct rpc_procinfo     nfs4_cb_procedures[] = {
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 1143cfb64549..f6ab762bea99 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2639,7 +2639,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
         struct nfs4_stateid *lock_stp;
         struct file *filp;
         struct file_lock file_lock;
-        struct file_lock *conflock;
+        struct file_lock conflock;
         int status = 0;
         unsigned int strhashval;
 
@@ -2775,11 +2775,11 @@ conflicting_lock:
         /* XXX There is a race here. Future patch needed to provide 
          * an atomic posix_lock_and_test_file
          */
-        if (!(conflock = posix_test_lock(filp, &file_lock))) {
+        if (!posix_test_lock(filp, &file_lock, &conflock)) {
                 status = nfserr_serverfault;
                 goto out;
         }
-        nfs4_set_lock_denied(conflock, &lock->lk_denied);
+        nfs4_set_lock_denied(&conflock, &lock->lk_denied);
 out:
         if (status && lock->lk_is_new && lock_sop)
                 release_stateowner(lock_sop);
@@ -2800,7 +2800,7 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
         struct inode *inode;
         struct file file;
         struct file_lock file_lock;
-        struct file_lock *conflicting_lock;
+        struct file_lock conflock;
         int status;
 
         if (nfs4_in_grace())
@@ -2864,10 +2864,9 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
         file.f_dentry = current_fh->fh_dentry;
 
         status = nfs_ok;
-        conflicting_lock = posix_test_lock(&file, &file_lock);
-        if (conflicting_lock) {
+        if (posix_test_lock(&file, &file_lock, &conflock)) {
                 status = nfserr_denied;
-                nfs4_set_lock_denied(conflicting_lock, &lockt->lt_denied);
+                nfs4_set_lock_denied(&conflock, &lockt->lt_denied);
         }
 out:
         nfs4_unlock_state();