linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu>
To: linux-kernel@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, akpm@osdl.org, torvalds@osdl.org,
	viro@ftp.linux.org.uk, hch@infradead.org, joel.becker@oracle.com
Subject: [PATCH 20 of 23] configfs: change uses of f_{dentry, vfsmnt} to use f_path
Date: Sat, 21 Oct 2006 02:17:45 -0400	[thread overview]
Message-ID: <5b7b2321b65bc7f5ab04.1161411465@thor.fsl.cs.sunysb.edu> (raw)
In-Reply-To: <patchbomb.1161411445@thor.fsl.cs.sunysb.edu>

From: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu>

This patch changes all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt}
in the configfs filesystem.

Signed-off-by: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu>

---

2 files changed, 11 insertions(+), 11 deletions(-)
fs/configfs/dir.c  |   10 +++++-----
fs/configfs/file.c |   12 ++++++------

diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -980,7 +980,7 @@ int configfs_rename_dir(struct config_it
 
 static int configfs_dir_open(struct inode *inode, struct file *file)
 {
-	struct dentry * dentry = file->f_dentry;
+	struct dentry * dentry = file->f_path.dentry;
 	struct configfs_dirent * parent_sd = dentry->d_fsdata;
 
 	mutex_lock(&dentry->d_inode->i_mutex);
@@ -993,7 +993,7 @@ static int configfs_dir_open(struct inod
 
 static int configfs_dir_close(struct inode *inode, struct file *file)
 {
-	struct dentry * dentry = file->f_dentry;
+	struct dentry * dentry = file->f_path.dentry;
 	struct configfs_dirent * cursor = file->private_data;
 
 	mutex_lock(&dentry->d_inode->i_mutex);
@@ -1013,7 +1013,7 @@ static inline unsigned char dt_type(stru
 
 static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir)
 {
-	struct dentry *dentry = filp->f_dentry;
+	struct dentry *dentry = filp->f_path.dentry;
 	struct configfs_dirent * parent_sd = dentry->d_fsdata;
 	struct configfs_dirent *cursor = filp->private_data;
 	struct list_head *p, *q = &cursor->s_sibling;
@@ -1070,7 +1070,7 @@ static int configfs_readdir(struct file 
 
 static loff_t configfs_dir_lseek(struct file * file, loff_t offset, int origin)
 {
-	struct dentry * dentry = file->f_dentry;
+	struct dentry * dentry = file->f_path.dentry;
 
 	mutex_lock(&dentry->d_inode->i_mutex);
 	switch (origin) {
@@ -1080,7 +1080,7 @@ static loff_t configfs_dir_lseek(struct 
 			if (offset >= 0)
 				break;
 		default:
-			mutex_unlock(&file->f_dentry->d_inode->i_mutex);
+			mutex_unlock(&file->f_path.dentry->d_inode->i_mutex);
 			return -EINVAL;
 	}
 	if (offset != file->f_pos) {
diff --git a/fs/configfs/file.c b/fs/configfs/file.c
--- a/fs/configfs/file.c
+++ b/fs/configfs/file.c
@@ -134,7 +134,7 @@ configfs_read_file(struct file *file, ch
 
 	down(&buffer->sem);
 	if (buffer->needs_read_fill) {
-		if ((retval = fill_read_buffer(file->f_dentry,buffer)))
+		if ((retval = fill_read_buffer(file->f_path.dentry,buffer)))
 			goto out;
 	}
 	pr_debug("%s: count = %zd, ppos = %lld, buf = %s\n",
@@ -222,7 +222,7 @@ configfs_write_file(struct file *file, c
 	down(&buffer->sem);
 	len = fill_write_buffer(buffer, buf, count);
 	if (len > 0)
-		len = flush_write_buffer(file->f_dentry, buffer, count);
+		len = flush_write_buffer(file->f_path.dentry, buffer, count);
 	if (len > 0)
 		*ppos += len;
 	up(&buffer->sem);
@@ -231,8 +231,8 @@ configfs_write_file(struct file *file, c
 
 static int check_perm(struct inode * inode, struct file * file)
 {
-	struct config_item *item = configfs_get_config_item(file->f_dentry->d_parent);
-	struct configfs_attribute * attr = to_attr(file->f_dentry);
+	struct config_item *item = configfs_get_config_item(file->f_path.dentry->d_parent);
+	struct configfs_attribute * attr = to_attr(file->f_path.dentry);
 	struct configfs_buffer * buffer;
 	struct configfs_item_operations * ops = NULL;
 	int error = 0;
@@ -305,8 +305,8 @@ static int configfs_open_file(struct ino
 
 static int configfs_release(struct inode * inode, struct file * filp)
 {
-	struct config_item * item = to_item(filp->f_dentry->d_parent);
-	struct configfs_attribute * attr = to_attr(filp->f_dentry);
+	struct config_item * item = to_item(filp->f_path.dentry->d_parent);
+	struct configfs_attribute * attr = to_attr(filp->f_path.dentry);
 	struct module * owner = attr->ca_owner;
 	struct configfs_buffer * buffer = filp->private_data;
 



  parent reply	other threads:[~2006-10-21  7:13 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-10-21  6:17 [PATCH 00 of 23] struct file: Use struct path Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 01 of 23] VFS: change struct file to use " Josef Jeff Sipek
2006-10-21  7:22   ` Andrew Morton
2006-10-21  7:28     ` Josef Sipek
2006-10-23 11:47       ` Martin Waitz
2006-10-24  9:03         ` Josef Sipek
2006-10-21  6:17 ` [PATCH 02 of 23] sysfs: change uses of f_{dentry, vfsmnt} to use f_path Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 03 of 23] proc: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 04 of 23] ext2: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 05 of 23] ext3: " Josef Jeff Sipek
2006-10-21 12:51   ` Robert Peterson
2006-10-21 18:26     ` Josef Sipek
2006-10-21  6:17 ` [PATCH 06 of 23] ext4: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 07 of 23] fat: change uses of f_{dentry,vfsmnt} " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 08 of 23] isofs: change uses of f_{dentry, vfsmnt} " Josef Jeff Sipek
2006-10-21 23:13   ` James Morris
2006-10-22  0:11     ` Linus Torvalds
2006-10-21  6:17 ` [PATCH 09 of 23] nfs: change uses of f_{dentry,vfsmnt} " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 10 of 23] nfsd: change uses of f_{dentry, vfsmnt} " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 11 of 23] ntfs: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 12 of 23] i386: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 13 of 23] x86_64: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 14 of 23] kernel: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 15 of 23] mm: change uses of f_{dentry,vfsmnt} " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 16 of 23] 9p: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 17 of 23] affs: change uses of f_{dentry, vfsmnt} " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 18 of 23] autofs: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 19 of 23] autofs4: " Josef Jeff Sipek
2006-10-21  6:17 ` Josef Jeff Sipek [this message]
2006-10-21  6:17 ` [PATCH 21 of 23] cifs: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 22 of 23] ecryptfs: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 23 of 23] xfs: change uses of f_{dentry,vfsmnt} " Josef Jeff Sipek

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=5b7b2321b65bc7f5ab04.1161411465@thor.fsl.cs.sunysb.edu \
    --to=jsipek@cs.sunysb.edu \
    --cc=akpm@osdl.org \
    --cc=hch@infradead.org \
    --cc=joel.becker@oracle.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@osdl.org \
    --cc=viro@ftp.linux.org.uk \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).