You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds ef4a48c513 File locking related changes for v3.18 (pile #1) ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJUNZK4AAoJEAAOaEEZVoIVI08P/iM7eaIVRnqaqtWw/JBzxiba EMDlJYUBSlv6lYk9s8RJT4bMmcmGAKSYzVAHSoPahzNcqTDdFLeDTLGxJ8uKBbjf d1qRRdH1yZHGUzCvJq3mEendjfXn435Y3YburUxjLfmzrzW7EbMvndiQsS5dhAm9 PEZ+wrKF/zFL7LuXa1YznYrbqOD/GRsJAXGEWc3kNwfS9avephVG/RI3GtpI2PJj RY1mf8P7+WOlrShYoEuUo5aqs01MnU70LbqGHzY8/QKH+Cb0SOkCHZPZyClpiA+G MMJ+o2XWcif3BZYz+dobwz/FpNZ0Bar102xvm2E8fqByr/T20JFjzooTKsQ+PtCk DetQptrU2gtyZDKtInJUQSDPrs4cvA13TW+OEB1tT8rKBnmyEbY3/TxBpBTB9E6j eb/V3iuWnywR3iE+yyvx24Qe7Pov6deM31s46+Vj+GQDuWmAUJXemhfzPtZiYpMT exMXTyDS3j+W+kKqHblfU5f+Bh1eYGpG2m43wJVMLXKV7NwDf8nVV+Wea962ga+w BAM3ia4JRVgRWJBPsnre3lvGT5kKPyfTZsoG+kOfRxiorus2OABoK+SIZBZ+c65V Xh8VH5p3qyCUBOynXlHJWFqYWe2wH0LfbPrwe9dQwTwON51WF082EMG5zxTG0Ymf J2z9Shz68zu0ok8cuSlo =Hhee -----END PGP SIGNATURE----- Merge tag 'locks-v3.18-1' of git://git.samba.org/jlayton/linux Pull file locking related changes from Jeff Layton: "This release is a little more busy for file locking changes than the last: - a set of patches from Kinglong Mee to fix the lockowner handling in knfsd - a pile of cleanups to the internal file lease API. This should get us a bit closer to allowing for setlease methods that can block. There are some dependencies between mine and Bruce's trees this cycle, and I based my tree on top of the requisite patches in Bruce's tree" * tag 'locks-v3.18-1' of git://git.samba.org/jlayton/linux: (26 commits) locks: fix fcntl_setlease/getlease return when !CONFIG_FILE_LOCKING locks: flock_make_lock should return a struct file_lock (or PTR_ERR) locks: set fl_owner for leases to filp instead of current->files locks: give lm_break a return value locks: __break_lease cleanup in preparation of allowing direct removal of leases locks: remove i_have_this_lease check from __break_lease locks: move freeing of leases outside of i_lock locks: move i_lock acquisition into generic_*_lease handlers locks: define a lm_setup handler for leases locks: plumb a "priv" pointer into the setlease routines nfsd: don't keep a pointer to the lease in nfs4_file locks: clean up vfs_setlease kerneldoc comments locks: generic_delete_lease doesn't need a file_lock at all nfsd: fix potential lease memory leak in nfs4_setlease locks: close potential race in lease_get_mtime security: make security_file_set_fowner, f_setown and __f_setown void return locks: consolidate "nolease" routines locks: remove lock_may_read and lock_may_write lockd: rip out deferred lock handling from testlock codepath NFSD: Get reference of lockowner when coping file_lock ...		10 years ago
..
Makefile	lockd: add a /proc/fs/lockd/nlm_end_grace file	10 years ago
clnt4xdr.c	nfsd: remove <linux/nfsd/nfsfh.h>	11 years ago
clntlock.c	LOCKD: Don't call utsname()->nodename from nlmclnt_setlockargs	12 years ago
clntproc.c	LOCKD: Don't call utsname()->nodename from nlmclnt_setlockargs	12 years ago
clntxdr.c	nfsd: remove <linux/nfsd/nfsfh.h>	11 years ago
host.c	…
mon.c	lockd: Try to reconnect if statd has moved	10 years ago
netns.h	lockd: move lockd's grace period handling into its own module	10 years ago
procfs.c	lockd: add a /proc/fs/lockd/nlm_end_grace file	10 years ago
procfs.h	lockd: add a /proc/fs/lockd/nlm_end_grace file	10 years ago
svc.c	Merge branch 'for-3.18' of git://linux-nfs.org/~bfields/linux	10 years ago
svc4proc.c	…
svclock.c	lockd: rip out deferred lock handling from testlock codepath	10 years ago
svcproc.c	…
svcshare.c	…
svcsubs.c	nfsd: move <linux/nfsd/export.h> to fs/nfsd	11 years ago
xdr.c	nfsd: remove <linux/nfsd/nfsfh.h>	11 years ago
xdr4.c	…