aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosef Sipek <jsipek@fsl.cs.sunysb.edu>2006-12-08 05:37:18 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:47 -0500
commit225a719f79fbc4d0cd9d9ebc5b2e3ac0e95845aa (patch)
tree6ac303324b2832cd92a4ec9539162ac65f8d452d
parenta7a005fd12b84392becca311f2a20d5bf2a1b7af (diff)
[PATCH] struct path: convert lockd
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--fs/lockd/clntlock.c2
-rw-r--r--fs/lockd/clntproc.c2
-rw-r--r--fs/lockd/svclock.c16
-rw-r--r--fs/lockd/svcsubs.c2
-rw-r--r--include/linux/lockd/lockd.h2
5 files changed, 12 insertions, 12 deletions
diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c
index b85a0ad2cfb6..92681c9e9b20 100644
--- a/fs/lockd/clntlock.c
+++ b/fs/lockd/clntlock.c
@@ -126,7 +126,7 @@ __be32 nlmclnt_grant(const struct sockaddr_in *addr, const struct nlm_lock *lock
126 continue; 126 continue;
127 if (!nlm_cmp_addr(&block->b_host->h_addr, addr)) 127 if (!nlm_cmp_addr(&block->b_host->h_addr, addr))
128 continue; 128 continue;
129 if (nfs_compare_fh(NFS_FH(fl_blocked->fl_file->f_dentry->d_inode) ,fh) != 0) 129 if (nfs_compare_fh(NFS_FH(fl_blocked->fl_file->f_path.dentry->d_inode) ,fh) != 0)
130 continue; 130 continue;
131 /* Alright, we found a lock. Set the return status 131 /* Alright, we found a lock. Set the return status
132 * and wake up the caller 132 * and wake up the caller
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index 497c3cd59d52..80a1a6dccc8f 100644
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
@@ -129,7 +129,7 @@ static void nlmclnt_setlockargs(struct nlm_rqst *req, struct file_lock *fl)
129 129
130 nlmclnt_next_cookie(&argp->cookie); 130 nlmclnt_next_cookie(&argp->cookie);
131 argp->state = nsm_local_state; 131 argp->state = nsm_local_state;
132 memcpy(&lock->fh, NFS_FH(fl->fl_file->f_dentry->d_inode), sizeof(struct nfs_fh)); 132 memcpy(&lock->fh, NFS_FH(fl->fl_file->f_path.dentry->d_inode), sizeof(struct nfs_fh));
133 lock->caller = utsname()->nodename; 133 lock->caller = utsname()->nodename;
134 lock->oh.data = req->a_owner; 134 lock->oh.data = req->a_owner;
135 lock->oh.len = snprintf(req->a_owner, sizeof(req->a_owner), "%u@%s", 135 lock->oh.len = snprintf(req->a_owner, sizeof(req->a_owner), "%u@%s",
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index 7e219b938552..5c054b20fd5e 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -343,8 +343,8 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
343 __be32 ret; 343 __be32 ret;
344 344
345 dprintk("lockd: nlmsvc_lock(%s/%ld, ty=%d, pi=%d, %Ld-%Ld, bl=%d)\n", 345 dprintk("lockd: nlmsvc_lock(%s/%ld, ty=%d, pi=%d, %Ld-%Ld, bl=%d)\n",
346 file->f_file->f_dentry->d_inode->i_sb->s_id, 346 file->f_file->f_path.dentry->d_inode->i_sb->s_id,
347 file->f_file->f_dentry->d_inode->i_ino, 347 file->f_file->f_path.dentry->d_inode->i_ino,
348 lock->fl.fl_type, lock->fl.fl_pid, 348 lock->fl.fl_type, lock->fl.fl_pid,
349 (long long)lock->fl.fl_start, 349 (long long)lock->fl.fl_start,
350 (long long)lock->fl.fl_end, 350 (long long)lock->fl.fl_end,
@@ -420,8 +420,8 @@ nlmsvc_testlock(struct nlm_file *file, struct nlm_lock *lock,
420 struct nlm_lock *conflock) 420 struct nlm_lock *conflock)
421{ 421{
422 dprintk("lockd: nlmsvc_testlock(%s/%ld, ty=%d, %Ld-%Ld)\n", 422 dprintk("lockd: nlmsvc_testlock(%s/%ld, ty=%d, %Ld-%Ld)\n",
423 file->f_file->f_dentry->d_inode->i_sb->s_id, 423 file->f_file->f_path.dentry->d_inode->i_sb->s_id,
424 file->f_file->f_dentry->d_inode->i_ino, 424 file->f_file->f_path.dentry->d_inode->i_ino,
425 lock->fl.fl_type, 425 lock->fl.fl_type,
426 (long long)lock->fl.fl_start, 426 (long long)lock->fl.fl_start,
427 (long long)lock->fl.fl_end); 427 (long long)lock->fl.fl_end);
@@ -454,8 +454,8 @@ nlmsvc_unlock(struct nlm_file *file, struct nlm_lock *lock)
454 int error; 454 int error;
455 455
456 dprintk("lockd: nlmsvc_unlock(%s/%ld, pi=%d, %Ld-%Ld)\n", 456 dprintk("lockd: nlmsvc_unlock(%s/%ld, pi=%d, %Ld-%Ld)\n",
457 file->f_file->f_dentry->d_inode->i_sb->s_id, 457 file->f_file->f_path.dentry->d_inode->i_sb->s_id,
458 file->f_file->f_dentry->d_inode->i_ino, 458 file->f_file->f_path.dentry->d_inode->i_ino,
459 lock->fl.fl_pid, 459 lock->fl.fl_pid,
460 (long long)lock->fl.fl_start, 460 (long long)lock->fl.fl_start,
461 (long long)lock->fl.fl_end); 461 (long long)lock->fl.fl_end);
@@ -483,8 +483,8 @@ nlmsvc_cancel_blocked(struct nlm_file *file, struct nlm_lock *lock)
483 int status = 0; 483 int status = 0;
484 484
485 dprintk("lockd: nlmsvc_cancel(%s/%ld, pi=%d, %Ld-%Ld)\n", 485 dprintk("lockd: nlmsvc_cancel(%s/%ld, pi=%d, %Ld-%Ld)\n",
486 file->f_file->f_dentry->d_inode->i_sb->s_id, 486 file->f_file->f_path.dentry->d_inode->i_sb->s_id,
487 file->f_file->f_dentry->d_inode->i_ino, 487 file->f_file->f_path.dentry->d_inode->i_ino,
488 lock->fl.fl_pid, 488 lock->fl.fl_pid,
489 (long long)lock->fl.fl_start, 489 (long long)lock->fl.fl_start,
490 (long long)lock->fl.fl_end); 490 (long long)lock->fl.fl_end);
diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
index e83024e16042..c0df00c74ce3 100644
--- a/fs/lockd/svcsubs.c
+++ b/fs/lockd/svcsubs.c
@@ -43,7 +43,7 @@ static inline void nlm_debug_print_fh(char *msg, struct nfs_fh *f)
43 43
44static inline void nlm_debug_print_file(char *msg, struct nlm_file *file) 44static inline void nlm_debug_print_file(char *msg, struct nlm_file *file)
45{ 45{
46 struct inode *inode = file->f_file->f_dentry->d_inode; 46 struct inode *inode = file->f_file->f_path.dentry->d_inode;
47 47
48 dprintk("lockd: %s %s/%ld\n", 48 dprintk("lockd: %s %s/%ld\n",
49 msg, inode->i_sb->s_id, inode->i_ino); 49 msg, inode->i_sb->s_id, inode->i_ino);
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index 8c39654549d8..0c962b82a9de 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -206,7 +206,7 @@ void nlmsvc_invalidate_all(void);
206static __inline__ struct inode * 206static __inline__ struct inode *
207nlmsvc_file_inode(struct nlm_file *file) 207nlmsvc_file_inode(struct nlm_file *file)
208{ 208{
209 return file->f_file->f_dentry->d_inode; 209 return file->f_file->f_path.dentry->d_inode;
210} 210}
211 211
212/* 212/*