From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 16 Mar 2009 12:13:41 +0000 (-0400)
Subject: NFS: Fix up a mismerged patch
X-Git-Tag: v2.6.30-rc1~415^2^2~27
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47c62564200609b6de60f535f61f0c73dd10c7c9;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed