All of lore.kernel.org
 help / color / mirror / Atom feed
* Orangefs, v4.5 and the merge window...
@ 2016-03-11 20:18 Mike Marshall
  2016-03-11 21:47 ` Al Viro
  0 siblings, 1 reply; 25+ messages in thread
From: Mike Marshall @ 2016-03-11 20:18 UTC (permalink / raw)
  To: Al Viro, linux-fsdevel, Mike Marshall

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,

^ permalink raw reply related	[flat|nested] 25+ messages in thread

end of thread, other threads:[~2016-03-26 21:00 UTC | newest]

Thread overview: 25+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-11 20:18 Orangefs, v4.5 and the merge window Mike Marshall
2016-03-11 21:47 ` Al Viro
2016-03-11 22:35   ` Mike Marshall
2016-03-14 21:03     ` Mike Marshall
2016-03-26  0:21       ` Al Viro
2016-03-26  1:00         ` Mike Marshall
     [not found]         ` <CA+55aFzLC_pdj_ds82YYab5D7jpYMj26s0Frofxxhk=j7SqnjA@mail.gmail.com>
2016-03-26  1:01           ` Al Viro
2016-03-26  1:07             ` Mike Marshall
     [not found]             ` <CA+55aFysWS9mP+QgfAR6LZpEbkp61MUPQu0zDoq7cafmr3M8SA@mail.gmail.com>
2016-03-26  3:55               ` Mike Marshall
2016-03-26  4:30                 ` Al Viro
2016-03-26 12:07                   ` Mike Marshall
2016-03-26 14:47                     ` Al Viro
2016-03-26 15:34                       ` Mike Marshall
2016-03-26 15:50                         ` Al Viro
2016-03-26 17:36                           ` Mike Marshall
2016-03-26 18:28                             ` Al Viro
2016-03-26 18:37                               ` Al Viro
2016-03-26 19:00                                 ` Mike Marshall
2016-03-26 19:51                                   ` Linus Torvalds
2016-03-26 20:47                                     ` Mike Marshall
2016-03-26 21:00                                       ` Linus Torvalds
2016-03-26  1:02           ` Mike Marshall
2016-03-15  4:04   ` Martin Brandenburg
2016-03-15 16:45     ` Martin Brandenburg
2016-03-17 20:45       ` [PATCH] orangefs: getattr work (was: Re: Orangefs, v4.5 and the merge window...) Martin Brandenburg

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.