• Linus Torvalds's avatar
    Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linux · dc87c551
    Linus Torvalds authored
    * '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()
    dc87c551
locks.c 58.3 KB