From patchwork Thu May 5 15:35:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Hicks X-Patchwork-Id: 757542 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p45Fa0DW011950 for ; Thu, 5 May 2011 15:36:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754433Ab1EEPgA (ORCPT ); Thu, 5 May 2011 11:36:00 -0400 Received: from e35.co.us.ibm.com ([32.97.110.153]:44261 "EHLO e35.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753619Ab1EEPf7 (ORCPT ); Thu, 5 May 2011 11:35:59 -0400 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by e35.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p45FJDvS013977; Thu, 5 May 2011 09:19:13 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p45FZicN153682; Thu, 5 May 2011 09:35:45 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p459ZFR5017029; Thu, 5 May 2011 03:35:16 -0600 Received: from localhost ([9.12.226.206]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p459ZF2s016934; Thu, 5 May 2011 03:35:15 -0600 From: Tyler Hicks To: Trond Myklebust Cc: linux-nfs@vger.kernel.org, ecryptfs-devel@lists.launchpad.net, ecryptfs@vger.kernel.org Subject: [PATCH] NFS: Allow NULL nameidata in d_revalidate and create Date: Thu, 5 May 2011 10:35:41 -0500 Message-Id: <1304609741-12541-1-git-send-email-tyhicks@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.4.4 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 05 May 2011 15:36:01 +0000 (UTC) To add support for eCryptfs mounts on top of NFS client mounts, the NFS client must properly handle NULL nameidata pointers in its d_revalidate functions. NFS clients should also handle NULL nameidata in its create functions, although this is not currently required for eCryptfs support. Signed-off-by: Tyler Hicks --- fs/nfs/dir.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 7237672..03c6ab2 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -1095,7 +1095,7 @@ static int nfs_lookup_revalidate(struct dentry *dentry, struct nameidata *nd) struct nfs_fattr *fattr = NULL; int error; - if (nd->flags & LOOKUP_RCU) + if (nd && nd->flags & LOOKUP_RCU) return -ECHILD; parent = dget_parent(dentry); @@ -1493,7 +1493,7 @@ static int nfs_open_revalidate(struct dentry *dentry, struct nameidata *nd) struct nfs_open_context *ctx; int openflags, ret = 0; - if (nd->flags & LOOKUP_RCU) + if (nd && nd->flags & LOOKUP_RCU) return -ECHILD; inode = dentry->d_inode; @@ -1583,7 +1583,7 @@ static int nfs_open_create(struct inode *dir, struct dentry *dentry, int mode, attr.ia_mode = mode; attr.ia_valid = ATTR_MODE; - if ((nd->flags & LOOKUP_CREATE) != 0) { + if (nd && (nd->flags & LOOKUP_CREATE) != 0) { open_flags = nd->intent.open.flags; ctx = nameidata_to_nfs_open_context(dentry, nd); @@ -1673,7 +1673,7 @@ static int nfs_create(struct inode *dir, struct dentry *dentry, int mode, attr.ia_mode = mode; attr.ia_valid = ATTR_MODE; - if ((nd->flags & LOOKUP_CREATE) != 0) + if (nd && (nd->flags & LOOKUP_CREATE) != 0) open_flags = nd->intent.open.flags; error = NFS_PROTO(dir)->create(dir, dentry, &attr, open_flags, NULL);