Orangefs, v4.5 and the merge window...

[Mike Marshall <hubcap@omnibond.com>]

Greetings...

The Orangefs for-next tree is:

git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git
for-next

I did a test merge (just locally, not pushed out) of Orangefs:for-next
and v4.5-rc7 so I could test out how I think I need to patch for
the follow_link -> get_link change, the diff is below.

On Monday next, assuming that v4.5 is finalized this weekend,
I plan to do a actual merge with v4.5, apply the get_link patch
and push that to Orangefs:for-next.

Hi Al <g>... might we get an ACK this time around?

-Mike

diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index 4e923ec..50a2172 100644
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -276,9 +276,12 @@ int orangefs_getattr(struct vfsmount *mnt,
  ret = orangefs_inode_getattr(inode, ORANGEFS_ATTR_SYS_ALL_NOHINT, 0);
  if (ret == 0) {
  generic_fillattr(inode, kstat);
+
  /* override block size reported to stat */
  orangefs_inode = ORANGEFS_I(inode);
  kstat->blksize = orangefs_inode->blksize;
+
+ inode->i_link = ORANGEFS_I(dentry->d_inode)->link_target;
  } else {
  /* assume an I/O error and flag inode as bad */
  gossip_debug(GOSSIP_INODE_DEBUG,
diff --git a/fs/orangefs/symlink.c b/fs/orangefs/symlink.c
index 2b8541a..6418dd6 100644
--- a/fs/orangefs/symlink.c
+++ b/fs/orangefs/symlink.c
@@ -8,22 +8,9 @@
 #include "orangefs-kernel.h"
 #include "orangefs-bufmap.h"

-static const char *orangefs_follow_link(struct dentry *dentry, void **cookie)
-{
- char *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);
-
- *cookie = target;
-
- return target;
-}
-
 struct inode_operations orangefs_symlink_inode_operations = {
  .readlink = generic_readlink,
- .follow_link = orangefs_follow_link,
+ .get_link = simple_get_link,
  .setattr = orangefs_setattr,
  .getattr = orangefs_getattr,
  .listxattr = orangefs_listxattr,