NFS: Fix up a mismerged patch
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 16 Mar 2009 12:13:41 +0000 (08:13 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 19 Mar 2009 19:17:40 +0000 (15:17 -0400)
commit47c62564200609b6de60f535f61f0c73dd10c7c9
tree9d21b42cd34b14e75574dcb22eb945aefccfe345
parent2e3c230bc7149a6af65d26a0c312e230e0c33cc3
NFS: Fix up a mismerged patch

Move the definition of nfs_need_commit() into the #ifdef CONFIG_NFS_V3
section as originally intended in the patch "NFS: cleanup - remove
struct nfs_inode->ncommit"

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/write.c