diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-23 13:39:37 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-23 13:39:37 -0700 |
commit | b22734a55067adbc10216e459762dbd7dcef29d5 (patch) | |
tree | b672082875eea08035930888ffda3177599c0c43 /fs/nfsd/nfs4proc.c | |
parent | 78bbf153fa96e5e40234b7b05567602535645460 (diff) | |
parent | 325c50e3cebb9208009083e841550f98a863bfa0 (diff) | |
download | talos-obmc-linux-b22734a55067adbc10216e459762dbd7dcef29d5.tar.gz talos-obmc-linux-b22734a55067adbc10216e459762dbd7dcef29d5.zip |
Merge branch 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"Josef fixed a problem when quotas are enabled with his latest ENOSPC
rework, and Jeff added more checks into the subvol ioctls to avoid
tripping up lookup_one_len"
* 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
btrfs: ensure that file descriptor used with subvol ioctls is a dir
Btrfs: handle quota reserve failure properly
Diffstat (limited to 'fs/nfsd/nfs4proc.c')
0 files changed, 0 insertions, 0 deletions