Commit 47c62564 authored by Trond Myklebust's avatar Trond Myklebust

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: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 2e3c230b
...@@ -537,13 +537,13 @@ static void nfs_cancel_commit_list(struct list_head *head) ...@@ -537,13 +537,13 @@ static void nfs_cancel_commit_list(struct list_head *head)
} }
} }
#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
static int static int
nfs_need_commit(struct nfs_inode *nfsi) nfs_need_commit(struct nfs_inode *nfsi)
{ {
return radix_tree_tagged(&nfsi->nfs_page_tree, NFS_PAGE_TAG_COMMIT); return radix_tree_tagged(&nfsi->nfs_page_tree, NFS_PAGE_TAG_COMMIT);
} }
#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
/* /*
* nfs_scan_commit - Scan an inode for commit requests * nfs_scan_commit - Scan an inode for commit requests
* @inode: NFS inode to scan * @inode: NFS inode to scan
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment