projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6
[powerpc.git]
/
fs
/
lockd
/
svcsubs.c
diff --git
a/fs/lockd/svcsubs.c
b/fs/lockd/svcsubs.c
index
e83024e
..
84ebba3
100644
(file)
--- 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)
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",
msg, inode->i_sb->s_id, inode->i_ino);
dprintk("lockd: %s %s/%ld\n",
msg, inode->i_sb->s_id, inode->i_ino);
@@
-182,7
+182,7
@@
again:
lock.fl_type = F_UNLCK;
lock.fl_start = 0;
lock.fl_end = OFFSET_MAX;
lock.fl_type = F_UNLCK;
lock.fl_start = 0;
lock.fl_end = OFFSET_MAX;
- if (
posix_lock_file(file->f_file, &lock
) < 0) {
+ if (
vfs_lock_file(file->f_file, F_SETLK, &lock, NULL
) < 0) {
printk("lockd: unlock failure in %s:%d\n",
__FILE__, __LINE__);
return 1;
printk("lockd: unlock failure in %s:%d\n",
__FILE__, __LINE__);
return 1;