On Wed, 2013-11-13 at 16:52 -0500, Jeff Layton wrote: +AD4- Now that we have a more reliable method to tell if gssd is running, we +AD4- can replace the sn-+AD4-gssd+AF8-running flag with a function that will query to +AD4- see if it's up and running. +AD4- +AD4- There's also no need to attempt an upcall that we know will fail, so +AD4- just return -EACCES if gssd isn't running in that case. +AD4- +AD4- Signed-off-by: Jeff Layton +ADw-jlayton+AEA-redhat.com+AD4- +AD4- --- +AD4- include/linux/sunrpc/rpc+AF8-pipe+AF8-fs.h +AHw- 14 +-+-+-+-+-+-+-+-+-+-+-+-+-+- +AD4- net/sunrpc/auth+AF8-gss/auth+AF8-gss.c +AHw- 10 +-+-+-+-+------ +AD4- net/sunrpc/netns.h +AHw- 2 -- +AD4- net/sunrpc/rpc+AF8-pipe.c +AHw- 16 +-+-+-+-+-+-+-+-+-+-+-+----- +AD4- 4 files changed, 31 insertions(+-), 11 deletions(-) +AD4- +AD4- diff --git a/include/linux/sunrpc/rpc+AF8-pipe+AF8-fs.h b/include/linux/sunrpc/rpc+AF8-pipe+AF8-fs.h +AD4- index 85f1342..438e606 100644 +AD4- --- a/include/linux/sunrpc/rpc+AF8-pipe+AF8-fs.h +AD4- +-+-+- b/include/linux/sunrpc/rpc+AF8-pipe+AF8-fs.h +AD4- +AEAAQA- -131,5 +-131,19 +AEAAQA- extern int rpc+AF8-unlink(struct dentry +ACo-)+ADs- +AD4- extern int register+AF8-rpc+AF8-pipefs(void)+ADs- +AD4- extern void unregister+AF8-rpc+AF8-pipefs(void)+ADs- +AD4- +AD4- +-+ACM-if IS+AF8-ENABLED(CONFIG+AF8-SUNRPC+AF8-GSS) +AD4- +- +AD4- +-extern bool gssd+AF8-running(struct net +ACo-net)+ADs- +AD4- +- +AD4- +-+ACM-else /+ACo- +ACE-CONFIG+AF8-SUNRPC+AF8-GSS +ACo-/ +AD4- +- +AD4- +-static inline bool +AD4- +-gssd+AF8-running(struct net +ACo-net) +AD4- +-+AHs- +AD4- +- return false+ADs- +AD4- +-+AH0- +AD4- +- +AD4- +-+ACM-endif /+ACo- CONFIG+AF8-SUNRPC+AF8-GSS +ACo-/ Why the +ACM-if IS+AF8-ENABLED(CONFIG+AF8-SUNRPC+AF8-GSS)? Prior to this patch, there was nothing stopping you from compiling the module later. -- Trond Myklebust Linux NFS client maintainer NetApp Trond.Myklebust+AEA-netapp.com www.netapp.com -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
