Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 225a719f authored by Josef Sipek's avatar Josef Sipek Committed by Linus Torvalds
Browse files

[PATCH] struct path: convert lockd 



Signed-off-by: default avatarJosef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a7a005fd

fs/lockd/clntlock.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -126,7 +126,7 @@ __be32 nlmclnt_grant(const struct sockaddr_in *addr, const struct nlm_lock *lock 
			continue;

			continue;

		if (!nlm_cmp_addr(&block->b_host->h_addr, addr))

		if (!nlm_cmp_addr(&block->b_host->h_addr, addr))

			continue;

			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;

			continue;

		/* Alright, we found a lock. Set the return status

		/* Alright, we found a lock. Set the return status

		 * and wake up the caller

		 * and wake up the caller

fs/lockd/clntproc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -129,7 +129,7 @@ static void nlmclnt_setlockargs(struct nlm_rqst *req, struct file_lock *fl) 




	nlmclnt_next_cookie(&argp->cookie);

	nlmclnt_next_cookie(&argp->cookie);

	argp->state   = nsm_local_state;

	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->caller  = utsname()->nodename;

	lock->oh.data = req->a_owner;

	lock->oh.data = req->a_owner;

	lock->oh.len  = snprintf(req->a_owner, sizeof(req->a_owner), "%u@%s",

	lock->oh.len  = snprintf(req->a_owner, sizeof(req->a_owner), "%u@%s",

fs/lockd/svclock.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -343,8 +343,8 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, 
	__be32			ret;

	__be32			ret;





	dprintk("lockd: nlmsvc_lock(%s/%ld, ty=%d, pi=%d, %Ld-%Ld, bl=%d)\n",

	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_path.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_ino,

				lock->fl.fl_type, lock->fl.fl_pid,

				lock->fl.fl_type, lock->fl.fl_pid,

				(long long)lock->fl.fl_start,

				(long long)lock->fl.fl_start,

				(long long)lock->fl.fl_end,

				(long long)lock->fl.fl_end,
@@ -420,8 +420,8 @@ nlmsvc_testlock(struct nlm_file *file, struct nlm_lock *lock, 
				       struct nlm_lock *conflock)

				       struct nlm_lock *conflock)

{

{

	dprintk("lockd: nlmsvc_testlock(%s/%ld, ty=%d, %Ld-%Ld)\n",

	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_path.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_ino,

				lock->fl.fl_type,

				lock->fl.fl_type,

				(long long)lock->fl.fl_start,

				(long long)lock->fl.fl_start,

				(long long)lock->fl.fl_end);

				(long long)lock->fl.fl_end);
@@ -454,8 +454,8 @@ nlmsvc_unlock(struct nlm_file *file, struct nlm_lock *lock) 
	int	error;

	int	error;





	dprintk("lockd: nlmsvc_unlock(%s/%ld, pi=%d, %Ld-%Ld)\n",

	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_path.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_ino,

				lock->fl.fl_pid,

				lock->fl.fl_pid,

				(long long)lock->fl.fl_start,

				(long long)lock->fl.fl_start,

				(long long)lock->fl.fl_end);

				(long long)lock->fl.fl_end);
@@ -483,8 +483,8 @@ nlmsvc_cancel_blocked(struct nlm_file *file, struct nlm_lock *lock) 
	int status = 0;

	int status = 0;





	dprintk("lockd: nlmsvc_cancel(%s/%ld, pi=%d, %Ld-%Ld)\n",

	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_path.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_ino,

				lock->fl.fl_pid,

				lock->fl.fl_pid,

				(long long)lock->fl.fl_start,

				(long long)lock->fl.fl_start,

				(long long)lock->fl.fl_end);

				(long long)lock->fl.fl_end);

fs/lockd/svcsubs.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ static inline void nlm_debug_print_fh(char *msg, struct nfs_fh *f) 




static inline void nlm_debug_print_file(char *msg, struct nlm_file *file)

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",

	dprintk("lockd: %s %s/%ld\n",

		msg, inode->i_sb->s_id, inode->i_ino);

		msg, inode->i_sb->s_id, inode->i_ino);

include/linux/lockd/lockd.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -206,7 +206,7 @@ void nlmsvc_invalidate_all(void); 
static __inline__ struct inode *

static __inline__ struct inode *

nlmsvc_file_inode(struct nlm_file *file)

nlmsvc_file_inode(struct nlm_file *file)

{

{

	return file->f_file->f_dentry->d_inode;

	return file->f_file->f_path.dentry->d_inode;

}

}





/*

/*