diff options
| author | Chris Mason <clm@fb.com> | 2016-05-17 17:24:44 -0400 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-05-17 17:24:44 -0400 |
| commit | a88336d13c66fc171f336c6332fcb67339894e08 (patch) | |
| tree | 595935ba3afc91dce9be83ca65932f3cf1379436 /fs/btrfs/inode.c | |
| parent | 02da2d72174c61988eb4456b53f405e3ebdebce4 (diff) | |
| parent | 680834ca0ad4e9827048d4bda1e38db69c3dd1e4 (diff) | |
Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.7
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 2aaba58b4856..167fc3d49450 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
| @@ -10184,7 +10184,7 @@ static const struct file_operations btrfs_dir_file_operations = { | |||
| 10184 | .iterate = btrfs_real_readdir, | 10184 | .iterate = btrfs_real_readdir, |
| 10185 | .unlocked_ioctl = btrfs_ioctl, | 10185 | .unlocked_ioctl = btrfs_ioctl, |
| 10186 | #ifdef CONFIG_COMPAT | 10186 | #ifdef CONFIG_COMPAT |
| 10187 | .compat_ioctl = btrfs_ioctl, | 10187 | .compat_ioctl = btrfs_compat_ioctl, |
| 10188 | #endif | 10188 | #endif |
| 10189 | .release = btrfs_release_file, | 10189 | .release = btrfs_release_file, |
| 10190 | .fsync = btrfs_sync_file, | 10190 | .fsync = btrfs_sync_file, |