From: Brian Foster <bfoster@redhat.com>
To: xfs@oss.sgi.com
Subject: [PATCH v2 4/8] xfs: export xfs_free_eofblocks() and return EAGAIN on trylock failure
Date: Mon, 10 Sep 2012 14:37:22 -0400 [thread overview]
Message-ID: <1347302246-52710-5-git-send-email-bfoster@redhat.com> (raw)
In-Reply-To: <1347302246-52710-1-git-send-email-bfoster@redhat.com>
Turn xfs_free_eofblocks() into a non-static function, return EAGAIN to
indicate trylock failure and make sure this error is not propagated in
xfs_release().
Signed-off-by: Brian Foster <bfoster@redhat.com>
---
fs/xfs/xfs_vnodeops.c | 6 +++---
fs/xfs/xfs_vnodeops.h | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 12f5087..a61e852 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -150,7 +150,7 @@ xfs_readlink(
* when the link count isn't zero and by xfs_dm_punch_hole() when
* punching a hole to EOF.
*/
-STATIC int
+int
xfs_free_eofblocks(
xfs_mount_t *mp,
xfs_inode_t *ip,
@@ -199,7 +199,7 @@ xfs_free_eofblocks(
if (need_iolock) {
if (!xfs_ilock_nowait(ip, XFS_IOLOCK_EXCL)) {
xfs_trans_cancel(tp, 0);
- return 0;
+ return EAGAIN;
}
}
@@ -462,7 +462,7 @@ xfs_release(
return 0;
error = xfs_free_eofblocks(mp, ip, true);
- if (error)
+ if (error && error != EAGAIN)
return error;
/* delalloc blocks after truncation means it really is dirty */
diff --git a/fs/xfs/xfs_vnodeops.h b/fs/xfs/xfs_vnodeops.h
index f4e7ec8..97424d4 100644
--- a/fs/xfs/xfs_vnodeops.h
+++ b/fs/xfs/xfs_vnodeops.h
@@ -78,5 +78,6 @@ int xfs_flush_pages(struct xfs_inode *ip, xfs_off_t first,
int xfs_wait_on_pages(struct xfs_inode *ip, xfs_off_t first, xfs_off_t last);
int xfs_zero_eof(struct xfs_inode *, xfs_off_t, xfs_fsize_t);
+int xfs_free_eofblocks(struct xfs_mount *, struct xfs_inode *, bool);
#endif /* _XFS_VNODEOPS_H */
--
1.7.7.6
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2012-09-10 18:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-10 18:37 [PATCH v2 0/8] speculative preallocation inode tracking Brian Foster
2012-09-10 18:37 ` [PATCH v2 1/8] xfs: add EOFBLOCKS inode tagging/untagging Brian Foster
2012-09-10 18:37 ` [PATCH v2 2/8] xfs: support a tag-based inode_ag_iterator Brian Foster
2012-09-10 18:37 ` [PATCH v2 3/8] xfs: create helper to check whether to free eofblocks on inode Brian Foster
2012-09-11 5:27 ` Dave Chinner
2012-09-10 18:37 ` Brian Foster [this message]
2012-09-10 18:37 ` [PATCH v2 5/8] xfs: create function to scan and clear EOFBLOCKS inodes Brian Foster
2012-09-10 18:37 ` [PATCH v2 6/8] xfs: add XFS_IOC_FREE_EOFBLOCKS ioctl Brian Foster
2012-09-10 18:37 ` [PATCH v2 7/8] xfs: add enhanced filtering to EOFBLOCKS scan Brian Foster
2012-09-10 18:37 ` [PATCH v2 8/8] xfs: add background scanning to clear EOFBLOCKS inodes Brian Foster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347302246-52710-5-git-send-email-bfoster@redhat.com \
--to=bfoster@redhat.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox