mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
9a60ee117bbeaf2fb9a02ea80a6bdbc2811ca4d2
linux/fs
History
Linus Torvalds 625bba662c Merge tag 'locks-v3.15-2' of git://git.samba.org/jlayton/linux 
Pull file locking fixes from Jeff Layton:
 "File locking related bugfixes for v3.15 (pile #2)

   - fix for a long-standing bug in __break_lease that can cause soft
     lockups
   - renaming of file-private locks to "open file description" locks,
     and the command macros to more visually distinct names

  The fix for __break_lease is also in the pile of patches for which
  Bruce sent a pull request, but I assume that your merge procedure will
  handle that correctly.

  For the other patches, I don't like the fact that we need to rename
  this stuff at this late stage, but it should be settled now
  (hopefully)"

* tag 'locks-v3.15-2' of git://git.samba.org/jlayton/linux:
  locks: rename FL_FILE_PVT and IS_FILE_PVT to use "*_OFDLCK" instead
  locks: rename file-private locks to "open file description locks"
  locks: allow __break_lease to sleep even when break_time is 0
2014-04-25 12:40:32 -07:00
..
9p
mm: implement ->map_pages for page cache
2014-04-07 16:35:53 -07:00
adfs
fs/adfs/super.c: add __init to init_inodecache()
2014-04-07 16:36:08 -07:00
affs
affs: add mount option to avoid filename truncates
2014-04-07 16:36:08 -07:00
afs
mm + fs: store shadow entries in page cache
2014-04-03 16:21:01 -07:00
autofs4
autofs4: check dev ioctl size before allocating
2014-04-08 16:48:51 -07:00
befs
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2014-04-04 15:39:39 -07:00
bfs
fs/bfs/inode.c: add __init to init_inodecache()
2014-04-07 16:36:08 -07:00
btrfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
cachefiles
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
ceph
Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2014-04-20 20:43:47 -07:00
cifs
cif: fix dead code
2014-04-16 23:08:57 -05:00
coda
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2014-04-04 15:39:39 -07:00
configfs
configfs: fix race between dentry put and lookup
2013-11-21 16:42:27 -08:00
cramfs
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2014-04-04 15:39:39 -07:00
debugfs
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2014-04-04 15:39:39 -07:00
devpts
fs: push sync_filesystem() down to the file system's remount_fs()
2014-03-13 10:14:33 -04:00
dlm
net: Fix use after free by removing length arg from sk_data_ready callbacks.
2014-04-11 16:15:36 -04:00
ecryptfs
Merge branch 'cross-rename' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs
2014-04-04 14:03:05 -07:00
efivarfs
efivarfs: 'efivarfs_file_write' function reorganization
2014-03-04 16:16:16 +00:00
efs
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2014-04-04 15:39:39 -07:00
exofs
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
2014-04-10 14:33:02 -07:00
exportfs
exportfs: fix quadratic behavior in filehandle lookup
2013-11-09 00:16:38 -05:00
ext2
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
2014-04-07 17:59:17 -07:00
ext3
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
2014-04-07 17:59:17 -07:00
ext4
Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2014-04-20 20:43:47 -07:00
f2fs
Merge branch 'akpm' (incoming from Andrew)
2014-04-07 16:38:06 -07:00
fat
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2014-04-04 15:39:39 -07:00
freevxfs
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2014-04-04 15:39:39 -07:00
fscache
FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree
2014-02-17 13:47:35 -08:00
fuse
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
gfs2
mm: implement ->map_pages for page cache
2014-04-07 16:35:53 -07:00
hfs
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2014-04-04 15:39:39 -07:00
hfsplus
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2014-04-04 15:39:39 -07:00
hostfs
mm + fs: store shadow entries in page cache
2014-04-03 16:21:01 -07:00
hpfs
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2014-04-04 15:39:39 -07:00
hppfs
…
hugetlbfs
mm, hugetlb: unify region structure handling
2014-04-03 16:20:59 -07:00
isofs
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
2014-04-07 17:59:17 -07:00
jbd
jbd: Revise KERN_EMERG error messages
2013-12-04 12:27:46 +01:00
jbd2
jbd2: improve error messages for inconsistent journal heads
2014-03-12 16:38:03 -04:00
jffs2
Merge tag 'for-linus-20140405' of git://git.infradead.org/linux-mtd
2014-04-07 10:17:30 -07:00
jfs
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2014-04-04 15:39:39 -07:00
kernfs
kernfs: protect lazy kernfs_iattrs allocation with mutex
2014-04-16 11:54:40 -07:00
lockd
lockd: ensure we tear down any live sockets when socket creation fails during lockd_up
2014-03-28 10:43:08 -04:00
logfs
mm + fs: store shadow entries in page cache
2014-04-03 16:21:01 -07:00
minix
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2014-04-04 15:39:39 -07:00
ncpfs
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-04-12 17:31:22 -07:00
nfs
mm: implement ->map_pages for page cache
2014-04-07 16:35:53 -07:00
nfs_common
…
nfsd
Revert "nfsd4: fix nfs4err_resource in 4.1 case"
2014-04-18 14:46:45 +02:00
nilfs2
mm: implement ->map_pages for page cache
2014-04-07 16:35:53 -07:00
nls
nls: have register_nls() set ->owner
2014-01-25 03:14:05 -05:00
notify
fanotify: move unrelated handling from copy_event_to_user()
2014-04-03 16:20:51 -07:00
ntfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
ocfs2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-04-12 17:31:22 -07:00
omfs
mm + fs: store shadow entries in page cache
2014-04-03 16:21:01 -07:00
openpromfs
fs: push sync_filesystem() down to the file system's remount_fs()
2014-03-13 10:14:33 -04:00
proc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
pstore
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2014-04-04 15:39:39 -07:00
qnx4
fs: push sync_filesystem() down to the file system's remount_fs()
2014-03-13 10:14:33 -04:00
qnx6
fs: push sync_filesystem() down to the file system's remount_fs()
2014-03-13 10:14:33 -04:00
quota
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
2014-04-07 17:59:17 -07:00
ramfs
fs/ramfs: move ramfs_aops to inode.c
2014-01-23 16:36:58 -08:00
reiserfs
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
2014-04-07 17:59:17 -07:00
romfs
fs: push sync_filesystem() down to the file system's remount_fs()
2014-03-13 10:14:33 -04:00
squashfs
fs: push sync_filesystem() down to the file system's remount_fs()
2014-03-13 10:14:33 -04:00
sysfs
sysfs, driver-core: remove unused {sysfs|device}_schedule_callback_owner()
2014-04-16 11:56:33 -07:00
sysv
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2014-04-04 15:39:39 -07:00
ubifs
mm: implement ->map_pages for page cache
2014-04-07 16:35:53 -07:00
udf
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
ufs
fs/ufs: remove unused ufs_super_block_third pointer
2014-04-07 16:36:16 -07:00
xfs
Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2014-04-20 20:43:47 -07:00
aio.c
aio: v4 ensure access to ctx->ring_pages is correctly serialised for migration
2014-03-28 10:14:45 -04:00
anon_inodes.c
vfs: Allocate anon_inode_inode in anon_inode_init()
2014-03-27 09:52:54 -07:00
attr.c
fs: fix iversion handling
2013-12-05 16:36:21 -06:00
bad_inode.c
…
binfmt_aout.c
dump_skip(): dump_seek() replacement taking coredump_params
2013-11-09 00:16:26 -05:00
binfmt_elf_fdpic.c
elf{,_fdpic} coredump: get rid of pointless if (siginfo->si_signo)
2013-11-09 00:16:30 -05:00
binfmt_elf.c
exec: kill the unnecessary mm->def_flags setting in load_elf_binary()
2014-04-07 16:35:52 -07:00
binfmt_em86.c
file->f_op is never NULL...
2013-10-24 23:34:54 -04:00
binfmt_flat.c
…
binfmt_misc.c
binfmt_misc: add missing 'break' statement
2014-04-03 16:21:16 -07:00
binfmt_script.c
…
binfmt_som.c
…
bio-integrity.c
block: Ensure we only enable integrity metadata for reads and writes
2014-04-09 08:00:06 -06:00
bio.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
block_dev.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
buffer.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
char_dev.c
Merge branch 'for-3.13/core' of git://git.kernel.dk/linux-block
2013-11-14 12:08:14 +09:00
compat_binfmt_elf.c
binfmt_elf: add ELF_HWCAP2 to compat auxv entries
2014-03-04 08:05:21 +00:00
compat_ioctl.c
fs/compat: convert to COMPAT_SYSCALL_DEFINE with changing parameter types
2014-03-06 16:30:44 +01:00
compat.c
locks: rename file-private locks to "open file description locks"
2014-04-22 08:23:58 -04:00
coredump.c
coredump: fix va_list corruption
2014-04-19 13:23:31 -07:00
dcache.c
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-04-08 09:52:16 -07:00
dcookies.c
fs/compat: fix lookup_dcookie() parameter handling
2014-01-29 16:22:40 -08:00
direct-io.c
Merge tag 'xfs-for-linus-3.15-rc1' of git://oss.sgi.com/xfs/xfs
2014-04-04 15:50:08 -07:00
drop_caches.c
drop_caches: add some documentation and info message
2014-04-03 16:21:04 -07:00
eventfd.c
eventfd_ctx_fdget(): use fdget() instead of fget()
2014-01-25 03:13:04 -05:00
eventpoll.c
epoll: do not take the nested ep->mtx on EPOLL_CTL_DEL
2014-01-02 14:40:30 -08:00
exec.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
fcntl.c
locks: rename file-private locks to "open file description locks"
2014-04-22 08:23:58 -04:00
fhandle.c
…
file_table.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
file.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
filesystems.c
sys_sysfs: Add CONFIG_SYSFS_SYSCALL
2014-04-03 16:21:05 -07:00
fs_struct.c
seqcount: Add lockdep functionality to seqcount/seqlock structures
2013-11-06 12:40:26 +01:00
fs-writeback.c
Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw
2014-04-04 14:49:16 -07:00
inode.c
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2014-04-04 15:39:39 -07:00
internal.h
get rid of s_files and files_lock
2013-11-09 00:16:20 -05:00
ioctl.c
file->f_op is never NULL...
2013-10-24 23:34:54 -04:00
ioprio.c
…
Kconfig
kernfs: add CONFIG_KERNFS
2014-02-07 16:08:57 -08:00
Kconfig.binfmt
…
libfs.c
consolidate simple ->d_delete() instances
2013-11-15 22:04:17 -05:00
locks.c
locks: rename FL_FILE_PVT and IS_FILE_PVT to use "*_OFDLCK" instead
2014-04-23 16:17:03 -04:00
Makefile
kernfs: add CONFIG_KERNFS
2014-02-07 16:08:57 -08:00
mbcache.c
ext4: each filesystem creates and uses its own mb_cache
2014-03-18 19:24:49 -04:00
mount.h
reduce m_start() cost...
2014-04-01 23:19:09 -04:00
mpage.c
block: Abstract out bvec iterator
2013-11-23 22:33:47 -08:00
namei.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
namespace.c
VFS: Make delayed_free() call free_vfsmnt()
2014-04-01 23:19:18 -04:00
no-block.c
…
open.c
Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2014-04-20 20:43:47 -07:00
pipe.c
switch pipe_read() to copy_page_to_iter()
2014-04-01 23:19:22 -04:00
pnode.c
smarter propagate_mnt()
2014-04-01 23:19:08 -04:00
pnode.h
smarter propagate_mnt()
2014-04-01 23:19:08 -04:00
posix_acl.c
Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw
2014-04-04 14:49:16 -07:00
proc_namespace.c
reduce m_start() cost...
2014-04-01 23:19:09 -04:00
read_write.c
Merge branch 'compat' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2014-03-31 14:32:17 -07:00
readdir.c
file->f_op is never NULL...
2013-10-24 23:34:54 -04:00
select.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-11-13 15:34:18 +09:00
seq_file.c
seq_file: always clear m->count when we free m->buf
2013-11-18 19:07:53 -08:00
signalfd.c
…
splice.c
switch vmsplice_to_user() to copy_page_to_iter()
2014-04-01 23:19:23 -04:00
stack.c
…
stat.c
vfs: split out vfs_getattr_nosec
2013-11-09 00:16:31 -05:00
statfs.c
vfs: allow O_PATH file descriptors for fstatfs()
2013-10-12 13:12:31 -07:00
super.c
fs: Don't return 0 from get_anon_bdev
2014-04-16 11:53:08 -07:00
sync.c
Revert "writeback: do not sync data dirtied after sync start"
2014-02-22 02:02:28 +01:00
timerfd.c
timerfd: support CLOCK_BOOTTIME clock
2014-01-23 16:57:40 -08:00
utimes.c
locks: break delegations on any attribute modification
2013-11-09 00:16:44 -05:00
xattr.c
…