From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Feb 2011 20:06:38 +0000 (-0800)
Subject: Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~18857
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f60c153d503e798b354333772e7c00f1e8733e71;p=mirror_ubuntu-artful-kernel.git

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

* 'for-2.6.38' of git://linux-nfs.org/~bfields/linux:
  nfsd: break lease on unlink due to rename
  nfsd4: acquire only one lease per file
  nfsd4: modify fi_delegations under recall_lock
  nfsd4: remove unused deleg dprintk's.
  nfsd4: split lease setting into separate function
  nfsd4: fix leak on allocation error
  nfsd4: add helper function for lease setup
  nfsd4: split up nfsd_break_deleg_cb
  NFSD: memory corruption due to writing beyond the stat array
  NFSD: use nfserr for status after decode_cb_op_status
  nfsd: don't leak dentry count on mnt_want_write failure
---

f60c153d503e798b354333772e7c00f1e8733e71