Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cifs: use posix_unblock_lock instead of locks_delete_block

Browse source 
commit 66189be74 (CIFS: Fix VFS lock usage for oplocked files) exported
the locks_delete_block symbol. There's already an exported helper
function that provides this capability however, so make cifs use that
instead and turn locks_delete_block back into a static function.

Note that if fl->fl_next == NULL then this lock has already been through
locks_delete_block(), so we should be OK to ignore an ENOENT error here
and simply not retry the lock.

Cc: Pavel Shilovsky <piastryyy@gmail.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Acked-by: J. Bruce Fields <bfields@fieldses.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Jeff Layton 2013-06-21 08:58:10 -04:00 committed by Al Viro
parent f891a29f46
commit 1a9e64a711
3 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/cifs/file.c
View file

@ -999,7 +999,7 @@ cifs_posix_lock_set(struct file *file, struct file_lock *flock)
rc = wait_event_interruptible(flock->fl_wait, !flock->fl_next); rc = wait_event_interruptible(flock->fl_wait, !flock->fl_next);
if (!rc) if (!rc)
goto try_again; goto try_again;
locks_delete_block(flock); posix_unblock_lock(flock);
} }
return rc; return rc;
} }

3
fs/locks.c
View file

@ -496,13 +496,12 @@ static void __locks_delete_block(struct file_lock *waiter)
/* /*
*/ */
void locks_delete_block(struct file_lock *waiter) static void locks_delete_block(struct file_lock *waiter)
{ {
lock_flocks(); lock_flocks();
__locks_delete_block(waiter); __locks_delete_block(waiter);
unlock_flocks(); unlock_flocks();
} }
EXPORT_SYMBOL(locks_delete_block);
/* Insert waiter into blocker's block list. /* Insert waiter into blocker's block list.
* We use a circular list so that processes can be easily woken up in * We use a circular list so that processes can be easily woken up in

5
include/linux/fs.h
View file

@ -1006,7 +1006,6 @@ extern int vfs_setlease(struct file *, long, struct file_lock **);
extern int lease_modify(struct file_lock **, int); extern int lease_modify(struct file_lock **, int);
extern int lock_may_read(struct inode *, loff_t start, unsigned long count); extern int lock_may_read(struct inode *, loff_t start, unsigned long count);
extern int lock_may_write(struct inode *, loff_t start, unsigned long count); extern int lock_may_write(struct inode *, loff_t start, unsigned long count);
extern void locks_delete_block(struct file_lock *waiter);
extern void lock_flocks(void); extern void lock_flocks(void);
extern void unlock_flocks(void); extern void unlock_flocks(void);
#else /* !CONFIG_FILE_LOCKING */ #else /* !CONFIG_FILE_LOCKING */
@ -1150,10 +1149,6 @@ static inline int lock_may_write(struct inode *inode, loff_t start,
return 1; return 1;
} }
static inline void locks_delete_block(struct file_lock *waiter)
{
}
static inline void lock_flocks(void) static inline void lock_flocks(void)
{ {
} }