LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Erez Zadok <ezk@cs.sunysb.edu>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	viro@ftp.linux.org.uk, hch@infradead.org,
	Andrew Morton <akpm@linux-foundation.org>,
	Erez Zadok <ezk@cs.sunysb.edu>
Subject: [PATCH 15/17] Unionfs: embed a struct path into struct nameidata instead of nd dentrymnt
Date: Sat, 16 Feb 2008 21:57:24 -0500	[thread overview]
Message-ID: <1203217053591-git-send-email-ezk@cs.sunysb.edu> (raw)
In-Reply-To: <12032170461107-git-send-email-ezk@cs.sunysb.edu>

From: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
---
 fs/unionfs/inode.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index 2e791fd..640969d 100644
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -254,8 +254,8 @@ static struct dentry *unionfs_lookup(struct inode *parent,
 
 	/* save the dentry & vfsmnt from namei */
 	if (nd) {
-		path_save.dentry = nd->dentry;
-		path_save.mnt = nd->mnt;
+		path_save.dentry = nd->path.dentry;
+		path_save.mnt = nd->path.mnt;
 	}
 
 	/*
@@ -266,8 +266,8 @@ static struct dentry *unionfs_lookup(struct inode *parent,
 
 	/* restore the dentry & vfsmnt in namei */
 	if (nd) {
-		nd->dentry = path_save.dentry;
-		nd->mnt = path_save.mnt;
+		nd->path.dentry = path_save.dentry;
+		nd->path.mnt = path_save.mnt;
 	}
 	if (!IS_ERR(ret)) {
 		if (ret)
@@ -885,7 +885,7 @@ static int unionfs_permission(struct inode *inode, int mask,
 	const int write_mask = (mask & MAY_WRITE) && !(mask & MAY_READ);
 
 	if (nd)
-		unionfs_lock_dentry(nd->dentry, UNIONFS_DMUTEX_CHILD);
+		unionfs_lock_dentry(nd->path.dentry, UNIONFS_DMUTEX_CHILD);
 
 	if (!UNIONFS_I(inode)->lower_inodes) {
 		if (is_file)	/* dirs can be unlinked but chdir'ed to */
@@ -960,7 +960,7 @@ out:
 	unionfs_check_inode(inode);
 	unionfs_check_nd(nd);
 	if (nd)
-		unionfs_unlock_dentry(nd->dentry);
+		unionfs_unlock_dentry(nd->path.dentry);
 	return err;
 }
 
-- 
1.5.2.2


  parent reply	other threads:[~2008-02-17  3:03 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-17  2:57 [GIT PULL -mm] 00/17 Unionfs updates/fixes/cleanups Erez Zadok
2008-02-17  2:57 ` [PATCH 01/17] Unionfs: grab lower super_block references Erez Zadok
2008-02-17  2:57 ` [PATCH 02/17] Unionfs: ensure consistent lower inodes types Erez Zadok
2008-02-17  2:57 ` [PATCH 03/17] Unionfs: document behavior when the lower topology changes Erez Zadok
2008-02-17  2:57 ` [PATCH 04/17] Unionfs: uninline unionfs_copy_attr_times and unionfs_copy_attr_all Erez Zadok
2008-02-17  2:57 ` [PATCH 05/17] Unionfs: initialize path_save variable Erez Zadok
2008-02-17  2:57 ` [PATCH 06/17] Unionfs: extend dentry branch configuration lock in open Erez Zadok
2008-02-17  2:57 ` [PATCH 07/17] Unionfs: follow_link locking fixes Erez Zadok
2008-02-17  2:57 ` [PATCH 08/17] Unionfs: improve debugging in copy_attr_times Erez Zadok
2008-02-17  2:57 ` [PATCH 09/17] Unionfs: revalidation code cleanup and refactoring Erez Zadok
2008-02-17  2:57 ` [PATCH 10/17] Unionfs: factor out revalidation routine Erez Zadok
2008-02-17  2:57 ` [PATCH 11/17] Unionfs: lock parents' branch configuration fixes Erez Zadok
2008-02-17  2:57 ` [PATCH 12/17] Unionfs: branch management/configuration fixes Erez Zadok
2008-02-17  2:57 ` [PATCH 13/17] Unionfs: use dget_parent in revalidation code Erez Zadok
2008-02-17  2:57 ` [PATCH 14/17] Unionfs: stop using iget() and read_inode() Erez Zadok
2008-02-17  2:57 ` Erez Zadok [this message]
2008-02-17  2:57 ` [PATCH 16/17] Unionfs: use the new path_put Erez Zadok
2008-02-17  2:57 ` [PATCH 17/17] VFS/Unionfs: use generic path_get/path_put functions Erez Zadok

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1203217053591-git-send-email-ezk@cs.sunysb.edu \
    --to=ezk@cs.sunysb.edu \
    --cc=akpm@linux-foundation.org \
    --cc=hch@infradead.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=viro@ftp.linux.org.uk \
    --subject='Re: [PATCH 15/17] Unionfs: embed a struct path into struct nameidata instead of nd dentrymnt' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).