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

* 'for-2.6.39' of git://linux-nfs.org/~bfields/linux:
  SUNRPC: Remove resource leak in svc_rdma_send_error()
  nfsd: wrong index used in inner loop
  nfsd4: fix comment and remove unused nfsd4_file fields
  nfs41: make sure nfs server return right ca_maxresponsesize_cached
  nfsd: fix compile error
  svcrpc: fix bad argument in unix_domain_find
  nfsd4: fix struct file leak
  nfsd4: minor nfs4state.c reshuffling
  svcrpc: fix rare race on unix_domain creation
  nfsd41: modify the members value of nfsd4_op_flags
  nfsd: add proc file listing kernel's gss_krb5 enctypes
  gss:krb5 only include enctype numbers in gm_upcall_enctypes
  NFSD, VFS: Remove dead code in nfsd_rename()
  nfsd: kill unused macro definition
  locks: use assign_type()

diff --combined fs/locks.c
index 822c3d1,2c2d3b8..0a4f50d
--- 1/fs/locks.c
--- 2/fs/locks.c
+++ b/fs/locks.c
@@@ -145,6 -145,7 +145,6 @@@ static DEFINE_SPINLOCK(file_lock_lock)
  
  /*
   * Protects the two list heads above, plus the inode->i_flock list
 - * FIXME: should use a spinlock, once lockd and ceph are ready.
   */
  void lock_flocks(void)
  {
@@@ -414,17 -415,7 +414,7 @@@ static int flock64_to_posix_lock(struc
        fl->fl_ops = NULL;
        fl->fl_lmops = NULL;
  
-       switch (l->l_type) {
-       case F_RDLCK:
-       case F_WRLCK:
-       case F_UNLCK:
-               fl->fl_type = l->l_type;
-               break;
-       default:
-               return -EINVAL;
-       }
- 
-       return (0);
+       return assign_type(fl, l->l_type);
  }
  #endif
  

diff --combined fs/nfsd/vfs.c
index ff93025,9cc626b..2e1cebd
--- 1/fs/nfsd/vfs.c
--- 2/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@@ -87,7 -87,7 +87,7 @@@ nfsd_cross_mnt(struct svc_rqst *rqstp, 
                            .dentry = dget(dentry)};
        int err = 0;
  
 -      err = follow_down(&path, false);
 +      err = follow_down(&path);
        if (err < 0)
                goto out;
  
@@@ -1749,8 -1749,6 +1749,6 @@@ nfsd_rename(struct svc_rqst *rqstp, str
                if (host_err)
                        goto out_drop_write;
        }
-       if (host_err)
-               goto out_drop_write;
        host_err = vfs_rename(fdir, odentry, tdir, ndentry);
        if (!host_err) {
                host_err = commit_metadata(tfhp);