diff --git a/nfs-utils-1.2.5-pnfs-rpcdebug.patch b/nfs-utils-1.2.5-pnfs-rpcdebug.patch new file mode 100644 index 0000000..2c2e3c9 --- /dev/null +++ b/nfs-utils-1.2.5-pnfs-rpcdebug.patch @@ -0,0 +1,42 @@ +commit 264ad7d77e7ebb5d83c0f02bcb1800b254cd5ccf +Author: Steve Dickson +Date: Wed Oct 19 16:37:34 2011 -0400 + + rpcdebug: Add missing debug flags + + This patch added the following debug flags: + + fscache - enable FSCache debugging + pnfs - enable general pNFS debugging + pnfs_ld - enable pNFS layout debugging + + Signed-off-by: Steve Dickson + +diff --git a/support/include/nfs/debug.h b/support/include/nfs/debug.h +index d391e91..dbec5ba 100644 +--- a/support/include/nfs/debug.h ++++ b/support/include/nfs/debug.h +@@ -76,6 +76,9 @@ enum { + #define NFSDBG_CALLBACK 0x0100 + #define NFSDBG_CLIENT 0x0200 + #define NFSDBG_MOUNT 0x0400 ++#define NFSDBG_FSCACHE 0x0800 ++#define NFSDBG_PNFS 0x1000 ++#define NFSDBG_PNFS_LD 0x2000 + #define NFSDBG_ALL 0xFFFF + + #endif /* _NFS_DEBUG_H */ +diff --git a/tools/rpcdebug/rpcdebug.c b/tools/rpcdebug/rpcdebug.c +index 275a491..444616d 100644 +--- a/tools/rpcdebug/rpcdebug.c ++++ b/tools/rpcdebug/rpcdebug.c +@@ -167,6 +167,9 @@ static struct flagmap { + FLAG(NFS, CALLBACK), + FLAG(NFS, CLIENT), + FLAG(NFS, MOUNT), ++ FLAG(NFS, FSCACHE), ++ FLAG(NFS, PNFS), ++ FLAG(NFS, PNFS_LD), + FLAG(NFS, ALL), + + /* nfsd */ diff --git a/nfs-utils.spec b/nfs-utils.spec index e312a24..8f7d330 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser Name: nfs-utils URL: http://sourceforge.net/projects/nfs Version: 1.2.5 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 # group all 32bit related archs @@ -30,6 +30,7 @@ Source52: nfs-server.postconfig Patch001: nfs-utils-1.2.6-rc2.patch Patch002: nfs-utils-1.2.4-mountshortcut.patch +Patch003: nfs-utils-1.2.5-pnfs-rpcdebug.patch Patch100: nfs-utils-1.2.1-statdpath-man.patch Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch @@ -87,6 +88,7 @@ This package also contains the mount.nfs and umount.nfs program. %patch001 -p1 %patch002 -p1 +%patch003 -p1 %patch100 -p1 %patch101 -p1 @@ -274,6 +276,9 @@ fi %attr(0755,root,root) /sbin/umount.nfs4 %changelog +* Thu Oct 20 2011 Steve Dickson 1.2.5-3 +- Added pNFS debugging to rpcdebug. + * Tue Oct 18 2011 Steve Dickson 1.2.5-3 - Update to upstream RC release: nfs-utils-1.2.6-rc2