diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-05 15:29:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-05 15:29:25 -0400 |
| commit | 884b8267d5f13bdcdc7e675ecbd0dbb0257689bb (patch) | |
| tree | 637c734a7466e43d3786968891e746c5b70d6a4b /fs/btrfs/file.c | |
| parent | d14f5b810b49c7dbd1a01be1c6d3641d46090080 (diff) | |
| parent | c9ddec74aa950a220cc4caa5215cfc5d886050b7 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: don't warn in btrfs_add_orphan
Btrfs: fix free space cache when there are pinned extents and clusters V2
Btrfs: Fix uninitialized root flags for subvolumes
btrfs: clear __GFP_FS flag in the space cache inode
Btrfs: fix memory leak in start_transaction()
Btrfs: fix memory leak in btrfs_ioctl_start_sync()
Btrfs: fix subvol_sem leak in btrfs_rename()
Btrfs: Fix oops for defrag with compression turned on
Btrfs: fix /proc/mounts info.
Btrfs: fix compiler warning in file.c
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 656bc0a892b1..e621ea54a3fd 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c | |||
| @@ -906,7 +906,7 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file, | |||
| 906 | unsigned long last_index; | 906 | unsigned long last_index; |
| 907 | size_t num_written = 0; | 907 | size_t num_written = 0; |
| 908 | int nrptrs; | 908 | int nrptrs; |
| 909 | int ret; | 909 | int ret = 0; |
| 910 | 910 | ||
| 911 | nrptrs = min((iov_iter_count(i) + PAGE_CACHE_SIZE - 1) / | 911 | nrptrs = min((iov_iter_count(i) + PAGE_CACHE_SIZE - 1) / |
| 912 | PAGE_CACHE_SIZE, PAGE_CACHE_SIZE / | 912 | PAGE_CACHE_SIZE, PAGE_CACHE_SIZE / |