So is it OK for Vlad to apply? Vlad if you prefer, I can fix all the backports (actually 2.6.25 was fine as it turned out) and resubmit, rather than commit each file individually. Please let me know. Thanks.
-jeff Steve Wise wrote: > Hard to read these sorts of patches to patch files. :) But it looks ok > I think. And cthon runs! > > Steve. > > > Jeff Becker wrote: > >> I just checked this passes connectathon. Please review. Thanks. >> >> -jeff >> >> NFSRDMA: remove dependence of 2.6.25 backport ib_core on nfs: fixes >> Bug 1596 >> Signed-off-by: Jeff Becker <jeffrey.c.bec...@nasa.gov> >> >> diff --git a/kernel_patches/backport/2.6.25/rnfs_fs.patch >> b/kernel_patches/backport/2.6.25/rnfs_fs.patch >> index 342bd8a..c6cd2de 100644 >> --- a/kernel_patches/backport/2.6.25/rnfs_fs.patch >> +++ b/kernel_patches/backport/2.6.25/rnfs_fs.patch >> @@ -1,18 +1,21 @@ >> -diff --git a/drivers/infiniband/core/Makefile >> b/drivers/infiniband/core/Makefile >> -index f646040..9508889 100644 >> ---- a/drivers/infiniband/core/Makefile >> -+++ b/drivers/infiniband/core/Makefile >> -@@ -30,3 +30,5 @@ ib_umad-y := user_mad.o >> - ib_ucm-y := ucm.o >> +diff --git a/fs/nfs/Makefile b/fs/nfs/Makefile >> +index ac6170c..0bae18e 100644 >> +--- a/fs/nfs/Makefile >> ++++ b/fs/nfs/Makefile >> +@@ -6,7 +6,7 @@ obj-$(CONFIG_NFS_FS) += nfs.o >> >> - ib_uverbs-y := uverbs_main.o uverbs_cmd.o uverbs_marshall.o >> -+ >> -+ib_core-y += namespace.o >> -diff --git a/drivers/infiniband/core/namespace.c >> b/drivers/infiniband/core/namespace.c >> + nfs-y := client.o dir.o file.o getroot.o inode.o super.o >> nfs2xdr.o \ >> + direct.o pagelist.o proc.o read.o symlink.o unlink.o \ >> +- write.o namespace.o mount_clnt.o >> ++ write.o namespace.o mount_clnt.o backport-namespace.o >> + nfs-$(CONFIG_ROOT_NFS) += nfsroot.o >> + nfs-$(CONFIG_NFS_V3) += nfs3proc.o nfs3xdr.o >> + nfs-$(CONFIG_NFS_V3_ACL) += nfs3acl.o >> +diff --git a/fs/nfs/backport-namespace.c b/fs/nfs/backport-namespace.c >> new file mode 100644 >> index 0000000..de57f8b >> --- /dev/null >> -+++ b/drivers/infiniband/core/namespace.c >> ++++ b/fs/nfs/backport-namespace.c >> @@ -0,0 +1 @@ >> +#include "src/namespace.c" >> diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c >> >> > > _______________________________________________ ewg mailing list ewg@lists.openfabrics.org http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg