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


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

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

1.1.2.2
date	2007.01.05.08.33.49;	author jsipek;	state dead;
branches;
next	;


desc
@@


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


1.1.2.1
log
@Got few more patches into -mm
@
text
@a0 105
lockd: change uses of f_{dentry,vfsmnt} to use f_path

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 lockd code.

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

diff -r ed8030e0f7d4 fs/lockd/clntlock.c
--- a/fs/lockd/clntlock.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/fs/lockd/clntlock.c	Mon Oct 23 23:26:41 2006 -0400
@@@@ -126,7 +126,7 @@@@ __be32 nlmclnt_grant(const struct sockad
 			continue;
 		if (!nlm_cmp_addr(&block->b_host->h_addr, addr))
 			continue;
-		if (nfs_compare_fh(NFS_FH(fl_blocked->fl_file->f_dentry->d_inode) ,fh) != 0)
+		if (nfs_compare_fh(NFS_FH(fl_blocked->fl_file->f_path.dentry->d_inode) ,fh) != 0)
 			continue;
 		/* Alright, we found a lock. Set the return status
 		 * and wake up the caller
diff -r ed8030e0f7d4 fs/lockd/clntproc.c
--- a/fs/lockd/clntproc.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/fs/lockd/clntproc.c	Mon Oct 23 23:26:41 2006 -0400
@@@@ -128,7 +128,7 @@@@ static void nlmclnt_setlockargs(struct n
 
 	nlmclnt_next_cookie(&argp->cookie);
 	argp->state   = nsm_local_state;
-	memcpy(&lock->fh, NFS_FH(fl->fl_file->f_dentry->d_inode), sizeof(struct nfs_fh));
+	memcpy(&lock->fh, NFS_FH(fl->fl_file->f_path.dentry->d_inode), sizeof(struct nfs_fh));
 	lock->caller  = utsname()->nodename;
 	lock->oh.data = req->a_owner;
 	lock->oh.len  = snprintf(req->a_owner, sizeof(req->a_owner), "%u@@%s",
diff -r ed8030e0f7d4 fs/lockd/svclock.c
--- a/fs/lockd/svclock.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/fs/lockd/svclock.c	Mon Oct 23 23:26:41 2006 -0400
@@@@ -343,8 +343,8 @@@@ nlmsvc_lock(struct svc_rqst *rqstp, stru
 	__be32			ret;
 
 	dprintk("lockd: nlmsvc_lock(%s/%ld, ty=%d, pi=%d, %Ld-%Ld, bl=%d)\n",
-				file->f_file->f_dentry->d_inode->i_sb->s_id,
-				file->f_file->f_dentry->d_inode->i_ino,
+				file->f_file->f_path.dentry->d_inode->i_sb->s_id,
+				file->f_file->f_path.dentry->d_inode->i_ino,
 				lock->fl.fl_type, lock->fl.fl_pid,
 				(long long)lock->fl.fl_start,
 				(long long)lock->fl.fl_end,
@@@@ -420,8 +420,8 @@@@ nlmsvc_testlock(struct nlm_file *file, s
 				       struct nlm_lock *conflock)
 {
 	dprintk("lockd: nlmsvc_testlock(%s/%ld, ty=%d, %Ld-%Ld)\n",
-				file->f_file->f_dentry->d_inode->i_sb->s_id,
-				file->f_file->f_dentry->d_inode->i_ino,
+				file->f_file->f_path.dentry->d_inode->i_sb->s_id,
+				file->f_file->f_path.dentry->d_inode->i_ino,
 				lock->fl.fl_type,
 				(long long)lock->fl.fl_start,
 				(long long)lock->fl.fl_end);
@@@@ -454,8 +454,8 @@@@ nlmsvc_unlock(struct nlm_file *file, str
 	int	error;
 
 	dprintk("lockd: nlmsvc_unlock(%s/%ld, pi=%d, %Ld-%Ld)\n",
-				file->f_file->f_dentry->d_inode->i_sb->s_id,
-				file->f_file->f_dentry->d_inode->i_ino,
+				file->f_file->f_path.dentry->d_inode->i_sb->s_id,
+				file->f_file->f_path.dentry->d_inode->i_ino,
 				lock->fl.fl_pid,
 				(long long)lock->fl.fl_start,
 				(long long)lock->fl.fl_end);
@@@@ -483,8 +483,8 @@@@ nlmsvc_cancel_blocked(struct nlm_file *f
 	int status = 0;
 
 	dprintk("lockd: nlmsvc_cancel(%s/%ld, pi=%d, %Ld-%Ld)\n",
-				file->f_file->f_dentry->d_inode->i_sb->s_id,
-				file->f_file->f_dentry->d_inode->i_ino,
+				file->f_file->f_path.dentry->d_inode->i_sb->s_id,
+				file->f_file->f_path.dentry->d_inode->i_ino,
 				lock->fl.fl_pid,
 				(long long)lock->fl.fl_start,
 				(long long)lock->fl.fl_end);
diff -r ed8030e0f7d4 fs/lockd/svcsubs.c
--- a/fs/lockd/svcsubs.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/fs/lockd/svcsubs.c	Mon Oct 23 23:26:42 2006 -0400
@@@@ -43,7 +43,7 @@@@ static inline void nlm_debug_print_fh(ch
 
 static inline void nlm_debug_print_file(char *msg, struct nlm_file *file)
 {
-	struct inode *inode = file->f_file->f_dentry->d_inode;
+	struct inode *inode = file->f_file->f_path.dentry->d_inode;
 
 	dprintk("lockd: %s %s/%ld\n",
 		msg, inode->i_sb->s_id, inode->i_ino);
diff -r ed8030e0f7d4 include/linux/lockd/lockd.h
--- a/include/linux/lockd/lockd.h	Mon Oct 23 15:11:02 2006 -0400
+++ b/include/linux/lockd/lockd.h	Mon Oct 23 23:27:11 2006 -0400
@@@@ -208,7 +208,7 @@@@ static __inline__ struct inode *
 static __inline__ struct inode *
 nlmsvc_file_inode(struct nlm_file *file)
 {
-	return file->f_file->f_dentry->d_inode;
+	return file->f_file->f_path.dentry->d_inode;
 }
 
 /*

@


1.1.2.2
log
@Removed many patches already in vanilla
@
text
@@


