Skip to contentSkip to conversation

pnfs: compile error in blocklayout code

PATCH In review Steve Dickson 3 participants 4 messages Sep 30, 2010 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

fs/nfs/blocklayout/blocklayout.h renamed from fs/nfs/blocklayout/blocklayout.h.orig +1 -1
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
@@ -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)
 

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw
Quoted 5 lines · Steve Dickson

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

Merged. Thanks!

Benny

Quoted 17 lines

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

fs/nfs/blocklayout/blocklayout.h renamed from fs/nfs/blocklayout/blocklayout.h.orig +1 -2
@@ -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

#3 lore raw
In reply to Steve Dickson

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.

#4 lore raw
Quoted 6 lines · Jim Rees

Steve Dickson wrote:

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

Quoted 7 lines

-#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

Quoted 4 lines

--
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