diff --git a/[refs] b/[refs] index 6380f9db355e..131b0589f766 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e3c230bc7149a6af65d26a0c312e230e0c33cc3 +refs/heads/master: 47c62564200609b6de60f535f61f0c73dd10c7c9 diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c index 36fd35e0de83..e560a78995a3 100644 --- a/trunk/fs/nfs/write.c +++ b/trunk/fs/nfs/write.c @@ -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 nfs_need_commit(struct nfs_inode *nfsi) { 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 * @inode: NFS inode to scan