diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-18 14:10:52 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-18 14:10:52 -0400 |
| commit | 1b50259bc33f2adfcb4c5fba4b740bf80789df22 (patch) | |
| tree | f8d20f032c9cb85883cdee846423667543947dde /fs/gfs2/ops_inode.c | |
| parent | 02f211f4d0e67794020ba1babbdaf7c45d56db45 (diff) | |
| download | lwn-1b50259bc33f2adfcb4c5fba4b740bf80789df22.tar.gz lwn-1b50259bc33f2adfcb4c5fba4b740bf80789df22.zip | |
[GFS2] Drop log lock on I/O error & tidy up
This patch drops the log spinlock when an I/O error occurs
to avoid any possible problems in case of blocking or
recursion in the I/O error routine. It also has a few
cosmetic changes to tidy up various other files.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/ops_inode.c')
| -rw-r--r-- | fs/gfs2/ops_inode.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c index 62a12a59d91b..b25ec4c8e56a 100644 --- a/fs/gfs2/ops_inode.c +++ b/fs/gfs2/ops_inode.c @@ -213,8 +213,7 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir, if (error) goto out_gunlock_q; - error = gfs2_trans_begin(sdp, - sdp->sd_max_dirres + + error = gfs2_trans_begin(sdp, sdp->sd_max_dirres + al->al_rgd->rd_ri.ri_length + 2 * RES_DINODE + RES_STATFS + RES_QUOTA, 0); @@ -303,7 +302,7 @@ static int gfs2_unlink(struct inode *dir, struct dentry *dentry) if (error) goto out_gunlock; - error = gfs2_unlinki(dip, &dentry->d_name, ip,ul); + error = gfs2_unlinki(dip, &dentry->d_name, ip, ul); gfs2_trans_end(sdp); |