diff --git a/[refs] b/[refs] index 518de92aa9cf..8876f34429a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 001abc93bf83f95737cd455b6ec875e6412f7d53 +refs/heads/master: 0072b1389c25355ccc01048114adb9652c13fd9f diff --git a/trunk/include/linux/dcookies.h b/trunk/include/linux/dcookies.h index c28050136164..1d68428c925d 100644 --- a/trunk/include/linux/dcookies.h +++ b/trunk/include/linux/dcookies.h @@ -48,12 +48,12 @@ int get_dcookie(struct dentry * dentry, struct vfsmount * vfsmnt, #else -struct dcookie_user * dcookie_register(void) +static inline struct dcookie_user * dcookie_register(void) { return NULL; } -void dcookie_unregister(struct dcookie_user * user) +static inline void dcookie_unregister(struct dcookie_user * user) { return; }