Message ID | 1363003679-3580-1-git-send-email-luis.henriques@canonical.com |
---|---|
State | New |
Headers | show |
On Mon, Mar 11, 2013 at 06:07:59AM -0600, Luis Henriques wrote: > This is a note to let you know that I have just added a patch titled > > Btrfs: cleanup orphan reservation if truncate fails > > to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree > which can be found at: > > http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue > > If you, or anyone else, feels it should not be added to this tree, please > reply to this email. > > For more information about the 3.5.y.z tree, see > https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable > This isn't needed for 3.5, only 3.8. Josef
On Mon, Mar 11, 2013 at 09:47:57AM -0400, Josef Bacik wrote: > On Mon, Mar 11, 2013 at 06:07:59AM -0600, Luis Henriques wrote: > > This is a note to let you know that I have just added a patch titled > > > > Btrfs: cleanup orphan reservation if truncate fails > > > > to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree > > which can be found at: > > > > http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue > > > > If you, or anyone else, feels it should not be added to this tree, please > > reply to this email. > > > > For more information about the 3.5.y.z tree, see > > https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable > > > > This isn't needed for 3.5, only 3.8. I'll drop this patch from the queue then. Thanks for the feedback. Cheers, -- Luis
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index fadf1c3..07230f7 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -2444,6 +2444,8 @@ int btrfs_orphan_cleanup(struct btrfs_root *root) } nr_truncate++; ret = btrfs_truncate(inode); + if (ret) + btrfs_orphan_del(NULL, inode); } else { nr_unlink++; }