Merge remote-tracking branch 'orangefs/for-next'

diff --cc MAINTAINERS
Simple merge

diff --cc fs/Kconfig
Simple merge

diff --cc fs/orangefs/symlink.c
index 0000000000000000000000000000000000000000,2b8541a7fc43d0bfdb9241594422046d699f11fc..943884b4d3ba4106d12f291f75be18a24a58d995
mode 000000,100644..100644
--- /dev/null
--- 2/fs/orangefs/symlink.c
+++ b/fs/orangefs/symlink.c
@@@ -1,0 -1,32 +1,36 @@@
 -static const char *orangefs_follow_link(struct dentry *dentry, void **cookie)
+ /*
+  * (C) 2001 Clemson University and The University of Chicago
+  *
+  * See COPYING in top-level directory.
+  */
+ 
+ #include "protocol.h"
+ #include "orangefs-kernel.h"
+ #include "orangefs-bufmap.h"
+ 
 -      char *target =  ORANGEFS_I(dentry->d_inode)->link_target;
++static const char *orangefs_get_link(struct dentry *dentry, struct inode *inode,
++                                   struct delayed_call *done)
+ {
 -      *cookie = target;
 -
++      char *target;
++
++      if (!dentry)
++              return ERR_PTR(-ECHILD);
++
++      target =  ORANGEFS_I(dentry->d_inode)->link_target;
+ 
+       gossip_debug(GOSSIP_INODE_DEBUG,
+                    "%s: called on %s (target is %p)\n",
+                    __func__, (char *)dentry->d_name.name, target);
+ 
 -      .follow_link = orangefs_follow_link,
+       return target;
+ }
+ 
+ struct inode_operations orangefs_symlink_inode_operations = {
+       .readlink = generic_readlink,
++      .get_link = orangefs_get_link,
+       .setattr = orangefs_setattr,
+       .getattr = orangefs_getattr,
+       .listxattr = orangefs_listxattr,
+       .setxattr = generic_setxattr,
+       .permission = orangefs_permission,
+ };