aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2009-03-16 08:13:41 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2009-03-19 15:17:40 -0400
commit47c62564200609b6de60f535f61f0c73dd10c7c9 (patch)
tree9d21b42cd34b14e75574dcb22eb945aefccfe345
parent2e3c230bc7149a6af65d26a0c312e230e0c33cc3 (diff)
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>
-rw-r--r--fs/nfs/write.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 36fd35e0de83..e560a78995a3 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -537,13 +537,13 @@ static void nfs_cancel_commit_list(struct list_head *head)
537 } 537 }
538} 538}
539 539
540#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
540static int 541static int
541nfs_need_commit(struct nfs_inode *nfsi) 542nfs_need_commit(struct nfs_inode *nfsi)
542{ 543{
543 return radix_tree_tagged(&nfsi->nfs_page_tree, NFS_PAGE_TAG_COMMIT); 544 return radix_tree_tagged(&nfsi->nfs_page_tree, NFS_PAGE_TAG_COMMIT);
544} 545}
545 546
546#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
547/* 547/*
548 * nfs_scan_commit - Scan an inode for commit requests 548 * nfs_scan_commit - Scan an inode for commit requests
549 * @inode: NFS inode to scan 549 * @inode: NFS inode to scan