From patchwork Fri Mar 11 20:18:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Marshall X-Patchwork-Id: 8568911 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B40B79F38C for ; Fri, 11 Mar 2016 20:19:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D7CC520260 for ; Fri, 11 Mar 2016 20:19:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AEA1620211 for ; Fri, 11 Mar 2016 20:19:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751578AbcCKUTA (ORCPT ); Fri, 11 Mar 2016 15:19:00 -0500 Received: from mail-lb0-f180.google.com ([209.85.217.180]:36850 "EHLO mail-lb0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750953AbcCKUS7 (ORCPT ); Fri, 11 Mar 2016 15:18:59 -0500 Received: by mail-lb0-f180.google.com with SMTP id x1so170415482lbj.3 for ; Fri, 11 Mar 2016 12:18:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=omnibond-com.20150623.gappssmtp.com; s=20150623; h=mime-version:date:message-id:subject:from:to; bh=Y8MzDPyXD161Iy1v1GmSgTecvrYpv2o2NA9S8nhWuo4=; b=GCcqg0IptdyBpBp8oY6qE/wFZqvcQYej7Co+3sixkvZrsDCP5XLqY/gYyTdGtkD1Ue brgJ3fKGOVprjNFxBZOKChmuBcCLmJ9J7o2p4IPikVDBZ9iaxIknX6O+tvNldC+2Mupo g0JqEnRk/jgLUfCICbfZaH5DgVAp5yU1pQGBHXMkQj8ybnjEtzV13IUTSQlFL0uL8Fnr 3UG5fS4QApTNEMgMJOX+2N3HUQrUf2IuiEXpL39uy99MP/UUTyzxfwzB1ZlkctdQM9y7 HSBBGxQZtHfOnn1j+t/IVzq6k5Eav3sVo9NT6KYNIM3dHGsSzjorZamK8ZfrXmzlkl8z 5I8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to; bh=Y8MzDPyXD161Iy1v1GmSgTecvrYpv2o2NA9S8nhWuo4=; b=QkBrzbAnmWuXcwqfTXqVFWIjsn574zWzEMCoRqfEIPnbZWY5nXfHSJErfZj7vGV6oT 6VXPTEAvAIASCDeBTqeCGMYqfobVB+xNA183q3Vv8GOjsKca0TK6CTLrFQf2BN8yTQ2C lp3dSws7ReV5NrUcrNW6ZHiV7cZs82mfYFGZJ84OKdtGwd8mJ5ZZxO5Izp7CgV8XovTh DAZlv/1h+My4KhuGx97rdiHstN2cAzU3IbXDuyszWLU8Y04B9xiVItAWlpE9pdtw3Tjw lC7xjiuJcTMUGf0tNtL9OEum2ryzKT4/H8fqpYTjawdXuG4b0vTc/X3lqWL95D7M090Q qR/Q== X-Gm-Message-State: AD7BkJIRLoR/8dME5ISBXMRsb0onFUnRYPJMHyei1FkcAQAKFUMLiORzMSWSlHvJH3lazPtoOqXCbw2EHI1ldA== MIME-Version: 1.0 X-Received: by 10.25.143.65 with SMTP id r62mr3104478lfd.58.1457727538035; Fri, 11 Mar 2016 12:18:58 -0800 (PST) Received: by 10.112.161.106 with HTTP; Fri, 11 Mar 2016 12:18:57 -0800 (PST) Date: Fri, 11 Mar 2016 15:18:57 -0500 Message-ID: Subject: Orangefs, v4.5 and the merge window... From: Mike Marshall To: Al Viro , linux-fsdevel , Mike Marshall Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 ... might we get an ACK this time around? -Mike --- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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,