Prev: usb: fsl_udc_core: check return value of create_proc_read_entry()
Next: net/rose: Use GFP_ATOMIC
From: Ingo Molnar on 1 Aug 2010 02:50

* Trond Myklebust <Trond.Myklebust(a)netapp.com> wrote:

> Hi Linus,
>
> Please pull from the "bugfixes" branch of the repository at
>
> git pull git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git bugfixes
>
> This will update the following files through the appended changesets.
>
> Cheers,
> Trond
>
> ----
> fs/nfs/file.c | 13 +++++++++++--
> fs/nfs/nfsroot.c | 2 +-
> fs/nfs/write.c | 27 +++++++++++++++++++--------
> include/linux/nfs_fs.h | 1 +
> 4 files changed, 32 insertions(+), 11 deletions(-)

FYI, these commits introduced a build failure on x86:

fs/nfs/file.c:508: error: implicit declaration of function 'nfs_commit_inode'

The nfs_commit_inode() prototype:

#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
extern int nfs_commit_inode(struct inode *, int);
extern struct nfs_write_data *nfs_commitdata_alloc(void);
extern void nfs_commit_free(struct nfs_write_data *wdata);
#endif

is missing if the kernel is configured for legacy NFS:

CONFIG_NFS_FS=y
# CONFIG_NFS_V3 is not set
# CONFIG_NFS_V4 is not set

The fix below solves the build problem here, but I have not tested whether NFS
still works fine for this config.

Thanks,

Ingo

Signed-off-by: Ingo Molnar <mingo(a)elte.hu>
---
include/linux/nfs_fs.h | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index f6e2455..bf145c6 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -492,11 +492,9 @@ extern int nfs_writeback_done(struct rpc_task *, struct nfs_write_data *);
extern int nfs_wb_all(struct inode *inode);
extern int nfs_wb_page(struct inode *inode, struct page* page);
extern int nfs_wb_page_cancel(struct inode *inode, struct page* page);
-#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
extern int nfs_commit_inode(struct inode *, int);
extern struct nfs_write_data *nfs_commitdata_alloc(void);
extern void nfs_commit_free(struct nfs_write_data *wdata);
-#endif

static inline int
nfs_have_writebacks(struct inode *inode)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: usb: fsl_udc_core: check return value of create_proc_read_entry()
Next: net/rose: Use GFP_ATOMIC