diff options
| author | Linus Torvalds | 2014-06-04 08:12:50 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2014-06-04 08:12:50 -0700 |
| commit | 74efa045f4e2fdcc9d6384004c5b1bba0cc1fd3c (patch) | |
| tree | dd49456483356bb18200968bcefddc9ce78cae44 /fs/afs | |
| parent | 1b3636093d4e07f5fc8a8eb2f9a5e14a5a2674bf (diff) | |
| parent | 62af4f1f7df44ea0bb1a11c94ac9fb384bf1c564 (diff) | |
Merge tag 'locks-v3.16' of git://git.samba.org/jlayton/linux into next
Pull file locking changes from Jeff Layton:
"Pretty quiet on the file-locking related front this cycle. Just some
small cleanups and the addition of some tracepoints in the lease
handling code"
* tag 'locks-v3.16' of git://git.samba.org/jlayton/linux:
locks: add some tracepoints in the lease handling code
fs/locks.c: replace seq_printf by seq_puts
locks: ensure that fl_owner is always initialized properly in flock and lease codepaths
Diffstat (limited to 'fs/afs')
| -rw-r--r-- | fs/afs/flock.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/afs/flock.c b/fs/afs/flock.c index a8cf2cff836c..4baf1d2b39e4 100644 --- a/fs/afs/flock.c +++ b/fs/afs/flock.c @@ -555,10 +555,6 @@ int afs_flock(struct file *file, int cmd, struct file_lock *fl) return -ENOLCK; /* we're simulating flock() locks using posix locks on the server */ - fl->fl_owner = (fl_owner_t) file; - fl->fl_start = 0; - fl->fl_end = OFFSET_MAX; - if (fl->fl_type == F_UNLCK) return afs_do_unlk(file, fl); return afs_do_setlk(file, fl); |