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


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

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

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

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

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


desc
@@


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


1.1.2.1
log
@struct file related fixes for: fat isofs nfs nfsd ntfs include i386 x86_64
kernel mm 9p affs autofs autofs4 configfs cifs
@
text
@a0 118
diff -r d839c8ac3ffe fs/nfsd/nfs4state.c
--- a/fs/nfsd/nfs4state.c	Thu Oct 19 20:49:21 2006 -0400
+++ b/fs/nfsd/nfs4state.c	Thu Oct 19 21:06:34 2006 -0400
@@@@ -1310,7 +1310,7 @@@@ nfs4_file_downgrade(struct file *filp, u
 nfs4_file_downgrade(struct file *filp, unsigned int share_access)
 {
 	if (share_access & NFS4_SHARE_ACCESS_WRITE) {
-		put_write_access(filp->f_dentry->d_inode);
+		put_write_access(filp->f_path.dentry->d_inode);
 		filp->f_mode = (filp->f_mode | FMODE_READ) & ~FMODE_WRITE;
 	}
 }
@@@@ -1623,7 +1623,7 @@@@ nfs4_upgrade_open(struct svc_rqst *rqstp
 nfs4_upgrade_open(struct svc_rqst *rqstp, struct svc_fh *cur_fh, struct nfs4_stateid *stp, struct nfsd4_open *open)
 {
 	struct file *filp = stp->st_vfs_file;
-	struct inode *inode = filp->f_dentry->d_inode;
+	struct inode *inode = filp->f_path.dentry->d_inode;
 	unsigned int share_access, new_writer;
 	int status;
 
@@@@ -1966,7 +1966,7 @@@@ static inline int
 static inline int
 nfs4_check_fh(struct svc_fh *fhp, struct nfs4_stateid *stp)
 {
-	return fhp->fh_dentry->d_inode != stp->st_vfs_file->f_dentry->d_inode;
+	return fhp->fh_dentry->d_inode != stp->st_vfs_file->f_path.dentry->d_inode;
 }
 
 static int
@@@@ -2861,7 +2861,7 @@@@ nfsd4_lockt(struct svc_rqst *rqstp, stru
 	 * only the dentry:inode set.
 	 */
 	memset(&file, 0, sizeof (struct file));
-	file.f_dentry = current_fh->fh_dentry;
+	file.f_path.dentry = current_fh->fh_dentry;
 
 	status = nfs_ok;
 	if (posix_test_lock(&file, &file_lock, &conflock)) {
@@@@ -2950,7 +2950,7 @@@@ check_for_locks(struct file *filp, struc
 check_for_locks(struct file *filp, struct nfs4_stateowner *lowner)
 {
 	struct file_lock **flpp;
-	struct inode *inode = filp->f_dentry->d_inode;
+	struct inode *inode = filp->f_path.dentry->d_inode;
 	int status = 0;
 
 	lock_kernel();
diff -r d839c8ac3ffe fs/nfsd/nfsctl.c
--- a/fs/nfsd/nfsctl.c	Thu Oct 19 20:49:21 2006 -0400
+++ b/fs/nfsd/nfsctl.c	Thu Oct 19 21:05:26 2006 -0400
@@@@ -111,7 +111,7 @@@@ static ssize_t (*write_op[])(struct file
 
 static ssize_t nfsctl_transaction_write(struct file *file, const char __user *buf, size_t size, loff_t *pos)
 {
-	ino_t ino =  file->f_dentry->d_inode->i_ino;
+	ino_t ino =  file->f_path.dentry->d_inode->i_ino;
 	char *data;
 	ssize_t rv;
 
diff -r d839c8ac3ffe fs/nfsd/vfs.c
--- a/fs/nfsd/vfs.c	Thu Oct 19 20:49:21 2006 -0400
+++ b/fs/nfsd/vfs.c	Thu Oct 19 21:06:11 2006 -0400
@@@@ -732,10 +732,10 @@@@ nfsd_sync(struct file *filp)
 nfsd_sync(struct file *filp)
 {
         int err;
-	struct inode *inode = filp->f_dentry->d_inode;
-	dprintk("nfsd: sync file %s\n", filp->f_dentry->d_name.name);
+	struct inode *inode = filp->f_path.dentry->d_inode;
+	dprintk("nfsd: sync file %s\n", filp->f_path.dentry->d_name.name);
 	mutex_lock(&inode->i_mutex);
-	err=nfsd_dosync(filp, filp->f_dentry, filp->f_op);
+	err=nfsd_dosync(filp, filp->f_path.dentry, filp->f_op);
 	mutex_unlock(&inode->i_mutex);
 
 	return err;
@@@@ -840,7 +840,7 @@@@ nfsd_vfs_read(struct svc_rqst *rqstp, st
 	int		err;
 
 	err = nfserr_perm;
-	inode = file->f_dentry->d_inode;
+	inode = file->f_path.dentry->d_inode;
 #ifdef MSNFS
 	if ((fhp->fh_export->ex_flags & NFSEXP_MSNFS) &&
 		(!lock_may_read(inode, offset, *count)))
@@@@ -878,7 +878,7 @@@@ nfsd_vfs_read(struct svc_rqst *rqstp, st
 		nfsdstats.io_read += err;
 		*count = err;
 		err = 0;
-		fsnotify_access(file->f_dentry);
+		fsnotify_access(file->f_path.dentry);
 	} else 
 		err = nfserrno(err);
 out:
@@@@ -911,11 +911,11 @@@@ nfsd_vfs_write(struct svc_rqst *rqstp, s
 	err = nfserr_perm;
 
 	if ((fhp->fh_export->ex_flags & NFSEXP_MSNFS) &&
-		(!lock_may_write(file->f_dentry->d_inode, offset, cnt)))
+		(!lock_may_write(file->f_path.dentry->d_inode, offset, cnt)))
 		goto out;
 #endif
 
-	dentry = file->f_dentry;
+	dentry = file->f_path.dentry;
 	inode = dentry->d_inode;
 	exp   = fhp->fh_export;
 
@@@@ -944,7 +944,7 @@@@ nfsd_vfs_write(struct svc_rqst *rqstp, s
 	set_fs(oldfs);
 	if (err >= 0) {
 		nfsdstats.io_write += cnt;
-		fsnotify_modify(file->f_dentry);
+		fsnotify_modify(file->f_path.dentry);
 	}
 
 	/* clear setuid/setgid flag after write */
@


1.1.2.2
log
@struct file patches - descriptions
@
text
@a0 5
nfsd: 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 nfs server code.

@


1.1.2.3
log
@Rebase against -rc2-git
@
text
@d6 3
a8 3
diff -r 589a0f34320f fs/nfsd/nfs4state.c
--- a/fs/nfsd/nfs4state.c	Sat Oct 21 01:53:22 2006 -0400
+++ b/fs/nfsd/nfs4state.c	Sat Oct 21 01:53:40 2006 -0400
d25 1
a25 1
 	__be32 status;
d36 1
a36 1
@@@@ -2863,7 +2863,7 @@@@ nfsd4_lockt(struct svc_rqst *rqstp, stru
d45 1
a45 1
@@@@ -2953,7 +2953,7 @@@@ check_for_locks(struct file *filp, struc
d54 3
a56 3
diff -r 589a0f34320f fs/nfsd/nfsctl.c
--- a/fs/nfsd/nfsctl.c	Sat Oct 21 01:53:22 2006 -0400
+++ b/fs/nfsd/nfsctl.c	Sat Oct 21 01:53:40 2006 -0400
d66 4
a69 4
diff -r 589a0f34320f fs/nfsd/vfs.c
--- a/fs/nfsd/vfs.c	Sat Oct 21 01:53:22 2006 -0400
+++ b/fs/nfsd/vfs.c	Sat Oct 21 01:53:40 2006 -0400
@@@@ -736,10 +736,10 @@@@ nfsd_sync(struct file *filp)
d83 2
a84 2
@@@@ -845,7 +845,7 @@@@ nfsd_vfs_read(struct svc_rqst *rqstp, st
 	int		host_err;
d92 3
a94 3
@@@@ -883,7 +883,7 @@@@ nfsd_vfs_read(struct svc_rqst *rqstp, st
 		nfsdstats.io_read += host_err;
 		*count = host_err;
d99 1
a99 1
 		err = nfserrno(host_err);
d101 1
a101 1
@@@@ -917,11 +917,11 @@@@ nfsd_vfs_write(struct svc_rqst *rqstp, s
d115 1
a115 1
@@@@ -950,7 +950,7 @@@@ nfsd_vfs_write(struct svc_rqst *rqstp, s
d117 1
a117 1
 	if (host_err >= 0) {
@


1.1.2.4
log
@Move patches already in mm into a subdir
@
text
@@


