iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging/lustre/libcfs: remove flock wrappers

Browse Source 
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peng Tao 2013-11-21 22:28:27 +08:00 committed by Greg Kroah-Hartman
parent 79783924db
commit d47b680e7b
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h
View File

@ -52,13 +52,4 @@
#include <linux/backing-dev.h>
#include <linux/posix_acl_xattr.h>
#define flock_type(fl) ((fl)->fl_type)
#define flock_set_type(fl, type) do { (fl)->fl_type = (type); } while (0)
#define flock_pid(fl) ((fl)->fl_pid)
#define flock_set_pid(fl, pid) do { (fl)->fl_pid = (pid); } while (0)
#define flock_start(fl) ((fl)->fl_start)
#define flock_set_start(fl, st) do { (fl)->fl_start = (st); } while (0)
#define flock_end(fl) ((fl)->fl_end)
#define flock_set_end(fl, end) do { (fl)->fl_end = (end); } while (0)
#endif

17
drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
View File

@ -665,23 +665,20 @@ granted:
/* fcntl(F_GETLK) request */
/* The old mode was saved in getlk->fl_type so that if the mode
* in the lock changes we can decref the appropriate refcount.*/
ldlm_flock_destroy(lock, flock_type(getlk),
LDLM_FL_WAIT_NOREPROC);
ldlm_flock_destroy(lock, getlk->fl_type, LDLM_FL_WAIT_NOREPROC);
switch (lock->l_granted_mode) {
case LCK_PR:
flock_set_type(getlk, F_RDLCK);
getlk->fl_type = F_RDLCK;
break;
case LCK_PW:
flock_set_type(getlk, F_WRLCK);
getlk->fl_type = F_WRLCK;
break;
default:
flock_set_type(getlk, F_UNLCK);
getlk->fl_type = F_UNLCK;
}
flock_set_pid(getlk, (pid_t)lock->l_policy_data.l_flock.pid);
flock_set_start(getlk,
(loff_t)lock->l_policy_data.l_flock.start);
flock_set_end(getlk,
(loff_t)lock->l_policy_data.l_flock.end);
getlk->fl_pid = (pid_t)lock->l_policy_data.l_flock.pid;
getlk->fl_start = (loff_t)lock->l_policy_data.l_flock.start;
getlk->fl_end = (loff_t)lock->l_policy_data.l_flock.end;
} else {
__u64 noreproc = LDLM_FL_WAIT_NOREPROC;