diff options
| author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 05:37:18 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:47 -0500 |
| commit | 225a719f79fbc4d0cd9d9ebc5b2e3ac0e95845aa (patch) | |
| tree | 6ac303324b2832cd92a4ec9539162ac65f8d452d /fs/lockd/svclock.c | |
| parent | a7a005fd12b84392becca311f2a20d5bf2a1b7af (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>
Diffstat (limited to 'fs/lockd/svclock.c')
| -rw-r--r-- | fs/lockd/svclock.c | 16 |
1 files changed, 8 insertions, 8 deletions
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); |