diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-09-10 16:02:37 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-09-10 16:02:37 +1000 |
| commit | ba8cbd6c4d368f35109f51354f6dd6691f218f91 (patch) | |
| tree | 503ab778a11d3cc1c227ad0bac59bda300fb8fbf /fs | |
| parent | 7219676c59522e07bb54b0969813446d8bec56af (diff) | |
| parent | 00703e0b79906969f3ac27ab9fab646afc671fb4 (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
block/blk-core.c
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/tree-log.c | 3 | ||||
| -rw-r--r-- | fs/stack.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 7e0e6e3029dd..b3427fe7a2c7 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -3989,7 +3989,8 @@ again: if (ret < 0) { err = ret; goto out_unlock; - } if (ret) { + } + if (ret) { ins_nr = 0; btrfs_release_path(path); continue; diff --git a/fs/stack.c b/fs/stack.c index 5b5388250e29..a54e33ed10f1 100644 --- a/fs/stack.c +++ b/fs/stack.c @@ -44,7 +44,7 @@ void fsstack_copy_inode_size(struct inode *dst, struct inode *src) * include/linux/fs.h). We don't necessarily hold i_mutex when this * is called, so take i_lock for that case. * - * And if CONFIG_LBADF (on 32-bit), continue our effort to keep the + * And if CONFIG_LBDAF (on 32-bit), continue our effort to keep the * two halves of i_blocks in sync despite SMP or PREEMPT: use i_lock * for that case too, and do both at once by combining the tests. * |