diff options
| author | David Sterba <dsterba@suse.com> | 2016-05-25 22:51:03 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-05-25 22:51:03 +0200 |
| commit | 42f31734eb7658fd01fb186d56312be869450a42 (patch) | |
| tree | b2fb549b9549bead4d2837c81760cf87fa50ad43 /fs/btrfs/send.c | |
| parent | e73440868fde7cce4a93583a4fa2db9a8938a7ed (diff) | |
| parent | 0132761017e012ab4dc8584d679503f2ba26ca86 (diff) | |
| download | blackbird-obmc-linux-42f31734eb7658fd01fb186d56312be869450a42.tar.gz blackbird-obmc-linux-42f31734eb7658fd01fb186d56312be869450a42.zip | |
Merge branch 'cleanups-4.7' into for-chris-4.7-20160525
Diffstat (limited to 'fs/btrfs/send.c')
| -rw-r--r-- | fs/btrfs/send.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index 6a8c86074aa4..b71dd298385c 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -1831,7 +1831,7 @@ static int will_overwrite_ref(struct send_ctx *sctx, u64 dir, u64 dir_gen, /* * If we have a parent root we need to verify that the parent dir was - * not delted and then re-created, if it was then we have no overwrite + * not deleted and then re-created, if it was then we have no overwrite * and we can just unlink this entry. */ if (sctx->parent_root) { @@ -4192,9 +4192,9 @@ static int __process_new_xattr(int num, struct btrfs_key *di_key, return -ENOMEM; /* - * This hack is needed because empty acl's are stored as zero byte + * This hack is needed because empty acls are stored as zero byte * data in xattrs. Problem with that is, that receiving these zero byte - * acl's will fail later. To fix this, we send a dummy acl list that + * acls will fail later. To fix this, we send a dummy acl list that * only contains the version number and no entries. */ if (!strncmp(name, XATTR_NAME_POSIX_ACL_ACCESS, name_len) || |
