2010-09-30 20:04:57

by Steve Dickson

Subject: [PATCH] pnfs: compile error in blocklayout code

I needed to make the following change to get the
block layout code to compile in a Fedora build
environment.

Signed-off-by: Steve Dickson <[email protected]>

diff -up linux-2.6.35.x86_64/fs/nfs/blocklayout/blocklayout.h.orig linux-2.6.35.x86_64/fs/nfs/blocklayout/blocklayout.h
--- linux-2.6.35.x86_64/fs/nfs/blocklayout/blocklayout.h.orig 2010-09-30 14:35:49.800480934 -0400
+++ linux-2.6.35.x86_64/fs/nfs/blocklayout/blocklayout.h 2010-09-30 15:09:14.118105750 -0400
@@ -34,7 +34,7 @@

#include <linux/nfs_fs.h>
#include <linux/dm-ioctl.h> /* Needed for struct dm_ioctl*/
-#include <../pnfs.h>
+#include "../pnfs.h"

#define PAGE_CACHE_SECTORS (PAGE_CACHE_SIZE >> 9)

2010-09-30 20:22:57

by Jim Rees

Subject: Re: [PATCH] pnfs: compile error in blocklayout code

Steve Dickson wrote:

I needed to make the following change to get the
block layout code to compile in a Fedora build
environment.

-#include <../pnfs.h>
+#include "../pnfs.h"

Not a comment on your fix, which looks correct, but there is a bit of
disturbing asymmetry here. The file layout source files are named
nfs4filelayout*.[ch] and live in fs/nfs, but object and block layout are
named {object,block}layout*.[ch] and live in fs/nfs/*layout.

2010-09-30 20:30:08

by Benny Halevy

Subject: Re: [PATCH] pnfs: compile error in blocklayout code

On 2010-09-30 22:22, Jim Rees wrote:
> Steve Dickson wrote:
>
> I needed to make the following change to get the
> block layout code to compile in a Fedora build
> environment.
>
> -#include <../pnfs.h>
> +#include "../pnfs.h"
>
> Not a comment on your fix, which looks correct, but there is a bit of
> disturbing asymmetry here. The file layout source files are named
> nfs4filelayout*.[ch] and live in fs/nfs, but object and block layout are
> named {object,block}layout*.[ch] and live in fs/nfs/*layout.

That's true. NFSv4.1 files layout is considered in the linux
implementation as a first class citizen, as it's "native" to the
nfs client protocol, while other layout drivers are external
to the nfs client module.

That said, they could be pulled into the fs/nfs directory
but this may just clutter it.
To keep things symmetrical I'd be inclined to make the files layout
driver similar to all other layout driver and not vice versa.

Benny

> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2010-09-30 20:15:14

by Benny Halevy

Subject: Re: [PATCH] pnfs: compile error in blocklayout code

On 2010-09-30 22:04, Steve Dickson wrote:
> I needed to make the following change to get the
> block layout code to compile in a Fedora build
> environment.
>
> Signed-off-by: Steve Dickson <[email protected]>

Merged. Thanks!

Benny

>
> diff -up linux-2.6.35.x86_64/fs/nfs/blocklayout/blocklayout.h.orig linux-2.6.35.x86_64/fs/nfs/blocklayout/blocklayout.h
> --- linux-2.6.35.x86_64/fs/nfs/blocklayout/blocklayout.h.orig 2010-09-30 14:35:49.800480934 -0400
> +++ linux-2.6.35.x86_64/fs/nfs/blocklayout/blocklayout.h 2010-09-30 15:09:14.118105750 -0400
> @@ -34,7 +34,7 @@
>
> #include <linux/nfs_fs.h>
> #include <linux/dm-ioctl.h> /* Needed for struct dm_ioctl*/
> -#include <../pnfs.h>
> +#include "../pnfs.h"
>
> #define PAGE_CACHE_SECTORS (PAGE_CACHE_SIZE >> 9)
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html