head	1.1;
access;
symbols
	LKML-branch:1.1.0.2;
locks; strict;
comment	@# @;


1.1
date	2006.10.24.04.54.58;	author jsipek;	state dead;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2006.10.24.04.54.58;	author jsipek;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2006.10.24.07.45.06;	author jsipek;	state Exp;
branches;
next	1.1.2.3;

1.1.2.3
date	2006.10.24.08.08.24;	author jsipek;	state Exp;
branches;
next	1.1.2.4;

1.1.2.4
date	2006.10.27.15.24.18;	author jsipek;	state dead;
branches;
next	;


desc
@@


1.1
log
@file smbfs was initially added on branch LKML-branch.
@
text
@@


1.1.2.1
log
@Fix remainder of the kernel's f_{dentry,vfsmnt} usage
@
text
@a0 170
diff -r ed8030e0f7d4 fs/smbfs/cache.c
--- a/fs/smbfs/cache.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/fs/smbfs/cache.c	Mon Oct 23 23:26:46 2006 -0400
@@@@ -125,7 +125,7 @@@@ smb_fill_cache(struct file *filp, void *
 	       struct smb_cache_control *ctrl, struct qstr *qname,
 	       struct smb_fattr *entry)
 {
-	struct dentry *newdent, *dentry = filp->f_dentry;
+	struct dentry *newdent, *dentry = filp->f_path.dentry;
 	struct inode *newino, *inode = dentry->d_inode;
 	struct smb_cache_control ctl = *ctrl;
 	int valid = 0;
diff -r ed8030e0f7d4 fs/smbfs/dir.c
--- a/fs/smbfs/dir.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/fs/smbfs/dir.c	Mon Oct 23 23:26:46 2006 -0400
@@@@ -78,7 +78,7 @@@@ static int
 static int 
 smb_readdir(struct file *filp, void *dirent, filldir_t filldir)
 {
-	struct dentry *dentry = filp->f_dentry;
+	struct dentry *dentry = filp->f_path.dentry;
 	struct inode *dir = dentry->d_inode;
 	struct smb_sb_info *server = server_from_dentry(dentry);
 	union  smb_dir_cache *cache = NULL;
@@@@ -238,12 +238,12 @@@@ static int
 static int
 smb_dir_open(struct inode *dir, struct file *file)
 {
-	struct dentry *dentry = file->f_dentry;
+	struct dentry *dentry = file->f_path.dentry;
 	struct smb_sb_info *server;
 	int error = 0;
 
 	VERBOSE("(%s/%s)\n", dentry->d_parent->d_name.name,
-		file->f_dentry->d_name.name);
+		file->f_path.dentry->d_name.name);
 
 	/*
 	 * Directory timestamps in the core protocol aren't updated
diff -r ed8030e0f7d4 fs/smbfs/file.c
--- a/fs/smbfs/file.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/fs/smbfs/file.c	Mon Oct 23 23:26:46 2006 -0400
@@@@ -102,7 +102,7 @@@@ smb_readpage(struct file *file, struct p
 smb_readpage(struct file *file, struct page *page)
 {
 	int		error;
-	struct dentry  *dentry = file->f_dentry;
+	struct dentry  *dentry = file->f_path.dentry;
 
 	page_cache_get(page);
 	error = smb_readpage_sync(dentry, page);
@@@@ -205,7 +205,7 @@@@ smb_updatepage(struct file *file, struct
 smb_updatepage(struct file *file, struct page *page, unsigned long offset,
 	       unsigned int count)
 {
-	struct dentry *dentry = file->f_dentry;
+	struct dentry *dentry = file->f_path.dentry;
 
 	DEBUG1("(%s/%s %d@@%lld)\n", DENTRY_PATH(dentry), count,
 		((unsigned long long)page->index << PAGE_CACHE_SHIFT) + offset);
@@@@ -218,7 +218,7 @@@@ smb_file_aio_read(struct kiocb *iocb, co
 			unsigned long nr_segs, loff_t pos)
 {
 	struct file * file = iocb->ki_filp;
-	struct dentry * dentry = file->f_dentry;
+	struct dentry * dentry = file->f_path.dentry;
 	ssize_t	status;
 
 	VERBOSE("file %s/%s, count=%lu@@%lu\n", DENTRY_PATH(dentry),
@@@@ -243,7 +243,7 @@@@ static int
 static int
 smb_file_mmap(struct file * file, struct vm_area_struct * vma)
 {
-	struct dentry * dentry = file->f_dentry;
+	struct dentry * dentry = file->f_path.dentry;
 	int	status;
 
 	VERBOSE("file %s/%s, address %lu - %lu\n",
@@@@ -264,7 +264,7 @@@@ smb_file_sendfile(struct file *file, lof
 smb_file_sendfile(struct file *file, loff_t *ppos,
 		  size_t count, read_actor_t actor, void *target)
 {
-	struct dentry *dentry = file->f_dentry;
+	struct dentry *dentry = file->f_path.dentry;
 	ssize_t status;
 
 	VERBOSE("file %s/%s, pos=%Ld, count=%d\n",
@@@@ -323,7 +323,7 @@@@ smb_file_aio_write(struct kiocb *iocb, c
 			       unsigned long nr_segs, loff_t pos)
 {
 	struct file * file = iocb->ki_filp;
-	struct dentry * dentry = file->f_dentry;
+	struct dentry * dentry = file->f_path.dentry;
 	ssize_t	result;
 
 	VERBOSE("file %s/%s, count=%lu@@%lu\n",
@@@@ -355,7 +355,7 @@@@ smb_file_open(struct inode *inode, struc
 smb_file_open(struct inode *inode, struct file * file)
 {
 	int result;
-	struct dentry *dentry = file->f_dentry;
+	struct dentry *dentry = file->f_path.dentry;
 	int smb_mode = (file->f_mode & O_ACCMODE) - 1;
 
 	lock_kernel();
diff -r ed8030e0f7d4 fs/smbfs/proc.c
--- a/fs/smbfs/proc.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/fs/smbfs/proc.c	Mon Oct 23 23:26:46 2006 -0400
@@@@ -873,7 +873,7 @@@@ smb_newconn(struct smb_sb_info *server, 
 	filp = fget(opt->fd);
 	if (!filp)
 		goto out;
-	if (!smb_valid_socket(filp->f_dentry->d_inode))
+	if (!smb_valid_socket(filp->f_path.dentry->d_inode))
 		goto out_putf;
 
 	server->sock_file = filp;
@@@@ -898,7 +898,7 @@@@ smb_newconn(struct smb_sb_info *server, 
 	/*
 	 * Store the server in sock user_data (Only used by sunrpc)
 	 */
-	sk = SOCKET_I(filp->f_dentry->d_inode)->sk;
+	sk = SOCKET_I(filp->f_path.dentry->d_inode)->sk;
 	sk->sk_user_data = server;
 
 	/* chain into the data_ready callback */
@@@@ -1939,7 +1939,7 @@@@ smb_proc_readdir_short(struct file *filp
 smb_proc_readdir_short(struct file *filp, void *dirent, filldir_t filldir,
 		       struct smb_cache_control *ctl)
 {
-	struct dentry *dir = filp->f_dentry;
+	struct dentry *dir = filp->f_path.dentry;
 	struct smb_sb_info *server = server_from_dentry(dir);
 	struct qstr qname;
 	struct smb_fattr fattr;
@@@@ -2291,7 +2291,7 @@@@ smb_proc_readdir_long(struct file *filp,
 smb_proc_readdir_long(struct file *filp, void *dirent, filldir_t filldir,
 		      struct smb_cache_control *ctl)
 {
-	struct dentry *dir = filp->f_dentry;
+	struct dentry *dir = filp->f_path.dentry;
 	struct smb_sb_info *server = server_from_dentry(dir);
 	struct qstr qname;
 	struct smb_fattr fattr;
@@@@ -2859,7 +2859,7 @@@@ smb_proc_readdir_null(struct file *filp,
 smb_proc_readdir_null(struct file *filp, void *dirent, filldir_t filldir,
 		      struct smb_cache_control *ctl)
 {
-	struct smb_sb_info *server = server_from_dentry(filp->f_dentry);
+	struct smb_sb_info *server = server_from_dentry(filp->f_path.dentry);
 
 	if (smb_proc_ops_wait(server) < 0)
 		return -EIO;
diff -r ed8030e0f7d4 fs/smbfs/sock.c
--- a/fs/smbfs/sock.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/fs/smbfs/sock.c	Mon Oct 23 23:26:46 2006 -0400
@@@@ -82,10 +82,10 @@@@ server_sock(struct smb_sb_info *server)
 	if (server && (file = server->sock_file))
 	{
 #ifdef SMBFS_PARANOIA
-		if (!smb_valid_socket(file->f_dentry->d_inode))
+		if (!smb_valid_socket(file->f_path.dentry->d_inode))
 			PARANOIA("bad socket!\n");
 #endif
-		return SOCKET_I(file->f_dentry->d_inode);
+		return SOCKET_I(file->f_path.dentry->d_inode);
 	}
 	return NULL;
 }

@


1.1.2.2
log
@reorder, rename and add descriptions to the remainder of f_{dentry,vfsmnt}
patches
@
text
@a0 7
smbfs: change uses of f_{dentry,vfsmnt} to use f_path

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

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

@


1.1.2.3
log
@Added "From:" lines
@
text
@a2 2
From: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>

@


1.1.2.4
log
@Remove old copies of the struct_file patches
@
text
@@


