Skip to content

L
linux
Commit 651857a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (31 commits)
  ocfs2: implement i_op->permission
  configfs: make configfs_dirent_exists() static
  ocfs2: update file system paths to set atime
  ocfs2: core atime update functions
  ocfs2: Add splice support
  ocfs2: Remove ocfs2_write_should_remove_suid()
  [PATCH] Export should_remove_suid()
  configfs: mutex_lock_nested() fix
  ocfs2: Remove struct ocfs2_journal_handle in favor of handle_t
  ocfs2: remove handle argument to ocfs2_start_trans()
  ocfs2: remove ocfs2_journal_handle journal field
  ocfs2: pass ocfs2_super * into ocfs2_commit_trans()
  ocfs2: remove unused handle argument from ocfs2_meta_lock_full()
  ocfs2: make ocfs2_alloc_handle() static
  ocfs2: remove unused ocfs2_handle_add_lock()
  ocfs2: remove unused ocfs2_handle_add_inode()
  ocfs2: Don't allocate handle early in ocfs2_rename()
  ocfs2: don't use handle for locking in allocation functions
  ocfs2: don't pass handle to ocfs2_meta_lock in ocfs2_rename()
  ocfs2: don't pass handle to ocfs2_meta_lock in ocfs2_symlink()
  ...
parents ee28b0da d38eb8db
Hide whitespace changes
Inline Side-by-side
Showing with 760 additions and 898 deletions
fs/configfs/dir.c
View file @ 651857a1
...@@ -93,8 +93,8 @@ static struct configfs_dirent *configfs_new_dirent(struct configfs_dirent * pare ...@@ -93,8 +93,8 @@ static struct configfs_dirent *configfs_new_dirent(struct configfs_dirent * pare
* *
* called with parent inode's i_mutex held * called with parent inode's i_mutex held
*/ */
int configfs_dirent_exists(struct configfs_dirent *parent_sd, static int configfs_dirent_exists(struct configfs_dirent *parent_sd,
const unsigned char *new) const unsigned char *new)
{ {
struct configfs_dirent * sd; struct configfs_dirent * sd;
...@@ -1176,8 +1176,9 @@ void configfs_unregister_subsystem(struct configfs_subsystem *subsys) ...@@ -1176,8 +1176,9 @@ void configfs_unregister_subsystem(struct configfs_subsystem *subsys)
return; return;
} }
mutex_lock(&configfs_sb->s_root->d_inode->i_mutex); mutex_lock_nested(&configfs_sb->s_root->d_inode->i_mutex,
mutex_lock(&dentry->d_inode->i_mutex); I_MUTEX_PARENT);
mutex_lock_nested(&dentry->d_inode->i_mutex, I_MUTEX_CHILD);
if (configfs_detach_prep(dentry)) { if (configfs_detach_prep(dentry)) {
printk(KERN_ERR "configfs: Tried to unregister non-empty subsystem!\n"); printk(KERN_ERR "configfs: Tried to unregister non-empty subsystem!\n");
} }
......
fs/ocfs2/alloc.c
View file @ 651857a1
...@@ -52,14 +52,14 @@ static int ocfs2_extent_contig(struct inode *inode, ...@@ -52,14 +52,14 @@ static int ocfs2_extent_contig(struct inode *inode,
u64 blkno); u64 blkno);
static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb, static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode *inode, struct inode *inode,
int wanted, int wanted,
struct ocfs2_alloc_context *meta_ac, struct ocfs2_alloc_context *meta_ac,
struct buffer_head *bhs[]); struct buffer_head *bhs[]);
static int ocfs2_add_branch(struct ocfs2_super *osb, static int ocfs2_add_branch(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode *inode, struct inode *inode,
struct buffer_head *fe_bh, struct buffer_head *fe_bh,
struct buffer_head *eb_bh, struct buffer_head *eb_bh,
...@@ -67,14 +67,14 @@ static int ocfs2_add_branch(struct ocfs2_super *osb, ...@@ -67,14 +67,14 @@ static int ocfs2_add_branch(struct ocfs2_super *osb,
struct ocfs2_alloc_context *meta_ac); struct ocfs2_alloc_context *meta_ac);
static int ocfs2_shift_tree_depth(struct ocfs2_super *osb, static int ocfs2_shift_tree_depth(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode *inode, struct inode *inode,
struct buffer_head *fe_bh, struct buffer_head *fe_bh,
struct ocfs2_alloc_context *meta_ac, struct ocfs2_alloc_context *meta_ac,
struct buffer_head **ret_new_eb_bh); struct buffer_head **ret_new_eb_bh);
static int ocfs2_do_insert_extent(struct ocfs2_super *osb, static int ocfs2_do_insert_extent(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode *inode, struct inode *inode,
struct buffer_head *fe_bh, struct buffer_head *fe_bh,
u64 blkno, u64 blkno,
...@@ -152,7 +152,7 @@ int ocfs2_num_free_extents(struct ocfs2_super *osb, ...@@ -152,7 +152,7 @@ int ocfs2_num_free_extents(struct ocfs2_super *osb,
* l_count for you * l_count for you
*/ */
static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb, static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode *inode, struct inode *inode,
int wanted, int wanted,
struct ocfs2_alloc_context *meta_ac, struct ocfs2_alloc_context *meta_ac,
...@@ -253,7 +253,7 @@ static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb, ...@@ -253,7 +253,7 @@ static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb,
* contain a single record with e_clusters == 0. * contain a single record with e_clusters == 0.
*/ */
static int ocfs2_add_branch(struct ocfs2_super *osb, static int ocfs2_add_branch(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode *inode, struct inode *inode,
struct buffer_head *fe_bh, struct buffer_head *fe_bh,
struct buffer_head *eb_bh, struct buffer_head *eb_bh,
...@@ -418,7 +418,7 @@ static int ocfs2_add_branch(struct ocfs2_super *osb, ...@@ -418,7 +418,7 @@ static int ocfs2_add_branch(struct ocfs2_super *osb,
* after this call. * after this call.
*/ */
static int ocfs2_shift_tree_depth(struct ocfs2_super *osb, static int ocfs2_shift_tree_depth(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode *inode, struct inode *inode,
struct buffer_head *fe_bh, struct buffer_head *fe_bh,
struct ocfs2_alloc_context *meta_ac, struct ocfs2_alloc_context *meta_ac,
...@@ -520,7 +520,7 @@ static int ocfs2_shift_tree_depth(struct ocfs2_super *osb, ...@@ -520,7 +520,7 @@ static int ocfs2_shift_tree_depth(struct ocfs2_super *osb,
* down. * down.
*/ */
static int ocfs2_do_insert_extent(struct ocfs2_super *osb, static int ocfs2_do_insert_extent(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode *inode, struct inode *inode,
struct buffer_head *fe_bh, struct buffer_head *fe_bh,
u64 start_blk, u64 start_blk,
...@@ -809,7 +809,7 @@ static int ocfs2_find_branch_target(struct ocfs2_super *osb, ...@@ -809,7 +809,7 @@ static int ocfs2_find_branch_target(struct ocfs2_super *osb,
/* the caller needs to update fe->i_clusters */ /* the caller needs to update fe->i_clusters */
int ocfs2_insert_extent(struct ocfs2_super *osb, int ocfs2_insert_extent(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode *inode, struct inode *inode,
struct buffer_head *fe_bh, struct buffer_head *fe_bh,
u64 start_blk, u64 start_blk,
...@@ -951,7 +951,7 @@ static int ocfs2_truncate_log_can_coalesce(struct ocfs2_truncate_log *tl, ...@@ -951,7 +951,7 @@ static int ocfs2_truncate_log_can_coalesce(struct ocfs2_truncate_log *tl,
} }
static int ocfs2_truncate_log_append(struct ocfs2_super *osb, static int ocfs2_truncate_log_append(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
u64 start_blk, u64 start_blk,
unsigned int num_clusters) unsigned int num_clusters)
{ {
...@@ -1034,7 +1034,7 @@ static int ocfs2_truncate_log_append(struct ocfs2_super *osb, ...@@ -1034,7 +1034,7 @@ static int ocfs2_truncate_log_append(struct ocfs2_super *osb,
} }
static int ocfs2_replay_truncate_records(struct ocfs2_super *osb, static int ocfs2_replay_truncate_records(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode *data_alloc_inode, struct inode *data_alloc_inode,
struct buffer_head *data_alloc_bh) struct buffer_head *data_alloc_bh)
{ {
...@@ -1113,7 +1113,7 @@ static int __ocfs2_flush_truncate_log(struct ocfs2_super *osb) ...@@ -1113,7 +1113,7 @@ static int __ocfs2_flush_truncate_log(struct ocfs2_super *osb)
{ {
int status; int status;
unsigned int num_to_flush; unsigned int num_to_flush;
struct ocfs2_journal_handle *handle = NULL; handle_t *handle;
struct inode *tl_inode = osb->osb_tl_inode; struct inode *tl_inode = osb->osb_tl_inode;
struct inode *data_alloc_inode = NULL; struct inode *data_alloc_inode = NULL;
struct buffer_head *tl_bh = osb->osb_tl_bh; struct buffer_head *tl_bh = osb->osb_tl_bh;
...@@ -1130,7 +1130,7 @@ static int __ocfs2_flush_truncate_log(struct ocfs2_super *osb) ...@@ -1130,7 +1130,7 @@ static int __ocfs2_flush_truncate_log(struct ocfs2_super *osb)
if (!OCFS2_IS_VALID_DINODE(di)) { if (!OCFS2_IS_VALID_DINODE(di)) {
OCFS2_RO_ON_INVALID_DINODE(osb->sb, di); OCFS2_RO_ON_INVALID_DINODE(osb->sb, di);
status = -EIO; status = -EIO;
goto bail; goto out;
} }
num_to_flush = le16_to_cpu(tl->tl_used); num_to_flush = le16_to_cpu(tl->tl_used);
...@@ -1138,14 +1138,7 @@ static int __ocfs2_flush_truncate_log(struct ocfs2_super *osb) ...@@ -1138,14 +1138,7 @@ static int __ocfs2_flush_truncate_log(struct ocfs2_super *osb)
num_to_flush, (unsigned long long)OCFS2_I(tl_inode)->ip_blkno); num_to_flush, (unsigned long long)OCFS2_I(tl_inode)->ip_blkno);
if (!num_to_flush) { if (!num_to_flush) {
status = 0; status = 0;
goto bail; goto out;
}
handle = ocfs2_alloc_handle(osb);
if (!handle) {
status = -ENOMEM;
mlog_errno(status);
goto bail;
} }
data_alloc_inode = ocfs2_get_system_file_inode(osb, data_alloc_inode = ocfs2_get_system_file_inode(osb,
...@@ -1154,41 +1147,40 @@ static int __ocfs2_flush_truncate_log(struct ocfs2_super *osb) ...@@ -1154,41 +1147,40 @@ static int __ocfs2_flush_truncate_log(struct ocfs2_super *osb)
if (!data_alloc_inode) { if (!data_alloc_inode) {
status = -EINVAL; status = -EINVAL;
mlog(ML_ERROR, "Could not get bitmap inode!\n"); mlog(ML_ERROR, "Could not get bitmap inode!\n");
goto bail; goto out;
} }
ocfs2_handle_add_inode(handle, data_alloc_inode); mutex_lock(&data_alloc_inode->i_mutex);
status = ocfs2_meta_lock(data_alloc_inode, handle, &data_alloc_bh, 1);
status = ocfs2_meta_lock(data_alloc_inode, &data_alloc_bh, 1);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
goto bail; goto out_mutex;
} }
handle = ocfs2_start_trans(osb, handle, OCFS2_TRUNCATE_LOG_UPDATE); handle = ocfs2_start_trans(osb, OCFS2_TRUNCATE_LOG_UPDATE);
if (IS_ERR(handle)) { if (IS_ERR(handle)) {
status = PTR_ERR(handle); status = PTR_ERR(handle);
handle = NULL;
mlog_errno(status); mlog_errno(status);
goto bail; goto out_unlock;
} }
status = ocfs2_replay_truncate_records(osb, handle, data_alloc_inode, status = ocfs2_replay_truncate_records(osb, handle, data_alloc_inode,
data_alloc_bh); data_alloc_bh);
if (status < 0) { if (status < 0)
mlog_errno(status); mlog_errno(status);
goto bail;
}
bail: ocfs2_commit_trans(osb, handle);
if (handle)
ocfs2_commit_trans(handle);
if (data_alloc_inode) out_unlock:
iput(data_alloc_inode); brelse(data_alloc_bh);
ocfs2_meta_unlock(data_alloc_inode, 1);
if (data_alloc_bh) out_mutex:
brelse(data_alloc_bh); mutex_unlock(&data_alloc_inode->i_mutex);
iput(data_alloc_inode);
out:
mlog_exit(status); mlog_exit(status);
return status; return status;
} }
...@@ -1347,7 +1339,7 @@ int ocfs2_complete_truncate_log_recovery(struct ocfs2_super *osb, ...@@ -1347,7 +1339,7 @@ int ocfs2_complete_truncate_log_recovery(struct ocfs2_super *osb,
int i; int i;
unsigned int clusters, num_recs, start_cluster; unsigned int clusters, num_recs, start_cluster;
u64 start_blk; u64 start_blk;
struct ocfs2_journal_handle *handle; handle_t *handle;
struct inode *tl_inode = osb->osb_tl_inode; struct inode *tl_inode = osb->osb_tl_inode;
struct ocfs2_truncate_log *tl; struct ocfs2_truncate_log *tl;
...@@ -1373,8 +1365,7 @@ int ocfs2_complete_truncate_log_recovery(struct ocfs2_super *osb, ...@@ -1373,8 +1365,7 @@ int ocfs2_complete_truncate_log_recovery(struct ocfs2_super *osb,
} }
} }
handle = ocfs2_start_trans(osb, NULL, handle = ocfs2_start_trans(osb, OCFS2_TRUNCATE_LOG_UPDATE);
OCFS2_TRUNCATE_LOG_UPDATE);
if (IS_ERR(handle)) { if (IS_ERR(handle)) {
status = PTR_ERR(handle); status = PTR_ERR(handle);
mlog_errno(status); mlog_errno(status);
...@@ -1387,7 +1378,7 @@ int ocfs2_complete_truncate_log_recovery(struct ocfs2_super *osb, ...@@ -1387,7 +1378,7 @@ int ocfs2_complete_truncate_log_recovery(struct ocfs2_super *osb,
status = ocfs2_truncate_log_append(osb, handle, status = ocfs2_truncate_log_append(osb, handle,
start_blk, clusters); start_blk, clusters);
ocfs2_commit_trans(handle); ocfs2_commit_trans(osb, handle);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
goto bail_up; goto bail_up;
...@@ -1543,7 +1534,7 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb, ...@@ -1543,7 +1534,7 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb,
struct inode *inode, struct inode *inode,
struct buffer_head *fe_bh, struct buffer_head *fe_bh,
struct buffer_head *old_last_eb_bh, struct buffer_head *old_last_eb_bh,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct ocfs2_truncate_context *tc) struct ocfs2_truncate_context *tc)
{ {
int status, i, depth; int status, i, depth;
...@@ -1782,7 +1773,7 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb, ...@@ -1782,7 +1773,7 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb,
struct ocfs2_extent_block *eb; struct ocfs2_extent_block *eb;
struct ocfs2_extent_list *el; struct ocfs2_extent_list *el;
struct buffer_head *last_eb_bh; struct buffer_head *last_eb_bh;
struct ocfs2_journal_handle *handle = NULL; handle_t *handle = NULL;
struct inode *tl_inode = osb->osb_tl_inode; struct inode *tl_inode = osb->osb_tl_inode;
mlog_entry_void(); mlog_entry_void();
...@@ -1868,7 +1859,7 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb, ...@@ -1868,7 +1859,7 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb,
credits = ocfs2_calc_tree_trunc_credits(osb->sb, clusters_to_del, credits = ocfs2_calc_tree_trunc_credits(osb->sb, clusters_to_del,
fe, el); fe, el);
handle = ocfs2_start_trans(osb, NULL, credits); handle = ocfs2_start_trans(osb, credits);
if (IS_ERR(handle)) { if (IS_ERR(handle)) {
status = PTR_ERR(handle); status = PTR_ERR(handle);
handle = NULL; handle = NULL;
...@@ -1891,7 +1882,7 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb, ...@@ -1891,7 +1882,7 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb,
mutex_unlock(&tl_inode->i_mutex); mutex_unlock(&tl_inode->i_mutex);
tl_sem = 0; tl_sem = 0;
ocfs2_commit_trans(handle); ocfs2_commit_trans(osb, handle);
handle = NULL; handle = NULL;
BUG_ON(le32_to_cpu(fe->i_clusters) < target_i_clusters); BUG_ON(le32_to_cpu(fe->i_clusters) < target_i_clusters);
...@@ -1906,7 +1897,7 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb, ...@@ -1906,7 +1897,7 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb,
mutex_unlock(&tl_inode->i_mutex); mutex_unlock(&tl_inode->i_mutex);
if (handle) if (handle)
ocfs2_commit_trans(handle); ocfs2_commit_trans(osb, handle);
if (last_eb_bh) if (last_eb_bh)
brelse(last_eb_bh); brelse(last_eb_bh);
...@@ -2011,10 +2002,7 @@ int ocfs2_prepare_truncate(struct ocfs2_super *osb, ...@@ -2011,10 +2002,7 @@ int ocfs2_prepare_truncate(struct ocfs2_super *osb,
mutex_lock(&ext_alloc_inode->i_mutex); mutex_lock(&ext_alloc_inode->i_mutex);
(*tc)->tc_ext_alloc_inode = ext_alloc_inode; (*tc)->tc_ext_alloc_inode = ext_alloc_inode;
status = ocfs2_meta_lock(ext_alloc_inode, status = ocfs2_meta_lock(ext_alloc_inode, &ext_alloc_bh, 1);
NULL,
&ext_alloc_bh,
1);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
goto bail; goto bail;
......
fs/ocfs2/alloc.h
View file @ 651857a1
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
struct ocfs2_alloc_context; struct ocfs2_alloc_context;
int ocfs2_insert_extent(struct ocfs2_super *osb, int ocfs2_insert_extent(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode *inode, struct inode *inode,
struct buffer_head *fe_bh, struct buffer_head *fe_bh,
u64 blkno, u64 blkno,
......
fs/ocfs2/aops.c
View file @ 651857a1
...@@ -200,7 +200,7 @@ static int ocfs2_readpage(struct file *file, struct page *page) ...@@ -200,7 +200,7 @@ static int ocfs2_readpage(struct file *file, struct page *page)
mlog_entry("(0x%p, %lu)\n", file, (page ? page->index : 0)); mlog_entry("(0x%p, %lu)\n", file, (page ? page->index : 0));
ret = ocfs2_meta_lock_with_page(inode, NULL, NULL, 0, page); ret = ocfs2_meta_lock_with_page(inode, NULL, 0, page);
if (ret != 0) { if (ret != 0) {
if (ret == AOP_TRUNCATED_PAGE) if (ret == AOP_TRUNCATED_PAGE)
unlock = 0; unlock = 0;
...@@ -305,7 +305,7 @@ static int ocfs2_prepare_write(struct file *file, struct page *page, ...@@ -305,7 +305,7 @@ static int ocfs2_prepare_write(struct file *file, struct page *page,
mlog_entry("(0x%p, 0x%p, %u, %u)\n", file, page, from, to); mlog_entry("(0x%p, 0x%p, %u, %u)\n", file, page, from, to);
ret = ocfs2_meta_lock_with_page(inode, NULL, NULL, 0, page); ret = ocfs2_meta_lock_with_page(inode, NULL, 0, page);
if (ret != 0) { if (ret != 0) {
mlog_errno(ret); mlog_errno(ret);
goto out; goto out;
...@@ -355,16 +355,16 @@ static int walk_page_buffers( handle_t *handle, ...@@ -355,16 +355,16 @@ static int walk_page_buffers( handle_t *handle,
return ret; return ret;
} }
struct ocfs2_journal_handle *ocfs2_start_walk_page_trans(struct inode *inode, handle_t *ocfs2_start_walk_page_trans(struct inode *inode,
struct page *page, struct page *page,
unsigned from, unsigned from,
unsigned to) unsigned to)
{ {
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct ocfs2_journal_handle *handle = NULL; handle_t *handle = NULL;
int ret = 0; int ret = 0;
handle = ocfs2_start_trans(osb, NULL, OCFS2_INODE_UPDATE_CREDITS); handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
if (!handle) { if (!handle) {
ret = -ENOMEM; ret = -ENOMEM;
mlog_errno(ret); mlog_errno(ret);
...@@ -372,7 +372,7 @@ struct ocfs2_journal_handle *ocfs2_start_walk_page_trans(struct inode *inode, ...@@ -372,7 +372,7 @@ struct ocfs2_journal_handle *ocfs2_start_walk_page_trans(struct inode *inode,
} }
if (ocfs2_should_order_data(inode)) { if (ocfs2_should_order_data(inode)) {
ret = walk_page_buffers(handle->k_handle, ret = walk_page_buffers(handle,
page_buffers(page), page_buffers(page),
from, to, NULL, from, to, NULL,
ocfs2_journal_dirty_data); ocfs2_journal_dirty_data);
...@@ -382,7 +382,7 @@ struct ocfs2_journal_handle *ocfs2_start_walk_page_trans(struct inode *inode, ...@@ -382,7 +382,7 @@ struct ocfs2_journal_handle *ocfs2_start_walk_page_trans(struct inode *inode,
out: out:
if (ret) { if (ret) {
if (handle) if (handle)
ocfs2_commit_trans(handle); ocfs2_commit_trans(osb, handle);
handle = ERR_PTR(ret); handle = ERR_PTR(ret);
} }
return handle; return handle;
...@@ -394,7 +394,7 @@ static int ocfs2_commit_write(struct file *file, struct page *page, ...@@ -394,7 +394,7 @@ static int ocfs2_commit_write(struct file *file, struct page *page,
int ret; int ret;
struct buffer_head *di_bh = NULL; struct buffer_head *di_bh = NULL;
struct inode *inode = page->mapping->host; struct inode *inode = page->mapping->host;
struct ocfs2_journal_handle *handle = NULL; handle_t *handle = NULL;
struct ocfs2_dinode *di; struct ocfs2_dinode *di;
mlog_entry("(0x%p, 0x%p, %u, %u)\n", file, page, from, to); mlog_entry("(0x%p, 0x%p, %u, %u)\n", file, page, from, to);
...@@ -412,7 +412,7 @@ static int ocfs2_commit_write(struct file *file, struct page *page, ...@@ -412,7 +412,7 @@ static int ocfs2_commit_write(struct file *file, struct page *page,
* stale inode allocation image (i_size, i_clusters, etc). * stale inode allocation image (i_size, i_clusters, etc).
*/ */
ret = ocfs2_meta_lock_with_page(inode, NULL, &di_bh, 1, page); ret = ocfs2_meta_lock_with_page(inode, &di_bh, 1, page);
if (ret != 0) { if (ret != 0) {
mlog_errno(ret); mlog_errno(ret);
goto out; goto out;
...@@ -464,7 +464,7 @@ static int ocfs2_commit_write(struct file *file, struct page *page, ...@@ -464,7 +464,7 @@ static int ocfs2_commit_write(struct file *file, struct page *page,
} }
out_commit: out_commit:
ocfs2_commit_trans(handle); ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);
out_unlock_data: out_unlock_data:
ocfs2_data_unlock(inode, 1); ocfs2_data_unlock(inode, 1);
out_unlock_meta: out_unlock_meta:
...@@ -490,7 +490,7 @@ static sector_t ocfs2_bmap(struct address_space *mapping, sector_t block) ...@@ -490,7 +490,7 @@ static sector_t ocfs2_bmap(struct address_space *mapping, sector_t block)
* accessed concurrently from multiple nodes. * accessed concurrently from multiple nodes.
*/ */
if (!INODE_JOURNAL(inode)) { if (!INODE_JOURNAL(inode)) {
err = ocfs2_meta_lock(inode, NULL, NULL, 0); err = ocfs2_meta_lock(inode, NULL, 0);
if (err) { if (err) {
if (err != -ENOENT) if (err != -ENOENT)
mlog_errno(err); mlog_errno(err);
......
fs/ocfs2/aops.h
View file @ 651857a1
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
int ocfs2_prepare_write_nolock(struct inode *inode, struct page *page, int ocfs2_prepare_write_nolock(struct inode *inode, struct page *page,
unsigned from, unsigned to); unsigned from, unsigned to);
struct ocfs2_journal_handle *ocfs2_start_walk_page_trans(struct inode *inode, handle_t *ocfs2_start_walk_page_trans(struct inode *inode,
struct page *page, struct page *page,
unsigned from, unsigned from,
unsigned to); unsigned to);
......
fs/ocfs2/dir.c
View file @ 651857a1
...@@ -82,6 +82,7 @@ int ocfs2_readdir(struct file * filp, void * dirent, filldir_t filldir) ...@@ -82,6 +82,7 @@ int ocfs2_readdir(struct file * filp, void * dirent, filldir_t filldir)
struct inode *inode = filp->f_dentry->d_inode; struct inode *inode = filp->f_dentry->d_inode;
struct super_block * sb = inode->i_sb; struct super_block * sb = inode->i_sb;
unsigned int ra_sectors = 16; unsigned int ra_sectors = 16;
int lock_level = 0;
mlog_entry("dirino=%llu\n", mlog_entry("dirino=%llu\n",
(unsigned long long)OCFS2_I(inode)->ip_blkno); (unsigned long long)OCFS2_I(inode)->ip_blkno);
...@@ -89,7 +90,15 @@ int ocfs2_readdir(struct file * filp, void * dirent, filldir_t filldir) ...@@ -89,7 +90,15 @@ int ocfs2_readdir(struct file * filp, void * dirent, filldir_t filldir)
stored = 0; stored = 0;
bh = NULL; bh = NULL;
error = ocfs2_meta_lock(inode, NULL, NULL, 0); error = ocfs2_meta_lock_atime(inode, filp->f_vfsmnt, &lock_level);
if (lock_level && error >= 0) {
/* We release EX lock which used to update atime
* and get PR lock again to reduce contention
* on commonly accessed directories. */
ocfs2_meta_unlock(inode, 1);
lock_level = 0;
error = ocfs2_meta_lock(inode, NULL, 0);
}
if (error < 0) { if (error < 0) {
if (error != -ENOENT) if (error != -ENOENT)
mlog_errno(error); mlog_errno(error);
...@@ -198,7 +207,7 @@ int ocfs2_readdir(struct file * filp, void * dirent, filldir_t filldir) ...@@ -198,7 +207,7 @@ int ocfs2_readdir(struct file * filp, void * dirent, filldir_t filldir)
stored = 0; stored = 0;
bail: bail:
ocfs2_meta_unlock(inode, 0); ocfs2_meta_unlock(inode, lock_level);
bail_nolock: bail_nolock:
mlog_exit(stored); mlog_exit(stored);
...@@ -340,7 +349,7 @@ int ocfs2_empty_dir(struct inode *inode) ...@@ -340,7 +349,7 @@ int ocfs2_empty_dir(struct inode *inode)
/* returns a bh of the 1st new block in the allocation. */ /* returns a bh of the 1st new block in the allocation. */
int ocfs2_do_extend_dir(struct super_block *sb, int ocfs2_do_extend_dir(struct super_block *sb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode *dir, struct inode *dir,
struct buffer_head *parent_fe_bh, struct buffer_head *parent_fe_bh,
struct ocfs2_alloc_context *data_ac, struct ocfs2_alloc_context *data_ac,
...@@ -398,7 +407,7 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb, ...@@ -398,7 +407,7 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb,
struct ocfs2_dinode *fe = (struct ocfs2_dinode *) parent_fe_bh->b_data; struct ocfs2_dinode *fe = (struct ocfs2_dinode *) parent_fe_bh->b_data;
struct ocfs2_alloc_context *data_ac = NULL; struct ocfs2_alloc_context *data_ac = NULL;
struct ocfs2_alloc_context *meta_ac = NULL; struct ocfs2_alloc_context *meta_ac = NULL;
struct ocfs2_journal_handle *handle = NULL; handle_t *handle = NULL;
struct buffer_head *new_bh = NULL; struct buffer_head *new_bh = NULL;
struct ocfs2_dir_entry * de; struct ocfs2_dir_entry * de;
struct super_block *sb = osb->sb; struct super_block *sb = osb->sb;
...@@ -409,13 +418,6 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb, ...@@ -409,13 +418,6 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb,
mlog(0, "extending dir %llu (i_size = %lld)\n", mlog(0, "extending dir %llu (i_size = %lld)\n",
(unsigned long long)OCFS2_I(dir)->ip_blkno, dir_i_size); (unsigned long long)OCFS2_I(dir)->ip_blkno, dir_i_size);
handle = ocfs2_alloc_handle(osb);
if (handle == NULL) {
status = -ENOMEM;
mlog_errno(status);
goto bail;
}
/* dir->i_size is always block aligned. */ /* dir->i_size is always block aligned. */
spin_lock(&OCFS2_I(dir)->ip_lock); spin_lock(&OCFS2_I(dir)->ip_lock);
if (dir_i_size == ocfs2_clusters_to_bytes(sb, OCFS2_I(dir)->ip_clusters)) { if (dir_i_size == ocfs2_clusters_to_bytes(sb, OCFS2_I(dir)->ip_clusters)) {
...@@ -428,8 +430,7 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb, ...@@ -428,8 +430,7 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb,
} }
if (!num_free_extents) { if (!num_free_extents) {
status = ocfs2_reserve_new_metadata(osb, handle, status = ocfs2_reserve_new_metadata(osb, fe, &meta_ac);
fe, &meta_ac);
if (status < 0) { if (status < 0) {
if (status != -ENOSPC) if (status != -ENOSPC)
mlog_errno(status); mlog_errno(status);
...@@ -437,7 +438,7 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb, ...@@ -437,7 +438,7 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb,
} }
} }
status = ocfs2_reserve_clusters(osb, handle, 1, &data_ac); status = ocfs2_reserve_clusters(osb, 1, &data_ac);
if (status < 0) { if (status < 0) {
if (status != -ENOSPC) if (status != -ENOSPC)
mlog_errno(status); mlog_errno(status);
...@@ -450,7 +451,7 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb, ...@@ -450,7 +451,7 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb,
credits = OCFS2_SIMPLE_DIR_EXTEND_CREDITS; credits = OCFS2_SIMPLE_DIR_EXTEND_CREDITS;
} }
handle = ocfs2_start_trans(osb, handle, credits); handle = ocfs2_start_trans(osb, credits);
if (IS_ERR(handle)) { if (IS_ERR(handle)) {
status = PTR_ERR(handle); status = PTR_ERR(handle);
handle = NULL; handle = NULL;
...@@ -496,7 +497,7 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb, ...@@ -496,7 +497,7 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb,
get_bh(*new_de_bh); get_bh(*new_de_bh);
bail: bail:
if (handle) if (handle)
ocfs2_commit_trans(handle); ocfs2_commit_trans(osb, handle);
if (data_ac) if (data_ac)
ocfs2_free_alloc_context(data_ac); ocfs2_free_alloc_context(data_ac);
......
fs/ocfs2/dir.h
View file @ 651857a1
...@@ -45,7 +45,7 @@ int ocfs2_prepare_dir_for_insert(struct ocfs2_super *osb, ...@@ -45,7 +45,7 @@ int ocfs2_prepare_dir_for_insert(struct ocfs2_super *osb,
struct buffer_head **ret_de_bh); struct buffer_head **ret_de_bh);
struct ocfs2_alloc_context; struct ocfs2_alloc_context;
int ocfs2_do_extend_dir(struct super_block *sb, int ocfs2_do_extend_dir(struct super_block *sb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode *dir, struct inode *dir,
struct buffer_head *parent_fe_bh, struct buffer_head *parent_fe_bh,
struct ocfs2_alloc_context *data_ac, struct ocfs2_alloc_context *data_ac,
......
fs/ocfs2/dlm/dlmdomain.c
View file @ 651857a1
...@@ -68,7 +68,8 @@ static void **dlm_alloc_pagevec(int pages) ...@@ -68,7 +68,8 @@ static void **dlm_alloc_pagevec(int pages)
goto out_free; goto out_free;
mlog(0, "Allocated DLM hash pagevec; %d pages (%lu expected), %lu buckets per page\n", mlog(0, "Allocated DLM hash pagevec; %d pages (%lu expected), %lu buckets per page\n",
pages, DLM_HASH_PAGES, (unsigned long)DLM_BUCKETS_PER_PAGE); pages, (unsigned long)DLM_HASH_PAGES,
(unsigned long)DLM_BUCKETS_PER_PAGE);
return vec; return vec;
out_free: out_free:
dlm_free_pagevec(vec, i); dlm_free_pagevec(vec, i);
......
fs/ocfs2/dlmglue.c
View file @ 651857a1
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#include "dcache.h" #include "dcache.h"
#include "dlmglue.h" #include "dlmglue.h"
#include "extent_map.h" #include "extent_map.h"
#include "file.h"
#include "heartbeat.h" #include "heartbeat.h"
#include "inode.h" #include "inode.h"
#include "journal.h" #include "journal.h"
...@@ -1063,10 +1064,10 @@ static void ocfs2_cluster_unlock(struct ocfs2_super *osb, ...@@ -1063,10 +1064,10 @@ static void ocfs2_cluster_unlock(struct ocfs2_super *osb,
mlog_exit_void(); mlog_exit_void();
} }
int ocfs2_create_new_lock(struct ocfs2_super *osb, static int ocfs2_create_new_lock(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres, struct ocfs2_lock_res *lockres,
int ex, int ex,
int local) int local)
{ {
int level = ex ? LKM_EXMODE : LKM_PRMODE; int level = ex ? LKM_EXMODE : LKM_PRMODE;
unsigned long flags; unsigned long flags;
...@@ -1579,7 +1580,6 @@ static int ocfs2_assign_bh(struct inode *inode, ...@@ -1579,7 +1580,6 @@ static int ocfs2_assign_bh(struct inode *inode,
* the result of the lock will be communicated via the callback. * the result of the lock will be communicated via the callback.
*/ */
int ocfs2_meta_lock_full(struct inode *inode, int ocfs2_meta_lock_full(struct inode *inode,
struct ocfs2_journal_handle *handle,
struct buffer_head **ret_bh, struct buffer_head **ret_bh,
int ex, int ex,
int arg_flags) int arg_flags)
...@@ -1668,12 +1668,6 @@ int ocfs2_meta_lock_full(struct inode *inode, ...@@ -1668,12 +1668,6 @@ int ocfs2_meta_lock_full(struct inode *inode,
} }
} }
if (handle) {
status = ocfs2_handle_add_lock(handle, inode);
if (status < 0)
mlog_errno(status);
}
bail: bail:
if (status < 0) { if (status < 0) {
if (ret_bh && (*ret_bh)) { if (ret_bh && (*ret_bh)) {
...@@ -1713,18 +1707,16 @@ int ocfs2_meta_lock_full(struct inode *inode, ...@@ -1713,18 +1707,16 @@ int ocfs2_meta_lock_full(struct inode *inode,
* the lock inversion simply. * the lock inversion simply.
*/ */
int ocfs2_meta_lock_with_page(struct inode *inode, int ocfs2_meta_lock_with_page(struct inode *inode,
struct ocfs2_journal_handle *handle,
struct buffer_head **ret_bh, struct buffer_head **ret_bh,
int ex, int ex,
struct page *page) struct page *page)
{ {
int ret; int ret;
ret = ocfs2_meta_lock_full(inode, handle, ret_bh, ex, ret = ocfs2_meta_lock_full(inode, ret_bh, ex, OCFS2_LOCK_NONBLOCK);
OCFS2_LOCK_NONBLOCK);
if (ret == -EAGAIN) { if (ret == -EAGAIN) {
unlock_page(page); unlock_page(page);
if (ocfs2_meta_lock(inode, handle, ret_bh, ex) == 0) if (ocfs2_meta_lock(inode, ret_bh, ex) == 0)
ocfs2_meta_unlock(inode, ex); ocfs2_meta_unlock(inode, ex);
ret = AOP_TRUNCATED_PAGE; ret = AOP_TRUNCATED_PAGE;
} }
...@@ -1732,6 +1724,44 @@ int ocfs2_meta_lock_with_page(struct inode *inode, ...@@ -1732,6 +1724,44 @@ int ocfs2_meta_lock_with_page(struct inode *inode,
return ret; return ret;
} }
int ocfs2_meta_lock_atime(struct inode *inode,
struct vfsmount *vfsmnt,
int *level)
{
int ret;
mlog_entry_void();
ret = ocfs2_meta_lock(inode, NULL, 0);
if (ret < 0) {
mlog_errno(ret);
return ret;
}
/*
* If we should update atime, we will get EX lock,
* otherwise we just get PR lock.
*/
if (ocfs2_should_update_atime(inode, vfsmnt)) {
struct buffer_head *bh = NULL;
ocfs2_meta_unlock(inode, 0);
ret = ocfs2_meta_lock(inode, &bh, 1);
if (ret < 0) {
mlog_errno(ret);
return ret;
}
*level = 1;
if (ocfs2_should_update_atime(inode, vfsmnt))
ocfs2_update_inode_atime(inode, bh);
if (bh)
brelse(bh);
} else
*level = 0;
mlog_exit(ret);
return ret;
}
void ocfs2_meta_unlock(struct inode *inode, void ocfs2_meta_unlock(struct inode *inode,
int ex) int ex)
{ {
......
fs/ocfs2/dlmglue.h
View file @ 651857a1
...@@ -68,8 +68,6 @@ void ocfs2_dentry_lock_res_init(struct ocfs2_dentry_lock *dl, ...@@ -68,8 +68,6 @@ void ocfs2_dentry_lock_res_init(struct ocfs2_dentry_lock *dl,
u64 parent, struct inode *inode); u64 parent, struct inode *inode);
void ocfs2_lock_res_free(struct ocfs2_lock_res *res); void ocfs2_lock_res_free(struct ocfs2_lock_res *res);
int ocfs2_create_new_inode_locks(struct inode *inode); int ocfs2_create_new_inode_locks(struct inode *inode);
int ocfs2_create_new_lock(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres, int ex, int local);
int ocfs2_drop_inode_locks(struct inode *inode); int ocfs2_drop_inode_locks(struct inode *inode);
int ocfs2_data_lock_full(struct inode *inode, int ocfs2_data_lock_full(struct inode *inode,
int write, int write,
...@@ -82,19 +80,20 @@ void ocfs2_data_unlock(struct inode *inode, ...@@ -82,19 +80,20 @@ void ocfs2_data_unlock(struct inode *inode,
int write); int write);
int ocfs2_rw_lock(struct inode *inode, int write); int ocfs2_rw_lock(struct inode *inode, int write);
void ocfs2_rw_unlock(struct inode *inode, int write); void ocfs2_rw_unlock(struct inode *inode, int write);
int ocfs2_meta_lock_atime(struct inode *inode,
struct vfsmount *vfsmnt,
int *level);
int ocfs2_meta_lock_full(struct inode *inode, int ocfs2_meta_lock_full(struct inode *inode,
struct ocfs2_journal_handle *handle,
struct buffer_head **ret_bh, struct buffer_head **ret_bh,
int ex, int ex,
int arg_flags); int arg_flags);
int ocfs2_meta_lock_with_page(struct inode *inode, int ocfs2_meta_lock_with_page(struct inode *inode,
struct ocfs2_journal_handle *handle,
struct buffer_head **ret_bh, struct buffer_head **ret_bh,
int ex, int ex,
struct page *page); struct page *page);
/* 99% of the time we don't want to supply any additional flags -- /* 99% of the time we don't want to supply any additional flags --
* those are for very specific cases only. */ * those are for very specific cases only. */
#define ocfs2_meta_lock(i, h, b, e) ocfs2_meta_lock_full(i, h, b, e, 0) #define ocfs2_meta_lock(i, b, e) ocfs2_meta_lock_full(i, b, e, 0)
void ocfs2_meta_unlock(struct inode *inode, void ocfs2_meta_unlock(struct inode *inode,
int ex); int ex);
int ocfs2_super_lock(struct ocfs2_super *osb, int ocfs2_super_lock(struct ocfs2_super *osb,
......
fs/ocfs2/export.c
View file @ 651857a1
...@@ -100,7 +100,7 @@ static struct dentry *ocfs2_get_parent(struct dentry *child) ...@@ -100,7 +100,7 @@ static struct dentry *ocfs2_get_parent(struct dentry *child)
mlog(0, "find parent of directory %llu\n", mlog(0, "find parent of directory %llu\n",
(unsigned long long)OCFS2_I(dir)->ip_blkno); (unsigned long long)OCFS2_I(dir)->ip_blkno);
status = ocfs2_meta_lock(dir, NULL, NULL, 0); status = ocfs2_meta_lock(dir, NULL, 0);
if (status < 0) { if (status < 0) {
if (status != -ENOENT) if (status != -ENOENT)
mlog_errno(status); mlog_errno(status);
......
fs/ocfs2/file.c
View file @ 651857a1
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/uio.h> #include <linux/uio.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/pipe_fs_i.h>
#include <linux/mount.h>
#define MLOG_MASK_PREFIX ML_INODE #define MLOG_MASK_PREFIX ML_INODE
#include <cluster/masklog.h> #include <cluster/masklog.h>
...@@ -134,7 +136,58 @@ static int ocfs2_sync_file(struct file *file, ...@@ -134,7 +136,58 @@ static int ocfs2_sync_file(struct file *file,
return (err < 0) ? -EIO : 0; return (err < 0) ? -EIO : 0;
} }
int ocfs2_set_inode_size(struct ocfs2_journal_handle *handle, int ocfs2_should_update_atime(struct inode *inode,
struct vfsmount *vfsmnt)
{
struct timespec now;
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb))
return 0;
if ((inode->i_flags & S_NOATIME) ||
((inode->i_sb->s_flags & MS_NODIRATIME) && S_ISDIR(inode->i_mode)))
return 0;
if ((vfsmnt->mnt_flags & MNT_NOATIME) ||
((vfsmnt->mnt_flags & MNT_NODIRATIME) && S_ISDIR(inode->i_mode)))
return 0;
now = CURRENT_TIME;
if ((now.tv_sec - inode->i_atime.tv_sec <= osb->s_atime_quantum))
return 0;
else
return 1;
}
int ocfs2_update_inode_atime(struct inode *inode,
struct buffer_head *bh)
{
int ret;
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
handle_t *handle;
mlog_entry_void();
handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
if (handle == NULL) {
ret = -ENOMEM;
mlog_errno(ret);
goto out;
}
inode->i_atime = CURRENT_TIME;
ret = ocfs2_mark_inode_dirty(handle, inode, bh);
if (ret < 0)
mlog_errno(ret);
ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);
out:
mlog_exit(ret);
return ret;
}
int ocfs2_set_inode_size(handle_t *handle,
struct inode *inode, struct inode *inode,
struct buffer_head *fe_bh, struct buffer_head *fe_bh,
u64 new_i_size) u64 new_i_size)
...@@ -163,10 +216,9 @@ static int ocfs2_simple_size_update(struct inode *inode, ...@@ -163,10 +216,9 @@ static int ocfs2_simple_size_update(struct inode *inode,
{ {
int ret; int ret;
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct ocfs2_journal_handle *handle = NULL; handle_t *handle = NULL;
handle = ocfs2_start_trans(osb, NULL, handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
OCFS2_INODE_UPDATE_CREDITS);
if (handle == NULL) { if (handle == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
mlog_errno(ret); mlog_errno(ret);
...@@ -178,7 +230,7 @@ static int ocfs2_simple_size_update(struct inode *inode, ...@@ -178,7 +230,7 @@ static int ocfs2_simple_size_update(struct inode *inode,
if (ret < 0) if (ret < 0)
mlog_errno(ret); mlog_errno(ret);
ocfs2_commit_trans(handle); ocfs2_commit_trans(osb, handle);
out: out:
return ret; return ret;
} }
...@@ -189,14 +241,14 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb, ...@@ -189,14 +241,14 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb,
u64 new_i_size) u64 new_i_size)
{ {
int status; int status;
struct ocfs2_journal_handle *handle; handle_t *handle;
mlog_entry_void(); mlog_entry_void();
/* TODO: This needs to actually orphan the inode in this /* TODO: This needs to actually orphan the inode in this
* transaction. */ * transaction. */
handle = ocfs2_start_trans(osb, NULL, OCFS2_INODE_UPDATE_CREDITS); handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
if (IS_ERR(handle)) { if (IS_ERR(handle)) {
status = PTR_ERR(handle); status = PTR_ERR(handle);
mlog_errno(status); mlog_errno(status);
...@@ -207,7 +259,7 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb, ...@@ -207,7 +259,7 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb,
if (status < 0) if (status < 0)
mlog_errno(status); mlog_errno(status);
ocfs2_commit_trans(handle); ocfs2_commit_trans(osb, handle);
out: out:
mlog_exit(status); mlog_exit(status);
return status; return status;
...@@ -328,7 +380,7 @@ int ocfs2_do_extend_allocation(struct ocfs2_super *osb, ...@@ -328,7 +380,7 @@ int ocfs2_do_extend_allocation(struct ocfs2_super *osb,
struct inode *inode, struct inode *inode,
u32 clusters_to_add, u32 clusters_to_add,
struct buffer_head *fe_bh, struct buffer_head *fe_bh,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct ocfs2_alloc_context *data_ac, struct ocfs2_alloc_context *data_ac,
struct ocfs2_alloc_context *meta_ac, struct ocfs2_alloc_context *meta_ac,
enum ocfs2_alloc_restarted *reason_ret) enum ocfs2_alloc_restarted *reason_ret)
...@@ -433,7 +485,7 @@ static int ocfs2_extend_allocation(struct inode *inode, ...@@ -433,7 +485,7 @@ static int ocfs2_extend_allocation(struct inode *inode,
u32 prev_clusters; u32 prev_clusters;
struct buffer_head *bh = NULL; struct buffer_head *bh = NULL;
struct ocfs2_dinode *fe = NULL; struct ocfs2_dinode *fe = NULL;
struct ocfs2_journal_handle *handle = NULL; handle_t *handle = NULL;
struct ocfs2_alloc_context *data_ac = NULL; struct ocfs2_alloc_context *data_ac = NULL;
struct ocfs2_alloc_context *meta_ac = NULL; struct ocfs2_alloc_context *meta_ac = NULL;
enum ocfs2_alloc_restarted why; enum ocfs2_alloc_restarted why;
...@@ -463,13 +515,6 @@ static int ocfs2_extend_allocation(struct inode *inode, ...@@ -463,13 +515,6 @@ static int ocfs2_extend_allocation(struct inode *inode,
(unsigned long long)OCFS2_I(inode)->ip_blkno, i_size_read(inode), (unsigned long long)OCFS2_I(inode)->ip_blkno, i_size_read(inode),
fe->i_clusters, clusters_to_add); fe->i_clusters, clusters_to_add);
handle = ocfs2_alloc_handle(osb);
if (handle == NULL) {
status = -ENOMEM;
mlog_errno(status);
goto leave;
}
num_free_extents = ocfs2_num_free_extents(osb, num_free_extents = ocfs2_num_free_extents(osb,
inode, inode,
fe); fe);
...@@ -480,10 +525,7 @@ static int ocfs2_extend_allocation(struct inode *inode, ...@@ -480,10 +525,7 @@ static int ocfs2_extend_allocation(struct inode *inode,
} }
if (!num_free_extents) { if (!num_free_extents) {
status = ocfs2_reserve_new_metadata(osb, status = ocfs2_reserve_new_metadata(osb, fe, &meta_ac);
handle,
fe,
&meta_ac);
if (status < 0) { if (status < 0) {
if (status != -ENOSPC) if (status != -ENOSPC)
mlog_errno(status); mlog_errno(status);
...@@ -491,10 +533,7 @@ static int ocfs2_extend_allocation(struct inode *inode, ...@@ -491,10 +533,7 @@ static int ocfs2_extend_allocation(struct inode *inode,
} }
} }
status = ocfs2_reserve_clusters(osb, status = ocfs2_reserve_clusters(osb, clusters_to_add, &data_ac);
handle,
clusters_to_add,
&data_ac);
if (status < 0) { if (status < 0) {
if (status != -ENOSPC) if (status != -ENOSPC)
mlog_errno(status); mlog_errno(status);
...@@ -509,7 +548,7 @@ static int ocfs2_extend_allocation(struct inode *inode, ...@@ -509,7 +548,7 @@ static int ocfs2_extend_allocation(struct inode *inode,
drop_alloc_sem = 1; drop_alloc_sem = 1;
credits = ocfs2_calc_extend_credits(osb->sb, fe, clusters_to_add); credits = ocfs2_calc_extend_credits(osb->sb, fe, clusters_to_add);
handle = ocfs2_start_trans(osb, handle, credits); handle = ocfs2_start_trans(osb, credits);
if (IS_ERR(handle)) { if (IS_ERR(handle)) {
status = PTR_ERR(handle); status = PTR_ERR(handle);
handle = NULL; handle = NULL;
...@@ -589,7 +628,7 @@ static int ocfs2_extend_allocation(struct inode *inode, ...@@ -589,7 +628,7 @@ static int ocfs2_extend_allocation(struct inode *inode,
drop_alloc_sem = 0; drop_alloc_sem = 0;
} }
if (handle) { if (handle) {
ocfs2_commit_trans(handle); ocfs2_commit_trans(osb, handle);
handle = NULL; handle = NULL;
} }
if (data_ac) { if (data_ac) {
...@@ -624,7 +663,7 @@ static int ocfs2_write_zero_page(struct inode *inode, ...@@ -624,7 +663,7 @@ static int ocfs2_write_zero_page(struct inode *inode,
struct page *page; struct page *page;
unsigned long index; unsigned long index;
unsigned int offset; unsigned int offset;
struct ocfs2_journal_handle *handle = NULL; handle_t *handle = NULL;
int ret; int ret;
offset = (size & (PAGE_CACHE_SIZE-1)); /* Within page */ offset = (size & (PAGE_CACHE_SIZE-1)); /* Within page */
...@@ -668,7 +707,7 @@ static int ocfs2_write_zero_page(struct inode *inode, ...@@ -668,7 +707,7 @@ static int ocfs2_write_zero_page(struct inode *inode,
ret = 0; ret = 0;
if (handle) if (handle)
ocfs2_commit_trans(handle); ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);
out_unlock: out_unlock:
unlock_page(page); unlock_page(page);
page_cache_release(page); page_cache_release(page);
...@@ -789,7 +828,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) ...@@ -789,7 +828,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
struct super_block *sb = inode->i_sb; struct super_block *sb = inode->i_sb;
struct ocfs2_super *osb = OCFS2_SB(sb); struct ocfs2_super *osb = OCFS2_SB(sb);
struct buffer_head *bh = NULL; struct buffer_head *bh = NULL;
struct ocfs2_journal_handle *handle = NULL; handle_t *handle = NULL;
mlog_entry("(0x%p, '%.*s')\n", dentry, mlog_entry("(0x%p, '%.*s')\n", dentry,
dentry->d_name.len, dentry->d_name.name); dentry->d_name.len, dentry->d_name.name);
...@@ -825,7 +864,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) ...@@ -825,7 +864,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
} }
} }
status = ocfs2_meta_lock(inode, NULL, &bh, 1); status = ocfs2_meta_lock(inode, &bh, 1);
if (status < 0) { if (status < 0) {
if (status != -ENOENT) if (status != -ENOENT)
mlog_errno(status); mlog_errno(status);
...@@ -845,7 +884,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) ...@@ -845,7 +884,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
} }
} }
handle = ocfs2_start_trans(osb, NULL, OCFS2_INODE_UPDATE_CREDITS); handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
if (IS_ERR(handle)) { if (IS_ERR(handle)) {
status = PTR_ERR(handle); status = PTR_ERR(handle);
mlog_errno(status); mlog_errno(status);
...@@ -863,7 +902,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) ...@@ -863,7 +902,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
mlog_errno(status); mlog_errno(status);
bail_commit: bail_commit:
ocfs2_commit_trans(handle); ocfs2_commit_trans(osb, handle);
bail_unlock: bail_unlock:
ocfs2_meta_unlock(inode, 1); ocfs2_meta_unlock(inode, 1);
bail_unlock_rw: bail_unlock_rw:
...@@ -906,19 +945,41 @@ int ocfs2_getattr(struct vfsmount *mnt, ...@@ -906,19 +945,41 @@ int ocfs2_getattr(struct vfsmount *mnt,
return err; return err;
} }
int ocfs2_permission(struct inode *inode, int mask, struct nameidata *nd)
{
int ret;
mlog_entry_void();
ret = ocfs2_meta_lock(inode, NULL, 0);
if (ret) {
mlog_errno(ret);
goto out;
}
ret = generic_permission(inode, mask, NULL);
if (ret)
mlog_errno(ret);
ocfs2_meta_unlock(inode, 0);
out:
mlog_exit(ret);
return ret;
}
static int ocfs2_write_remove_suid(struct inode *inode) static int ocfs2_write_remove_suid(struct inode *inode)
{ {
int ret; int ret;
struct buffer_head *bh = NULL; struct buffer_head *bh = NULL;
struct ocfs2_inode_info *oi = OCFS2_I(inode); struct ocfs2_inode_info *oi = OCFS2_I(inode);
struct ocfs2_journal_handle *handle; handle_t *handle;
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct ocfs2_dinode *di; struct ocfs2_dinode *di;
mlog_entry("(Inode %llu, mode 0%o)\n", mlog_entry("(Inode %llu, mode 0%o)\n",
(unsigned long long)oi->ip_blkno, inode->i_mode); (unsigned long long)oi->ip_blkno, inode->i_mode);
handle = ocfs2_start_trans(osb, NULL, OCFS2_INODE_UPDATE_CREDITS); handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
if (handle == NULL) { if (handle == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
mlog_errno(ret); mlog_errno(ret);
...@@ -951,75 +1012,29 @@ static int ocfs2_write_remove_suid(struct inode *inode) ...@@ -951,75 +1012,29 @@ static int ocfs2_write_remove_suid(struct inode *inode)
out_bh: out_bh:
brelse(bh); brelse(bh);
out_trans: out_trans:
ocfs2_commit_trans(handle); ocfs2_commit_trans(osb, handle);
out: out:
mlog_exit(ret); mlog_exit(ret);
return ret; return ret;
} }
static inline int ocfs2_write_should_remove_suid(struct inode *inode) static int ocfs2_prepare_inode_for_write(struct dentry *dentry,
{ loff_t *ppos,
mode_t mode = inode->i_mode; size_t count,
int appending)
if (!capable(CAP_FSETID)) {
if (unlikely(mode & S_ISUID))
return 1;
if (unlikely((mode & S_ISGID) && (mode & S_IXGRP)))
return 1;
}
return 0;
}
static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
const struct iovec *iov,
unsigned long nr_segs,
loff_t pos)
{ {
int ret, rw_level = -1, meta_level = -1, have_alloc_sem = 0; int ret = 0, meta_level = appending;
struct inode *inode = dentry->d_inode;
u32 clusters; u32 clusters;
struct file *filp = iocb->ki_filp;
struct inode *inode = filp->f_dentry->d_inode;
loff_t newsize, saved_pos; loff_t newsize, saved_pos;
mlog_entry("(0x%p, %u, '%.*s')\n", filp,
(unsigned int)nr_segs,
filp->f_dentry->d_name.len,
filp->f_dentry->d_name.name);
/* happy write of zero bytes */
if (iocb->ki_left == 0)
return 0;
if (!inode) {
mlog(0, "bad inode\n");
return -EIO;
}
mutex_lock(&inode->i_mutex);
/* to match setattr's i_mutex -> i_alloc_sem -> rw_lock ordering */
if (filp->f_flags & O_DIRECT) {
have_alloc_sem = 1;
down_read(&inode->i_alloc_sem);
}
/* concurrent O_DIRECT writes are allowed */
rw_level = (filp->f_flags & O_DIRECT) ? 0 : 1;
ret = ocfs2_rw_lock(inode, rw_level);
if (ret < 0) {
rw_level = -1;
mlog_errno(ret);
goto out;
}
/* /*
* We sample i_size under a read level meta lock to see if our write * We sample i_size under a read level meta lock to see if our write
* is extending the file, if it is we back off and get a write level * is extending the file, if it is we back off and get a write level
* meta lock. * meta lock.
*/ */
meta_level = (filp->f_flags & O_APPEND) ? 1 : 0;
for(;;) { for(;;) {
ret = ocfs2_meta_lock(inode, NULL, NULL, meta_level); ret = ocfs2_meta_lock(inode, NULL, meta_level);
if (ret < 0) { if (ret < 0) {
meta_level = -1; meta_level = -1;
mlog_errno(ret); mlog_errno(ret);
...@@ -1035,7 +1050,7 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb, ...@@ -1035,7 +1050,7 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
* inode. There's also the dinode i_size state which * inode. There's also the dinode i_size state which
* can be lost via setattr during extending writes (we * can be lost via setattr during extending writes (we
* set inode->i_size at the end of a write. */ * set inode->i_size at the end of a write. */
if (ocfs2_write_should_remove_suid(inode)) { if (should_remove_suid(dentry)) {
if (meta_level == 0) { if (meta_level == 0) {
ocfs2_meta_unlock(inode, meta_level); ocfs2_meta_unlock(inode, meta_level);
meta_level = 1; meta_level = 1;
...@@ -1045,19 +1060,19 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb, ...@@ -1045,19 +1060,19 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
ret = ocfs2_write_remove_suid(inode); ret = ocfs2_write_remove_suid(inode);
if (ret < 0) { if (ret < 0) {
mlog_errno(ret); mlog_errno(ret);
goto out; goto out_unlock;
} }
} }
/* work on a copy of ppos until we're sure that we won't have /* work on a copy of ppos until we're sure that we won't have
* to recalculate it due to relocking. */ * to recalculate it due to relocking. */
if (filp->f_flags & O_APPEND) { if (appending) {
saved_pos = i_size_read(inode); saved_pos = i_size_read(inode);
mlog(0, "O_APPEND: inode->i_size=%llu\n", saved_pos); mlog(0, "O_APPEND: inode->i_size=%llu\n", saved_pos);
} else { } else {
saved_pos = iocb->ki_pos; saved_pos = *ppos;
} }
newsize = iocb->ki_left + saved_pos; newsize = count + saved_pos;
mlog(0, "pos=%lld newsize=%lld cursize=%lld\n", mlog(0, "pos=%lld newsize=%lld cursize=%lld\n",
(long long) saved_pos, (long long) newsize, (long long) saved_pos, (long long) newsize,
...@@ -1090,19 +1105,66 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb, ...@@ -1090,19 +1105,66 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
if (!clusters) if (!clusters)
break; break;
ret = ocfs2_extend_file(inode, NULL, newsize, iocb->ki_left); ret = ocfs2_extend_file(inode, NULL, newsize, count);
if (ret < 0) { if (ret < 0) {
if (ret != -ENOSPC) if (ret != -ENOSPC)
mlog_errno(ret); mlog_errno(ret);
goto out; goto out_unlock;
} }
break; break;
} }
/* ok, we're done with i_size and alloc work */ if (appending)
iocb->ki_pos = saved_pos; *ppos = saved_pos;
out_unlock:
ocfs2_meta_unlock(inode, meta_level); ocfs2_meta_unlock(inode, meta_level);
meta_level = -1;
out:
return ret;
}
static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
const struct iovec *iov,
unsigned long nr_segs,
loff_t pos)
{
int ret, rw_level, have_alloc_sem = 0;
struct file *filp = iocb->ki_filp;
struct inode *inode = filp->f_dentry->d_inode;
int appending = filp->f_flags & O_APPEND ? 1 : 0;
mlog_entry("(0x%p, %u, '%.*s')\n", filp,
(unsigned int)nr_segs,
filp->f_dentry->d_name.len,
filp->f_dentry->d_name.name);
/* happy write of zero bytes */
if (iocb->ki_left == 0)
return 0;
mutex_lock(&inode->i_mutex);
/* to match setattr's i_mutex -> i_alloc_sem -> rw_lock ordering */
if (filp->f_flags & O_DIRECT) {
have_alloc_sem = 1;
down_read(&inode->i_alloc_sem);
}
/* concurrent O_DIRECT writes are allowed */
rw_level = (filp->f_flags & O_DIRECT) ? 0 : 1;
ret = ocfs2_rw_lock(inode, rw_level);
if (ret < 0) {
rw_level = -1;
mlog_errno(ret);
goto out;
}
ret = ocfs2_prepare_inode_for_write(filp->f_dentry, &iocb->ki_pos,
iocb->ki_left, appending);
if (ret < 0) {
mlog_errno(ret);
goto out;
}
/* communicate with ocfs2_dio_end_io */ /* communicate with ocfs2_dio_end_io */
ocfs2_iocb_set_rw_locked(iocb); ocfs2_iocb_set_rw_locked(iocb);
...@@ -1128,8 +1190,6 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb, ...@@ -1128,8 +1190,6 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
} }
out: out:
if (meta_level != -1)
ocfs2_meta_unlock(inode, meta_level);
if (have_alloc_sem) if (have_alloc_sem)
up_read(&inode->i_alloc_sem); up_read(&inode->i_alloc_sem);
if (rw_level != -1) if (rw_level != -1)
...@@ -1140,12 +1200,83 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb, ...@@ -1140,12 +1200,83 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
return ret; return ret;
} }
static ssize_t ocfs2_file_splice_write(struct pipe_inode_info *pipe,
struct file *out,
loff_t *ppos,
size_t len,
unsigned int flags)
{
int ret;
struct inode *inode = out->f_dentry->d_inode;
mlog_entry("(0x%p, 0x%p, %u, '%.*s')\n", out, pipe,
(unsigned int)len,
out->f_dentry->d_name.len,
out->f_dentry->d_name.name);
inode_double_lock(inode, pipe->inode);
ret = ocfs2_rw_lock(inode, 1);
if (ret < 0) {
mlog_errno(ret);
goto out;
}
ret = ocfs2_prepare_inode_for_write(out->f_dentry, ppos, len, 0);
if (ret < 0) {
mlog_errno(ret);
goto out_unlock;
}
/* ok, we're done with i_size and alloc work */
ret = generic_file_splice_write_nolock(pipe, out, ppos, len, flags);
out_unlock:
ocfs2_rw_unlock(inode, 1);
out:
inode_double_unlock(inode, pipe->inode);
mlog_exit(ret);
return ret;
}
static ssize_t ocfs2_file_splice_read(struct file *in,
loff_t *ppos,
struct pipe_inode_info *pipe,
size_t len,
unsigned int flags)
{
int ret = 0;
struct inode *inode = in->f_dentry->d_inode;
mlog_entry("(0x%p, 0x%p, %u, '%.*s')\n", in, pipe,
(unsigned int)len,
in->f_dentry->d_name.len,
in->f_dentry->d_name.name);
/*
* See the comment in ocfs2_file_aio_read()
*/
ret = ocfs2_meta_lock(inode, NULL, 0);
if (ret < 0) {
mlog_errno(ret);
goto bail;
}
ocfs2_meta_unlock(inode, 0);
ret = generic_file_splice_read(in, ppos, pipe, len, flags);
bail:
mlog_exit(ret);
return ret;
}
static ssize_t ocfs2_file_aio_read(struct kiocb *iocb, static ssize_t ocfs2_file_aio_read(struct kiocb *iocb,
const struct iovec *iov, const struct iovec *iov,
unsigned long nr_segs, unsigned long nr_segs,
loff_t pos) loff_t pos)
{ {
int ret = 0, rw_level = -1, have_alloc_sem = 0; int ret = 0, rw_level = -1, have_alloc_sem = 0, lock_level = 0;
struct file *filp = iocb->ki_filp; struct file *filp = iocb->ki_filp;
struct inode *inode = filp->f_dentry->d_inode; struct inode *inode = filp->f_dentry->d_inode;
...@@ -1187,12 +1318,12 @@ static ssize_t ocfs2_file_aio_read(struct kiocb *iocb, ...@@ -1187,12 +1318,12 @@ static ssize_t ocfs2_file_aio_read(struct kiocb *iocb,
* like i_size. This allows the checks down below * like i_size. This allows the checks down below
* generic_file_aio_read() a chance of actually working. * generic_file_aio_read() a chance of actually working.
*/ */
ret = ocfs2_meta_lock(inode, NULL, NULL, 0); ret = ocfs2_meta_lock_atime(inode, filp->f_vfsmnt, &lock_level);
if (ret < 0) { if (ret < 0) {
mlog_errno(ret); mlog_errno(ret);
goto bail; goto bail;
} }
ocfs2_meta_unlock(inode, 0); ocfs2_meta_unlock(inode, lock_level);
ret = generic_file_aio_read(iocb, iov, nr_segs, iocb->ki_pos); ret = generic_file_aio_read(iocb, iov, nr_segs, iocb->ki_pos);
if (ret == -EINVAL) if (ret == -EINVAL)
...@@ -1220,11 +1351,13 @@ static ssize_t ocfs2_file_aio_read(struct kiocb *iocb, ...@@ -1220,11 +1351,13 @@ static ssize_t ocfs2_file_aio_read(struct kiocb *iocb,
struct inode_operations ocfs2_file_iops = { struct inode_operations ocfs2_file_iops = {
.setattr = ocfs2_setattr, .setattr = ocfs2_setattr,
.getattr = ocfs2_getattr, .getattr = ocfs2_getattr,
.permission = ocfs2_permission,
}; };
struct inode_operations ocfs2_special_file_iops = { struct inode_operations ocfs2_special_file_iops = {
.setattr = ocfs2_setattr, .setattr = ocfs2_setattr,
.getattr = ocfs2_getattr, .getattr = ocfs2_getattr,
.permission = ocfs2_permission,
}; };
const struct file_operations ocfs2_fops = { const struct file_operations ocfs2_fops = {
...@@ -1238,6 +1371,8 @@ const struct file_operations ocfs2_fops = { ...@@ -1238,6 +1371,8 @@ const struct file_operations ocfs2_fops = {
.aio_read = ocfs2_file_aio_read, .aio_read = ocfs2_file_aio_read,
.aio_write = ocfs2_file_aio_write, .aio_write = ocfs2_file_aio_write,
.ioctl = ocfs2_ioctl, .ioctl = ocfs2_ioctl,
.splice_read = ocfs2_file_splice_read,
.splice_write = ocfs2_file_splice_write,
}; };
const struct file_operations ocfs2_dops = { const struct file_operations ocfs2_dops = {
......
fs/ocfs2/file.h
View file @ 651857a1
...@@ -41,17 +41,24 @@ int ocfs2_do_extend_allocation(struct ocfs2_super *osb, ...@@ -41,17 +41,24 @@ int ocfs2_do_extend_allocation(struct ocfs2_super *osb,
struct inode *inode, struct inode *inode,
u32 clusters_to_add, u32 clusters_to_add,
struct buffer_head *fe_bh, struct buffer_head *fe_bh,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct ocfs2_alloc_context *data_ac, struct ocfs2_alloc_context *data_ac,
struct ocfs2_alloc_context *meta_ac, struct ocfs2_alloc_context *meta_ac,
enum ocfs2_alloc_restarted *reason); enum ocfs2_alloc_restarted *reason);
int ocfs2_setattr(struct dentry *dentry, struct iattr *attr); int ocfs2_setattr(struct dentry *dentry, struct iattr *attr);
int ocfs2_getattr(struct vfsmount *mnt, struct dentry *dentry, int ocfs2_getattr(struct vfsmount *mnt, struct dentry *dentry,
struct kstat *stat); struct kstat *stat);
int ocfs2_permission(struct inode *inode, int mask,
struct nameidata *nd);
int ocfs2_set_inode_size(struct ocfs2_journal_handle *handle, int ocfs2_set_inode_size(handle_t *handle,
struct inode *inode, struct inode *inode,
struct buffer_head *fe_bh, struct buffer_head *fe_bh,
u64 new_i_size); u64 new_i_size);
int ocfs2_should_update_atime(struct inode *inode,
struct vfsmount *vfsmnt);
int ocfs2_update_inode_atime(struct inode *inode,
struct buffer_head *bh);
#endif /* OCFS2_FILE_H */ #endif /* OCFS2_FILE_H */
fs/ocfs2/inode.c
View file @ 651857a1
...@@ -360,7 +360,6 @@ int ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe, ...@@ -360,7 +360,6 @@ int ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe,
inode); inode);
ocfs2_set_inode_flags(inode); ocfs2_set_inode_flags(inode);
inode->i_flags |= S_NOATIME;
status = 0; status = 0;
bail: bail:
...@@ -441,7 +440,7 @@ static int ocfs2_read_locked_inode(struct inode *inode, ...@@ -441,7 +440,7 @@ static int ocfs2_read_locked_inode(struct inode *inode,
generation, inode); generation, inode);
if (can_lock) { if (can_lock) {
status = ocfs2_meta_lock(inode, NULL, NULL, 0); status = ocfs2_meta_lock(inode, NULL, 0);
if (status) { if (status) {
make_bad_inode(inode); make_bad_inode(inode);
mlog_errno(status); mlog_errno(status);
...@@ -512,7 +511,7 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb, ...@@ -512,7 +511,7 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb,
struct buffer_head *fe_bh) struct buffer_head *fe_bh)
{ {
int status = 0; int status = 0;
struct ocfs2_journal_handle *handle = NULL; handle_t *handle = NULL;
struct ocfs2_truncate_context *tc = NULL; struct ocfs2_truncate_context *tc = NULL;
struct ocfs2_dinode *fe; struct ocfs2_dinode *fe;
...@@ -524,7 +523,7 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb, ...@@ -524,7 +523,7 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb,
if (!fe->i_clusters) if (!fe->i_clusters)
goto bail; goto bail;
handle = ocfs2_start_trans(osb, handle, OCFS2_INODE_UPDATE_CREDITS); handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
if (IS_ERR(handle)) { if (IS_ERR(handle)) {
status = PTR_ERR(handle); status = PTR_ERR(handle);
handle = NULL; handle = NULL;
...@@ -538,7 +537,7 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb, ...@@ -538,7 +537,7 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb,
goto bail; goto bail;
} }
ocfs2_commit_trans(handle); ocfs2_commit_trans(osb, handle);
handle = NULL; handle = NULL;
status = ocfs2_prepare_truncate(osb, inode, fe_bh, &tc); status = ocfs2_prepare_truncate(osb, inode, fe_bh, &tc);
...@@ -554,7 +553,7 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb, ...@@ -554,7 +553,7 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb,
} }
bail: bail:
if (handle) if (handle)
ocfs2_commit_trans(handle); ocfs2_commit_trans(osb, handle);
mlog_exit(status); mlog_exit(status);
return status; return status;
...@@ -568,7 +567,7 @@ static int ocfs2_remove_inode(struct inode *inode, ...@@ -568,7 +567,7 @@ static int ocfs2_remove_inode(struct inode *inode,
int status; int status;
struct inode *inode_alloc_inode = NULL; struct inode *inode_alloc_inode = NULL;
struct buffer_head *inode_alloc_bh = NULL; struct buffer_head *inode_alloc_bh = NULL;
struct ocfs2_journal_handle *handle; handle_t *handle;
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct ocfs2_dinode *di = (struct ocfs2_dinode *) di_bh->b_data; struct ocfs2_dinode *di = (struct ocfs2_dinode *) di_bh->b_data;
...@@ -582,7 +581,7 @@ static int ocfs2_remove_inode(struct inode *inode, ...@@ -582,7 +581,7 @@ static int ocfs2_remove_inode(struct inode *inode,
} }
mutex_lock(&inode_alloc_inode->i_mutex); mutex_lock(&inode_alloc_inode->i_mutex);
status = ocfs2_meta_lock(inode_alloc_inode, NULL, &inode_alloc_bh, 1); status = ocfs2_meta_lock(inode_alloc_inode, &inode_alloc_bh, 1);
if (status < 0) { if (status < 0) {
mutex_unlock(&inode_alloc_inode->i_mutex); mutex_unlock(&inode_alloc_inode->i_mutex);
...@@ -590,7 +589,7 @@ static int ocfs2_remove_inode(struct inode *inode, ...@@ -590,7 +589,7 @@ static int ocfs2_remove_inode(struct inode *inode,
goto bail; goto bail;
} }
handle = ocfs2_start_trans(osb, NULL, OCFS2_DELETE_INODE_CREDITS); handle = ocfs2_start_trans(osb, OCFS2_DELETE_INODE_CREDITS);
if (IS_ERR(handle)) { if (IS_ERR(handle)) {
status = PTR_ERR(handle); status = PTR_ERR(handle);
mlog_errno(status); mlog_errno(status);
...@@ -629,7 +628,7 @@ static int ocfs2_remove_inode(struct inode *inode, ...@@ -629,7 +628,7 @@ static int ocfs2_remove_inode(struct inode *inode,
mlog_errno(status); mlog_errno(status);
bail_commit: bail_commit:
ocfs2_commit_trans(handle); ocfs2_commit_trans(osb, handle);
bail_unlock: bail_unlock:
ocfs2_meta_unlock(inode_alloc_inode, 1); ocfs2_meta_unlock(inode_alloc_inode, 1);
mutex_unlock(&inode_alloc_inode->i_mutex); mutex_unlock(&inode_alloc_inode->i_mutex);
...@@ -705,7 +704,7 @@ static int ocfs2_wipe_inode(struct inode *inode, ...@@ -705,7 +704,7 @@ static int ocfs2_wipe_inode(struct inode *inode,
* delete_inode operation. We do this now to avoid races with * delete_inode operation. We do this now to avoid races with
* recovery completion on other nodes. */ * recovery completion on other nodes. */
mutex_lock(&orphan_dir_inode->i_mutex); mutex_lock(&orphan_dir_inode->i_mutex);
status = ocfs2_meta_lock(orphan_dir_inode, NULL, &orphan_dir_bh, 1); status = ocfs2_meta_lock(orphan_dir_inode, &orphan_dir_bh, 1);
if (status < 0) { if (status < 0) {
mutex_unlock(&orphan_dir_inode->i_mutex); mutex_unlock(&orphan_dir_inode->i_mutex);
...@@ -933,7 +932,7 @@ void ocfs2_delete_inode(struct inode *inode) ...@@ -933,7 +932,7 @@ void ocfs2_delete_inode(struct inode *inode)
* allocation lock here as it won't be needed - nobody will * allocation lock here as it won't be needed - nobody will
* have the file open. * have the file open.
*/ */
status = ocfs2_meta_lock(inode, NULL, &di_bh, 1); status = ocfs2_meta_lock(inode, &di_bh, 1);
if (status < 0) { if (status < 0) {
if (status != -ENOENT) if (status != -ENOENT)
mlog_errno(status); mlog_errno(status);
...@@ -1067,12 +1066,6 @@ void ocfs2_clear_inode(struct inode *inode) ...@@ -1067,12 +1066,6 @@ void ocfs2_clear_inode(struct inode *inode)
mlog_bug_on_msg(oi->ip_open_count, mlog_bug_on_msg(oi->ip_open_count,
"Clear inode of %llu has open count %d\n", "Clear inode of %llu has open count %d\n",
(unsigned long long)oi->ip_blkno, oi->ip_open_count); (unsigned long long)oi->ip_blkno, oi->ip_open_count);
mlog_bug_on_msg(!list_empty(&oi->ip_handle_list),
"Clear inode of %llu has non empty handle list\n",
(unsigned long long)oi->ip_blkno);
mlog_bug_on_msg(oi->ip_handle,
"Clear inode of %llu has non empty handle pointer\n",
(unsigned long long)oi->ip_blkno);
/* Clear all other flags. */ /* Clear all other flags. */
oi->ip_flags = OCFS2_INODE_CACHE_INLINE; oi->ip_flags = OCFS2_INODE_CACHE_INLINE;
...@@ -1186,7 +1179,7 @@ int ocfs2_inode_revalidate(struct dentry *dentry) ...@@ -1186,7 +1179,7 @@ int ocfs2_inode_revalidate(struct dentry *dentry)
/* Let ocfs2_meta_lock do the work of updating our struct /* Let ocfs2_meta_lock do the work of updating our struct
* inode for us. */ * inode for us. */
status = ocfs2_meta_lock(inode, NULL, NULL, 0); status = ocfs2_meta_lock(inode, NULL, 0);
if (status < 0) { if (status < 0) {
if (status != -ENOENT) if (status != -ENOENT)
mlog_errno(status); mlog_errno(status);
...@@ -1204,7 +1197,7 @@ int ocfs2_inode_revalidate(struct dentry *dentry) ...@@ -1204,7 +1197,7 @@ int ocfs2_inode_revalidate(struct dentry *dentry)
* struct inode. * struct inode.
* Only takes ip_lock. * Only takes ip_lock.
*/ */
int ocfs2_mark_inode_dirty(struct ocfs2_journal_handle *handle, int ocfs2_mark_inode_dirty(handle_t *handle,
struct inode *inode, struct inode *inode,
struct buffer_head *bh) struct buffer_head *bh)
{ {
......
fs/ocfs2/inode.h
View file @ 651857a1
...@@ -48,13 +48,6 @@ struct ocfs2_inode_info ...@@ -48,13 +48,6 @@ struct ocfs2_inode_info
struct mutex ip_io_mutex; struct mutex ip_io_mutex;
/* Used by the journalling code to attach an inode to a
* handle. These are protected by ip_io_mutex in order to lock
* out other I/O to the inode until we either commit or
* abort. */
struct list_head ip_handle_list;
struct ocfs2_journal_handle *ip_handle;
u32 ip_flags; /* see below */ u32 ip_flags; /* see below */
u32 ip_attr; /* inode attributes */ u32 ip_attr; /* inode attributes */
...@@ -143,7 +136,7 @@ ssize_t ocfs2_rw_direct(int rw, struct file *filp, char *buf, ...@@ -143,7 +136,7 @@ ssize_t ocfs2_rw_direct(int rw, struct file *filp, char *buf,
void ocfs2_sync_blockdev(struct super_block *sb); void ocfs2_sync_blockdev(struct super_block *sb);
void ocfs2_refresh_inode(struct inode *inode, void ocfs2_refresh_inode(struct inode *inode,
struct ocfs2_dinode *fe); struct ocfs2_dinode *fe);
int ocfs2_mark_inode_dirty(struct ocfs2_journal_handle *handle, int ocfs2_mark_inode_dirty(handle_t *handle,
struct inode *inode, struct inode *inode,
struct buffer_head *bh); struct buffer_head *bh);
int ocfs2_aio_read(struct file *file, struct kiocb *req, struct iocb *iocb); int ocfs2_aio_read(struct file *file, struct kiocb *req, struct iocb *iocb);
......
fs/ocfs2/ioctl.c
View file @ 651857a1
...@@ -26,7 +26,7 @@ static int ocfs2_get_inode_attr(struct inode *inode, unsigned *flags) ...@@ -26,7 +26,7 @@ static int ocfs2_get_inode_attr(struct inode *inode, unsigned *flags)
{ {
int status; int status;
status = ocfs2_meta_lock(inode, NULL, NULL, 0); status = ocfs2_meta_lock(inode, NULL, 0);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
return status; return status;
...@@ -43,14 +43,14 @@ static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags, ...@@ -43,14 +43,14 @@ static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
{ {
struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode); struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode);
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct ocfs2_journal_handle *handle = NULL; handle_t *handle = NULL;
struct buffer_head *bh = NULL; struct buffer_head *bh = NULL;
unsigned oldflags; unsigned oldflags;
int status; int status;
mutex_lock(&inode->i_mutex); mutex_lock(&inode->i_mutex);
status = ocfs2_meta_lock(inode, NULL, &bh, 1); status = ocfs2_meta_lock(inode, &bh, 1);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
goto bail; goto bail;
...@@ -67,7 +67,7 @@ static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags, ...@@ -67,7 +67,7 @@ static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
if (!S_ISDIR(inode->i_mode)) if (!S_ISDIR(inode->i_mode))
flags &= ~OCFS2_DIRSYNC_FL; flags &= ~OCFS2_DIRSYNC_FL;
handle = ocfs2_start_trans(osb, NULL, OCFS2_INODE_UPDATE_CREDITS); handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
if (IS_ERR(handle)) { if (IS_ERR(handle)) {
status = PTR_ERR(handle); status = PTR_ERR(handle);
mlog_errno(status); mlog_errno(status);
...@@ -96,7 +96,7 @@ static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags, ...@@ -96,7 +96,7 @@ static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
if (status < 0) if (status < 0)
mlog_errno(status); mlog_errno(status);
ocfs2_commit_trans(handle); ocfs2_commit_trans(osb, handle);
bail_unlock: bail_unlock:
ocfs2_meta_unlock(inode, 1); ocfs2_meta_unlock(inode, 1);
bail: bail:
......
fs/ocfs2/journal.c
View file @ 651857a1
...@@ -57,9 +57,6 @@ static int ocfs2_recover_node(struct ocfs2_super *osb, ...@@ -57,9 +57,6 @@ static int ocfs2_recover_node(struct ocfs2_super *osb,
static int __ocfs2_recovery_thread(void *arg); static int __ocfs2_recovery_thread(void *arg);
static int ocfs2_commit_cache(struct ocfs2_super *osb); static int ocfs2_commit_cache(struct ocfs2_super *osb);
static int ocfs2_wait_on_mount(struct ocfs2_super *osb); static int ocfs2_wait_on_mount(struct ocfs2_super *osb);
static void ocfs2_handle_cleanup_locks(struct ocfs2_journal *journal,
struct ocfs2_journal_handle *handle);
static void ocfs2_commit_unstarted_handle(struct ocfs2_journal_handle *handle);
static int ocfs2_journal_toggle_dirty(struct ocfs2_super *osb, static int ocfs2_journal_toggle_dirty(struct ocfs2_super *osb,
int dirty); int dirty);
static int ocfs2_trylock_journal(struct ocfs2_super *osb, static int ocfs2_trylock_journal(struct ocfs2_super *osb,
...@@ -113,46 +110,18 @@ static int ocfs2_commit_cache(struct ocfs2_super *osb) ...@@ -113,46 +110,18 @@ static int ocfs2_commit_cache(struct ocfs2_super *osb)
return status; return status;
} }
struct ocfs2_journal_handle *ocfs2_alloc_handle(struct ocfs2_super *osb)
{
struct ocfs2_journal_handle *retval = NULL;
retval = kcalloc(1, sizeof(*retval), GFP_NOFS);
if (!retval) {
mlog(ML_ERROR, "Failed to allocate memory for journal "
"handle!\n");
return NULL;
}
retval->max_buffs = 0;
retval->num_locks = 0;
retval->k_handle = NULL;
INIT_LIST_HEAD(&retval->locks);
INIT_LIST_HEAD(&retval->inode_list);
retval->journal = osb->journal;
return retval;
}
/* pass it NULL and it will allocate a new handle object for you. If /* pass it NULL and it will allocate a new handle object for you. If
* you pass it a handle however, it may still return error, in which * you pass it a handle however, it may still return error, in which
* case it has free'd the passed handle for you. */ * case it has free'd the passed handle for you. */
struct ocfs2_journal_handle *ocfs2_start_trans(struct ocfs2_super *osb, handle_t *ocfs2_start_trans(struct ocfs2_super *osb, int max_buffs)
struct ocfs2_journal_handle *handle,
int max_buffs)
{ {
int ret;
journal_t *journal = osb->journal->j_journal; journal_t *journal = osb->journal->j_journal;
handle_t *handle;
mlog_entry("(max_buffs = %d)\n", max_buffs);
BUG_ON(!osb || !osb->journal->j_journal); BUG_ON(!osb || !osb->journal->j_journal);
if (ocfs2_is_hard_readonly(osb)) { if (ocfs2_is_hard_readonly(osb))
ret = -EROFS; return ERR_PTR(-EROFS);
goto done_free;
}
BUG_ON(osb->journal->j_state == OCFS2_JOURNAL_FREE); BUG_ON(osb->journal->j_state == OCFS2_JOURNAL_FREE);
BUG_ON(max_buffs <= 0); BUG_ON(max_buffs <= 0);
...@@ -163,154 +132,39 @@ struct ocfs2_journal_handle *ocfs2_start_trans(struct ocfs2_super *osb, ...@@ -163,154 +132,39 @@ struct ocfs2_journal_handle *ocfs2_start_trans(struct ocfs2_super *osb,
BUG(); BUG();
} }
if (!handle)
handle = ocfs2_alloc_handle(osb);
if (!handle) {
ret = -ENOMEM;
mlog(ML_ERROR, "Failed to allocate memory for journal "
"handle!\n");
goto done_free;
}
handle->max_buffs = max_buffs;
down_read(&osb->journal->j_trans_barrier); down_read(&osb->journal->j_trans_barrier);
/* actually start the transaction now */ handle = journal_start(journal, max_buffs);
handle->k_handle = journal_start(journal, max_buffs); if (IS_ERR(handle)) {
if (IS_ERR(handle->k_handle)) {
up_read(&osb->journal->j_trans_barrier); up_read(&osb->journal->j_trans_barrier);
ret = PTR_ERR(handle->k_handle); mlog_errno(PTR_ERR(handle));
handle->k_handle = NULL;
mlog_errno(ret);
if (is_journal_aborted(journal)) { if (is_journal_aborted(journal)) {
ocfs2_abort(osb->sb, "Detected aborted journal"); ocfs2_abort(osb->sb, "Detected aborted journal");
ret = -EROFS; handle = ERR_PTR(-EROFS);
} }
goto done_free; } else
} atomic_inc(&(osb->journal->j_num_trans));
atomic_inc(&(osb->journal->j_num_trans));
handle->flags |= OCFS2_HANDLE_STARTED;
mlog_exit_ptr(handle);
return handle; return handle;
done_free:
if (handle)
ocfs2_commit_unstarted_handle(handle); /* will kfree handle */
mlog_exit(ret);
return ERR_PTR(ret);
}
void ocfs2_handle_add_inode(struct ocfs2_journal_handle *handle,
struct inode *inode)
{
BUG_ON(!handle);
BUG_ON(!inode);
atomic_inc(&inode->i_count);
/* we're obviously changing it... */
mutex_lock(&inode->i_mutex);
/* sanity check */
BUG_ON(OCFS2_I(inode)->ip_handle);
BUG_ON(!list_empty(&OCFS2_I(inode)->ip_handle_list));
OCFS2_I(inode)->ip_handle = handle;
list_move_tail(&(OCFS2_I(inode)->ip_handle_list), &(handle->inode_list));
}
static void ocfs2_handle_unlock_inodes(struct ocfs2_journal_handle *handle)
{
struct list_head *p, *n;
struct inode *inode;
struct ocfs2_inode_info *oi;
list_for_each_safe(p, n, &handle->inode_list) {
oi = list_entry(p, struct ocfs2_inode_info,
ip_handle_list);
inode = &oi->vfs_inode;
OCFS2_I(inode)->ip_handle = NULL;
list_del_init(&OCFS2_I(inode)->ip_handle_list);
mutex_unlock(&inode->i_mutex);
iput(inode);
}
}
/* This is trivial so we do it out of the main commit
* paths. Beware, it can be called from start_trans too! */
static void ocfs2_commit_unstarted_handle(struct ocfs2_journal_handle *handle)
{
mlog_entry_void();
BUG_ON(handle->flags & OCFS2_HANDLE_STARTED);
ocfs2_handle_unlock_inodes(handle);
/* You are allowed to add journal locks before the transaction
* has started. */
ocfs2_handle_cleanup_locks(handle->journal, handle);
kfree(handle);
mlog_exit_void();
} }
void ocfs2_commit_trans(struct ocfs2_journal_handle *handle) int ocfs2_commit_trans(struct ocfs2_super *osb,
handle_t *handle)
{ {
handle_t *jbd_handle; int ret;
int retval; struct ocfs2_journal *journal = osb->journal;
struct ocfs2_journal *journal = handle->journal;
mlog_entry_void();
BUG_ON(!handle); BUG_ON(!handle);
if (!(handle->flags & OCFS2_HANDLE_STARTED)) { ret = journal_stop(handle);
ocfs2_commit_unstarted_handle(handle); if (ret < 0)
mlog_exit_void(); mlog_errno(ret);
return;
}
/* release inode semaphores we took during this transaction */
ocfs2_handle_unlock_inodes(handle);
/* ocfs2_extend_trans may have had to call journal_restart
* which will always commit the transaction, but may return
* error for any number of reasons. If this is the case, we
* clear k_handle as it's not valid any more. */
if (handle->k_handle) {
jbd_handle = handle->k_handle;
if (handle->flags & OCFS2_HANDLE_SYNC)
jbd_handle->h_sync = 1;
else
jbd_handle->h_sync = 0;
/* actually stop the transaction. if we've set h_sync,
* it'll have been committed when we return */
retval = journal_stop(jbd_handle);
if (retval < 0) {
mlog_errno(retval);
mlog(ML_ERROR, "Could not commit transaction\n");
BUG();
}
handle->k_handle = NULL; /* it's been free'd in journal_stop */
}
ocfs2_handle_cleanup_locks(journal, handle);
up_read(&journal->j_trans_barrier); up_read(&journal->j_trans_barrier);
kfree(handle); return ret;
mlog_exit_void();
} }
/* /*
...@@ -326,20 +180,18 @@ void ocfs2_commit_trans(struct ocfs2_journal_handle *handle) ...@@ -326,20 +180,18 @@ void ocfs2_commit_trans(struct ocfs2_journal_handle *handle)
* good because transaction ids haven't yet been recorded on the * good because transaction ids haven't yet been recorded on the
* cluster locks associated with this handle. * cluster locks associated with this handle.
*/ */
int ocfs2_extend_trans(struct ocfs2_journal_handle *handle, int ocfs2_extend_trans(handle_t *handle, int nblocks)
int nblocks)
{ {
int status; int status;
BUG_ON(!handle); BUG_ON(!handle);
BUG_ON(!(handle->flags & OCFS2_HANDLE_STARTED));
BUG_ON(!nblocks); BUG_ON(!nblocks);
mlog_entry_void(); mlog_entry_void();
mlog(0, "Trying to extend transaction by %d blocks\n", nblocks); mlog(0, "Trying to extend transaction by %d blocks\n", nblocks);
status = journal_extend(handle->k_handle, nblocks); status = journal_extend(handle, nblocks);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
goto bail; goto bail;
...@@ -347,15 +199,12 @@ int ocfs2_extend_trans(struct ocfs2_journal_handle *handle, ...@@ -347,15 +199,12 @@ int ocfs2_extend_trans(struct ocfs2_journal_handle *handle,
if (status > 0) { if (status > 0) {
mlog(0, "journal_extend failed, trying journal_restart\n"); mlog(0, "journal_extend failed, trying journal_restart\n");
status = journal_restart(handle->k_handle, nblocks); status = journal_restart(handle, nblocks);
if (status < 0) { if (status < 0) {
handle->k_handle = NULL;
mlog_errno(status); mlog_errno(status);
goto bail; goto bail;
} }
handle->max_buffs = nblocks; }
} else
handle->max_buffs += nblocks;
status = 0; status = 0;
bail: bail:
...@@ -364,7 +213,7 @@ int ocfs2_extend_trans(struct ocfs2_journal_handle *handle, ...@@ -364,7 +213,7 @@ int ocfs2_extend_trans(struct ocfs2_journal_handle *handle,
return status; return status;
} }
int ocfs2_journal_access(struct ocfs2_journal_handle *handle, int ocfs2_journal_access(handle_t *handle,
struct inode *inode, struct inode *inode,
struct buffer_head *bh, struct buffer_head *bh,
int type) int type)
...@@ -374,7 +223,6 @@ int ocfs2_journal_access(struct ocfs2_journal_handle *handle, ...@@ -374,7 +223,6 @@ int ocfs2_journal_access(struct ocfs2_journal_handle *handle,
BUG_ON(!inode); BUG_ON(!inode);
BUG_ON(!handle); BUG_ON(!handle);
BUG_ON(!bh); BUG_ON(!bh);
BUG_ON(!(handle->flags & OCFS2_HANDLE_STARTED));
mlog_entry("bh->b_blocknr=%llu, type=%d (\"%s\"), bh->b_size = %zu\n", mlog_entry("bh->b_blocknr=%llu, type=%d (\"%s\"), bh->b_size = %zu\n",
(unsigned long long)bh->b_blocknr, type, (unsigned long long)bh->b_blocknr, type,
...@@ -403,11 +251,11 @@ int ocfs2_journal_access(struct ocfs2_journal_handle *handle, ...@@ -403,11 +251,11 @@ int ocfs2_journal_access(struct ocfs2_journal_handle *handle,
switch (type) { switch (type) {
case OCFS2_JOURNAL_ACCESS_CREATE: case OCFS2_JOURNAL_ACCESS_CREATE:
case OCFS2_JOURNAL_ACCESS_WRITE: case OCFS2_JOURNAL_ACCESS_WRITE:
status = journal_get_write_access(handle->k_handle, bh); status = journal_get_write_access(handle, bh);
break; break;
case OCFS2_JOURNAL_ACCESS_UNDO: case OCFS2_JOURNAL_ACCESS_UNDO:
status = journal_get_undo_access(handle->k_handle, bh); status = journal_get_undo_access(handle, bh);
break; break;
default: default:
...@@ -424,17 +272,15 @@ int ocfs2_journal_access(struct ocfs2_journal_handle *handle, ...@@ -424,17 +272,15 @@ int ocfs2_journal_access(struct ocfs2_journal_handle *handle,
return status; return status;
} }
int ocfs2_journal_dirty(struct ocfs2_journal_handle *handle, int ocfs2_journal_dirty(handle_t *handle,
struct buffer_head *bh) struct buffer_head *bh)
{ {
int status; int status;
BUG_ON(!(handle->flags & OCFS2_HANDLE_STARTED));
mlog_entry("(bh->b_blocknr=%llu)\n", mlog_entry("(bh->b_blocknr=%llu)\n",
(unsigned long long)bh->b_blocknr); (unsigned long long)bh->b_blocknr);
status = journal_dirty_metadata(handle->k_handle, bh); status = journal_dirty_metadata(handle, bh);
if (status < 0) if (status < 0)
mlog(ML_ERROR, "Could not dirty metadata buffer. " mlog(ML_ERROR, "Could not dirty metadata buffer. "
"(bh->b_blocknr=%llu)\n", "(bh->b_blocknr=%llu)\n",
...@@ -456,59 +302,6 @@ int ocfs2_journal_dirty_data(handle_t *handle, ...@@ -456,59 +302,6 @@ int ocfs2_journal_dirty_data(handle_t *handle,
return err; return err;
} }
/* We always assume you're adding a metadata lock at level 'ex' */
int ocfs2_handle_add_lock(struct ocfs2_journal_handle *handle,
struct inode *inode)
{
int status;
struct ocfs2_journal_lock *lock;
BUG_ON(!inode);
lock = kmem_cache_alloc(ocfs2_lock_cache, GFP_NOFS);
if (!lock) {
status = -ENOMEM;
mlog_errno(-ENOMEM);
goto bail;
}
if (!igrab(inode))
BUG();
lock->jl_inode = inode;
list_add_tail(&(lock->jl_lock_list), &(handle->locks));
handle->num_locks++;
status = 0;
bail:
mlog_exit(status);
return status;
}
static void ocfs2_handle_cleanup_locks(struct ocfs2_journal *journal,
struct ocfs2_journal_handle *handle)
{
struct list_head *p, *n;
struct ocfs2_journal_lock *lock;
struct inode *inode;
list_for_each_safe(p, n, &(handle->locks)) {
lock = list_entry(p, struct ocfs2_journal_lock,
jl_lock_list);
list_del(&lock->jl_lock_list);
handle->num_locks--;
inode = lock->jl_inode;
ocfs2_meta_unlock(inode, 1);
if (atomic_read(&inode->i_count) == 1)
mlog(ML_ERROR,
"Inode %llu, I'm doing a last iput for!",
(unsigned long long)OCFS2_I(inode)->ip_blkno);
iput(inode);
kmem_cache_free(ocfs2_lock_cache, lock);
}
}
#define OCFS2_DEFAULT_COMMIT_INTERVAL (HZ * 5) #define OCFS2_DEFAULT_COMMIT_INTERVAL (HZ * 5)
void ocfs2_set_journal_params(struct ocfs2_super *osb) void ocfs2_set_journal_params(struct ocfs2_super *osb)
...@@ -562,8 +355,7 @@ int ocfs2_journal_init(struct ocfs2_journal *journal, int *dirty) ...@@ -562,8 +355,7 @@ int ocfs2_journal_init(struct ocfs2_journal *journal, int *dirty)
/* Skip recovery waits here - journal inode metadata never /* Skip recovery waits here - journal inode metadata never
* changes in a live cluster so it can be considered an * changes in a live cluster so it can be considered an
* exception to the rule. */ * exception to the rule. */
status = ocfs2_meta_lock_full(inode, NULL, &bh, 1, status = ocfs2_meta_lock_full(inode, &bh, 1, OCFS2_META_LOCK_RECOVERY);
OCFS2_META_LOCK_RECOVERY);
if (status < 0) { if (status < 0) {
if (status != -ERESTARTSYS) if (status != -ERESTARTSYS)
mlog(ML_ERROR, "Could not get lock on journal!\n"); mlog(ML_ERROR, "Could not get lock on journal!\n");
...@@ -1160,8 +952,7 @@ static int ocfs2_replay_journal(struct ocfs2_super *osb, ...@@ -1160,8 +952,7 @@ static int ocfs2_replay_journal(struct ocfs2_super *osb,
} }
SET_INODE_JOURNAL(inode); SET_INODE_JOURNAL(inode);
status = ocfs2_meta_lock_full(inode, NULL, &bh, 1, status = ocfs2_meta_lock_full(inode, &bh, 1, OCFS2_META_LOCK_RECOVERY);
OCFS2_META_LOCK_RECOVERY);
if (status < 0) { if (status < 0) {
mlog(0, "status returned from ocfs2_meta_lock=%d\n", status); mlog(0, "status returned from ocfs2_meta_lock=%d\n", status);
if (status != -ERESTARTSYS) if (status != -ERESTARTSYS)
...@@ -1350,7 +1141,7 @@ static int ocfs2_trylock_journal(struct ocfs2_super *osb, ...@@ -1350,7 +1141,7 @@ static int ocfs2_trylock_journal(struct ocfs2_super *osb,
SET_INODE_JOURNAL(inode); SET_INODE_JOURNAL(inode);
flags = OCFS2_META_LOCK_RECOVERY | OCFS2_META_LOCK_NOQUEUE; flags = OCFS2_META_LOCK_RECOVERY | OCFS2_META_LOCK_NOQUEUE;
status = ocfs2_meta_lock_full(inode, NULL, NULL, 1, flags); status = ocfs2_meta_lock_full(inode, NULL, 1, flags);
if (status < 0) { if (status < 0) {
if (status != -EAGAIN) if (status != -EAGAIN)
mlog_errno(status); mlog_errno(status);
...@@ -1433,7 +1224,7 @@ static int ocfs2_queue_orphans(struct ocfs2_super *osb, ...@@ -1433,7 +1224,7 @@ static int ocfs2_queue_orphans(struct ocfs2_super *osb,
} }
mutex_lock(&orphan_dir_inode->i_mutex); mutex_lock(&orphan_dir_inode->i_mutex);
status = ocfs2_meta_lock(orphan_dir_inode, NULL, NULL, 0); status = ocfs2_meta_lock(orphan_dir_inode, NULL, 0);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
goto out; goto out;
......
fs/ocfs2/journal.h
View file @ 651857a1
...@@ -37,7 +37,6 @@ enum ocfs2_journal_state { ...@@ -37,7 +37,6 @@ enum ocfs2_journal_state {
struct ocfs2_super; struct ocfs2_super;
struct ocfs2_dinode; struct ocfs2_dinode;
struct ocfs2_journal_handle;
struct ocfs2_journal { struct ocfs2_journal {
enum ocfs2_journal_state j_state; /* Journals current state */ enum ocfs2_journal_state j_state; /* Journals current state */
...@@ -133,44 +132,6 @@ static inline void ocfs2_inode_set_new(struct ocfs2_super *osb, ...@@ -133,44 +132,6 @@ static inline void ocfs2_inode_set_new(struct ocfs2_super *osb,
spin_unlock(&trans_inc_lock); spin_unlock(&trans_inc_lock);
} }
extern kmem_cache_t *ocfs2_lock_cache;
struct ocfs2_journal_lock {
struct inode *jl_inode;
struct list_head jl_lock_list;
};
struct ocfs2_journal_handle {
handle_t *k_handle; /* kernel handle. */
struct ocfs2_journal *journal;
u32 flags; /* see flags below. */
int max_buffs; /* Buffs reserved by this handle */
/* The following two fields are for ocfs2_handle_add_lock */
int num_locks;
struct list_head locks; /* A bunch of locks to
* release on commit. This
* should be a list_head */
struct list_head inode_list;
};
#define OCFS2_HANDLE_STARTED 1
/* should we sync-commit this handle? */
#define OCFS2_HANDLE_SYNC 2
static inline int ocfs2_handle_started(struct ocfs2_journal_handle *handle)
{
return handle->flags & OCFS2_HANDLE_STARTED;
}
static inline void ocfs2_handle_set_sync(struct ocfs2_journal_handle *handle, int sync)
{
if (sync)
handle->flags |= OCFS2_HANDLE_SYNC;
else
handle->flags &= ~OCFS2_HANDLE_SYNC;
}
/* Exported only for the journal struct init code in super.c. Do not call. */ /* Exported only for the journal struct init code in super.c. Do not call. */
void ocfs2_complete_recovery(void *data); void ocfs2_complete_recovery(void *data);
...@@ -231,15 +192,14 @@ static inline void ocfs2_checkpoint_inode(struct inode *inode) ...@@ -231,15 +192,14 @@ static inline void ocfs2_checkpoint_inode(struct inode *inode)
* Transaction Handling: * Transaction Handling:
* Manage the lifetime of a transaction handle. * Manage the lifetime of a transaction handle.
* *
* ocfs2_alloc_handle - Only allocate a handle so we can start putting
* cluster locks on it. To actually change blocks,
* call ocfs2_start_trans with the handle returned
* from this function. You may call ocfs2_commit_trans
* at any time in the lifetime of a handle.
* ocfs2_start_trans - Begin a transaction. Give it an upper estimate of * ocfs2_start_trans - Begin a transaction. Give it an upper estimate of
* the number of blocks that will be changed during * the number of blocks that will be changed during
* this handle. * this handle.
* ocfs2_commit_trans - Complete a handle. * ocfs2_commit_trans - Complete a handle. It might return -EIO if
* the journal was aborted. The majority of paths don't
* check the return value as an error there comes too
* late to do anything (and will be picked up in a
* later transaction).
* ocfs2_extend_trans - Extend a handle by nblocks credits. This may * ocfs2_extend_trans - Extend a handle by nblocks credits. This may
* commit the handle to disk in the process, but will * commit the handle to disk in the process, but will
* not release any locks taken during the transaction. * not release any locks taken during the transaction.
...@@ -249,24 +209,16 @@ static inline void ocfs2_checkpoint_inode(struct inode *inode) ...@@ -249,24 +209,16 @@ static inline void ocfs2_checkpoint_inode(struct inode *inode)
* ocfs2_journal_dirty - Mark a journalled buffer as having dirty data. * ocfs2_journal_dirty - Mark a journalled buffer as having dirty data.
* ocfs2_journal_dirty_data - Indicate that a data buffer should go out before * ocfs2_journal_dirty_data - Indicate that a data buffer should go out before
* the current handle commits. * the current handle commits.
* ocfs2_handle_add_lock - Sometimes we need to delay lock release
* until after a transaction has been completed. Use
* ocfs2_handle_add_lock to indicate that a lock needs
* to be released at the end of that handle. Locks
* will be released in the order that they are added.
* ocfs2_handle_add_inode - Add a locked inode to a transaction.
*/ */
/* You must always start_trans with a number of buffs > 0, but it's /* You must always start_trans with a number of buffs > 0, but it's
* perfectly legal to go through an entire transaction without having * perfectly legal to go through an entire transaction without having
* dirtied any buffers. */ * dirtied any buffers. */
struct ocfs2_journal_handle *ocfs2_alloc_handle(struct ocfs2_super *osb); handle_t *ocfs2_start_trans(struct ocfs2_super *osb,
struct ocfs2_journal_handle *ocfs2_start_trans(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
int max_buffs); int max_buffs);
void ocfs2_commit_trans(struct ocfs2_journal_handle *handle); int ocfs2_commit_trans(struct ocfs2_super *osb,
int ocfs2_extend_trans(struct ocfs2_journal_handle *handle, handle_t *handle);
int nblocks); int ocfs2_extend_trans(handle_t *handle, int nblocks);
/* /*
* Create access is for when we get a newly created buffer and we're * Create access is for when we get a newly created buffer and we're
...@@ -283,7 +235,7 @@ int ocfs2_extend_trans(struct ocfs2_journal_handle *handle, ...@@ -283,7 +235,7 @@ int ocfs2_extend_trans(struct ocfs2_journal_handle *handle,
#define OCFS2_JOURNAL_ACCESS_WRITE 1 #define OCFS2_JOURNAL_ACCESS_WRITE 1
#define OCFS2_JOURNAL_ACCESS_UNDO 2 #define OCFS2_JOURNAL_ACCESS_UNDO 2
int ocfs2_journal_access(struct ocfs2_journal_handle *handle, int ocfs2_journal_access(handle_t *handle,
struct inode *inode, struct inode *inode,
struct buffer_head *bh, struct buffer_head *bh,
int type); int type);
...@@ -306,18 +258,10 @@ int ocfs2_journal_access(struct ocfs2_journal_handle *handle, ...@@ -306,18 +258,10 @@ int ocfs2_journal_access(struct ocfs2_journal_handle *handle,
* <modify the bh> * <modify the bh>
* ocfs2_journal_dirty(handle, bh); * ocfs2_journal_dirty(handle, bh);
*/ */
int ocfs2_journal_dirty(struct ocfs2_journal_handle *handle, int ocfs2_journal_dirty(handle_t *handle,
struct buffer_head *bh); struct buffer_head *bh);
int ocfs2_journal_dirty_data(handle_t *handle, int ocfs2_journal_dirty_data(handle_t *handle,
struct buffer_head *bh); struct buffer_head *bh);
int ocfs2_handle_add_lock(struct ocfs2_journal_handle *handle,
struct inode *inode);
/*
* Use this to protect from other processes reading buffer state while
* it's in flight.
*/
void ocfs2_handle_add_inode(struct ocfs2_journal_handle *handle,
struct inode *inode);
/* /*
* Credit Macros: * Credit Macros:
......
fs/ocfs2/localalloc.c
View file @ 651857a1
...@@ -58,19 +58,18 @@ static int ocfs2_local_alloc_find_clear_bits(struct ocfs2_super *osb, ...@@ -58,19 +58,18 @@ static int ocfs2_local_alloc_find_clear_bits(struct ocfs2_super *osb,
static void ocfs2_clear_local_alloc(struct ocfs2_dinode *alloc); static void ocfs2_clear_local_alloc(struct ocfs2_dinode *alloc);
static int ocfs2_sync_local_to_main(struct ocfs2_super *osb, static int ocfs2_sync_local_to_main(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct ocfs2_dinode *alloc, struct ocfs2_dinode *alloc,
struct inode *main_bm_inode, struct inode *main_bm_inode,
struct buffer_head *main_bm_bh); struct buffer_head *main_bm_bh);
static int ocfs2_local_alloc_reserve_for_window(struct ocfs2_super *osb, static int ocfs2_local_alloc_reserve_for_window(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_alloc_context **ac, struct ocfs2_alloc_context **ac,
struct inode **bitmap_inode, struct inode **bitmap_inode,
struct buffer_head **bitmap_bh); struct buffer_head **bitmap_bh);
static int ocfs2_local_alloc_new_window(struct ocfs2_super *osb, static int ocfs2_local_alloc_new_window(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct ocfs2_alloc_context *ac); struct ocfs2_alloc_context *ac);
static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb, static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
...@@ -196,7 +195,7 @@ int ocfs2_load_local_alloc(struct ocfs2_super *osb) ...@@ -196,7 +195,7 @@ int ocfs2_load_local_alloc(struct ocfs2_super *osb)
void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb) void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb)
{ {
int status; int status;
struct ocfs2_journal_handle *handle = NULL; handle_t *handle;
struct inode *local_alloc_inode = NULL; struct inode *local_alloc_inode = NULL;
struct buffer_head *bh = NULL; struct buffer_head *bh = NULL;
struct buffer_head *main_bm_bh = NULL; struct buffer_head *main_bm_bh = NULL;
...@@ -207,7 +206,7 @@ void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb) ...@@ -207,7 +206,7 @@ void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb)
mlog_entry_void(); mlog_entry_void();
if (osb->local_alloc_state == OCFS2_LA_UNUSED) if (osb->local_alloc_state == OCFS2_LA_UNUSED)
goto bail; goto out;
local_alloc_inode = local_alloc_inode =
ocfs2_get_system_file_inode(osb, ocfs2_get_system_file_inode(osb,
...@@ -216,40 +215,34 @@ void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb) ...@@ -216,40 +215,34 @@ void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb)
if (!local_alloc_inode) { if (!local_alloc_inode) {
status = -ENOENT; status = -ENOENT;
mlog_errno(status); mlog_errno(status);
goto bail; goto out;
} }
osb->local_alloc_state = OCFS2_LA_DISABLED; osb->local_alloc_state = OCFS2_LA_DISABLED;
handle = ocfs2_alloc_handle(osb);
if (!handle) {
status = -ENOMEM;
mlog_errno(status);
goto bail;
}
main_bm_inode = ocfs2_get_system_file_inode(osb, main_bm_inode = ocfs2_get_system_file_inode(osb,
GLOBAL_BITMAP_SYSTEM_INODE, GLOBAL_BITMAP_SYSTEM_INODE,
OCFS2_INVALID_SLOT); OCFS2_INVALID_SLOT);
if (!main_bm_inode) { if (!main_bm_inode) {
status = -EINVAL; status = -EINVAL;
mlog_errno(status); mlog_errno(status);
goto bail; goto out;
} }
ocfs2_handle_add_inode(handle, main_bm_inode); mutex_lock(&main_bm_inode->i_mutex);
status = ocfs2_meta_lock(main_bm_inode, handle, &main_bm_bh, 1);
status = ocfs2_meta_lock(main_bm_inode, &main_bm_bh, 1);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
goto bail; goto out_mutex;
} }
/* WINDOW_MOVE_CREDITS is a bit heavy... */ /* WINDOW_MOVE_CREDITS is a bit heavy... */
handle = ocfs2_start_trans(osb, handle, OCFS2_WINDOW_MOVE_CREDITS); handle = ocfs2_start_trans(osb, OCFS2_WINDOW_MOVE_CREDITS);
if (IS_ERR(handle)) { if (IS_ERR(handle)) {
mlog_errno(PTR_ERR(handle)); mlog_errno(PTR_ERR(handle));
handle = NULL; handle = NULL;
goto bail; goto out_unlock;
} }
bh = osb->local_alloc_bh; bh = osb->local_alloc_bh;
...@@ -258,7 +251,7 @@ void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb) ...@@ -258,7 +251,7 @@ void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb)
alloc_copy = kmalloc(bh->b_size, GFP_KERNEL); alloc_copy = kmalloc(bh->b_size, GFP_KERNEL);
if (!alloc_copy) { if (!alloc_copy) {
status = -ENOMEM; status = -ENOMEM;
goto bail; goto out_commit;
} }
memcpy(alloc_copy, alloc, bh->b_size); memcpy(alloc_copy, alloc, bh->b_size);
...@@ -266,7 +259,7 @@ void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb) ...@@ -266,7 +259,7 @@ void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb)
OCFS2_JOURNAL_ACCESS_WRITE); OCFS2_JOURNAL_ACCESS_WRITE);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
goto bail; goto out_commit;
} }
ocfs2_clear_local_alloc(alloc); ocfs2_clear_local_alloc(alloc);
...@@ -274,7 +267,7 @@ void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb) ...@@ -274,7 +267,7 @@ void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb)
status = ocfs2_journal_dirty(handle, bh); status = ocfs2_journal_dirty(handle, bh);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
goto bail; goto out_commit;
} }
brelse(bh); brelse(bh);
...@@ -286,16 +279,20 @@ void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb) ...@@ -286,16 +279,20 @@ void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb)
if (status < 0) if (status < 0)
mlog_errno(status); mlog_errno(status);
bail: out_commit:
if (handle) ocfs2_commit_trans(osb, handle);
ocfs2_commit_trans(handle);
out_unlock:
if (main_bm_bh) if (main_bm_bh)
brelse(main_bm_bh); brelse(main_bm_bh);
if (main_bm_inode) ocfs2_meta_unlock(main_bm_inode, 1);
iput(main_bm_inode);
out_mutex:
mutex_unlock(&main_bm_inode->i_mutex);
iput(main_bm_inode);
out:
if (local_alloc_inode) if (local_alloc_inode)
iput(local_alloc_inode); iput(local_alloc_inode);
...@@ -385,61 +382,59 @@ int ocfs2_complete_local_alloc_recovery(struct ocfs2_super *osb, ...@@ -385,61 +382,59 @@ int ocfs2_complete_local_alloc_recovery(struct ocfs2_super *osb,
struct ocfs2_dinode *alloc) struct ocfs2_dinode *alloc)
{ {
int status; int status;
struct ocfs2_journal_handle *handle = NULL; handle_t *handle;
struct buffer_head *main_bm_bh = NULL; struct buffer_head *main_bm_bh = NULL;
struct inode *main_bm_inode = NULL; struct inode *main_bm_inode;
mlog_entry_void(); mlog_entry_void();
handle = ocfs2_alloc_handle(osb);
if (!handle) {
status = -ENOMEM;
mlog_errno(status);
goto bail;
}
main_bm_inode = ocfs2_get_system_file_inode(osb, main_bm_inode = ocfs2_get_system_file_inode(osb,
GLOBAL_BITMAP_SYSTEM_INODE, GLOBAL_BITMAP_SYSTEM_INODE,
OCFS2_INVALID_SLOT); OCFS2_INVALID_SLOT);
if (!main_bm_inode) { if (!main_bm_inode) {
status = -EINVAL; status = -EINVAL;
mlog_errno(status); mlog_errno(status);
goto bail; goto out;
} }
ocfs2_handle_add_inode(handle, main_bm_inode); mutex_lock(&main_bm_inode->i_mutex);
status = ocfs2_meta_lock(main_bm_inode, handle, &main_bm_bh, 1);
status = ocfs2_meta_lock(main_bm_inode, &main_bm_bh, 1);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
goto bail; goto out_mutex;
} }
handle = ocfs2_start_trans(osb, handle, OCFS2_WINDOW_MOVE_CREDITS); handle = ocfs2_start_trans(osb, OCFS2_WINDOW_MOVE_CREDITS);
if (IS_ERR(handle)) { if (IS_ERR(handle)) {
status = PTR_ERR(handle); status = PTR_ERR(handle);
handle = NULL; handle = NULL;
mlog_errno(status); mlog_errno(status);
goto bail; goto out_unlock;
} }
/* we want the bitmap change to be recorded on disk asap */ /* we want the bitmap change to be recorded on disk asap */
ocfs2_handle_set_sync(handle, 1); handle->h_sync = 1;
status = ocfs2_sync_local_to_main(osb, handle, alloc, status = ocfs2_sync_local_to_main(osb, handle, alloc,
main_bm_inode, main_bm_bh); main_bm_inode, main_bm_bh);
if (status < 0) if (status < 0)
mlog_errno(status); mlog_errno(status);
bail: ocfs2_commit_trans(osb, handle);
if (handle)
ocfs2_commit_trans(handle); out_unlock:
ocfs2_meta_unlock(main_bm_inode, 1);
out_mutex:
mutex_unlock(&main_bm_inode->i_mutex);
if (main_bm_bh) if (main_bm_bh)
brelse(main_bm_bh); brelse(main_bm_bh);
if (main_bm_inode) iput(main_bm_inode);
iput(main_bm_inode);
out:
mlog_exit(status); mlog_exit(status);
return status; return status;
} }
...@@ -452,7 +447,6 @@ int ocfs2_complete_local_alloc_recovery(struct ocfs2_super *osb, ...@@ -452,7 +447,6 @@ int ocfs2_complete_local_alloc_recovery(struct ocfs2_super *osb,
* our own in order to shift windows. * our own in order to shift windows.
*/ */
int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb, int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb,
struct ocfs2_journal_handle *passed_handle,
u32 bits_wanted, u32 bits_wanted,
struct ocfs2_alloc_context *ac) struct ocfs2_alloc_context *ac)
{ {
...@@ -463,9 +457,7 @@ int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb, ...@@ -463,9 +457,7 @@ int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb,
mlog_entry_void(); mlog_entry_void();
BUG_ON(!passed_handle);
BUG_ON(!ac); BUG_ON(!ac);
BUG_ON(passed_handle->flags & OCFS2_HANDLE_STARTED);
local_alloc_inode = local_alloc_inode =
ocfs2_get_system_file_inode(osb, ocfs2_get_system_file_inode(osb,
...@@ -476,7 +468,11 @@ int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb, ...@@ -476,7 +468,11 @@ int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb,
mlog_errno(status); mlog_errno(status);
goto bail; goto bail;
} }
ocfs2_handle_add_inode(passed_handle, local_alloc_inode);
mutex_lock(&local_alloc_inode->i_mutex);
ac->ac_inode = local_alloc_inode;
ac->ac_which = OCFS2_AC_USE_LOCAL;
if (osb->local_alloc_state != OCFS2_LA_ENABLED) { if (osb->local_alloc_state != OCFS2_LA_ENABLED) {
status = -ENOSPC; status = -ENOSPC;
...@@ -515,21 +511,17 @@ int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb, ...@@ -515,21 +511,17 @@ int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb,
} }
} }
ac->ac_inode = igrab(local_alloc_inode);
get_bh(osb->local_alloc_bh); get_bh(osb->local_alloc_bh);
ac->ac_bh = osb->local_alloc_bh; ac->ac_bh = osb->local_alloc_bh;
ac->ac_which = OCFS2_AC_USE_LOCAL;
status = 0; status = 0;
bail: bail:
if (local_alloc_inode)
iput(local_alloc_inode);
mlog_exit(status); mlog_exit(status);
return status; return status;
} }
int ocfs2_claim_local_alloc_bits(struct ocfs2_super *osb, int ocfs2_claim_local_alloc_bits(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct ocfs2_alloc_context *ac, struct ocfs2_alloc_context *ac,
u32 min_bits, u32 min_bits,
u32 *bit_off, u32 *bit_off,
...@@ -707,7 +699,7 @@ static void ocfs2_verify_zero_bits(unsigned long *bitmap, ...@@ -707,7 +699,7 @@ static void ocfs2_verify_zero_bits(unsigned long *bitmap,
* passed is used for caching. * passed is used for caching.
*/ */
static int ocfs2_sync_local_to_main(struct ocfs2_super *osb, static int ocfs2_sync_local_to_main(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct ocfs2_dinode *alloc, struct ocfs2_dinode *alloc,
struct inode *main_bm_inode, struct inode *main_bm_inode,
struct buffer_head *main_bm_bh) struct buffer_head *main_bm_bh)
...@@ -778,7 +770,6 @@ static int ocfs2_sync_local_to_main(struct ocfs2_super *osb, ...@@ -778,7 +770,6 @@ static int ocfs2_sync_local_to_main(struct ocfs2_super *osb,
} }
static int ocfs2_local_alloc_reserve_for_window(struct ocfs2_super *osb, static int ocfs2_local_alloc_reserve_for_window(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_alloc_context **ac, struct ocfs2_alloc_context **ac,
struct inode **bitmap_inode, struct inode **bitmap_inode,
struct buffer_head **bitmap_bh) struct buffer_head **bitmap_bh)
...@@ -792,7 +783,6 @@ static int ocfs2_local_alloc_reserve_for_window(struct ocfs2_super *osb, ...@@ -792,7 +783,6 @@ static int ocfs2_local_alloc_reserve_for_window(struct ocfs2_super *osb,
goto bail; goto bail;
} }
(*ac)->ac_handle = handle;
(*ac)->ac_bits_wanted = ocfs2_local_alloc_window_bits(osb); (*ac)->ac_bits_wanted = ocfs2_local_alloc_window_bits(osb);
status = ocfs2_reserve_cluster_bitmap_bits(osb, *ac); status = ocfs2_reserve_cluster_bitmap_bits(osb, *ac);
...@@ -821,7 +811,7 @@ static int ocfs2_local_alloc_reserve_for_window(struct ocfs2_super *osb, ...@@ -821,7 +811,7 @@ static int ocfs2_local_alloc_reserve_for_window(struct ocfs2_super *osb,
* pass it the bitmap lock in lock_bh if you have it. * pass it the bitmap lock in lock_bh if you have it.
*/ */
static int ocfs2_local_alloc_new_window(struct ocfs2_super *osb, static int ocfs2_local_alloc_new_window(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct ocfs2_alloc_context *ac) struct ocfs2_alloc_context *ac)
{ {
int status = 0; int status = 0;
...@@ -888,23 +878,15 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb, ...@@ -888,23 +878,15 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
int status = 0; int status = 0;
struct buffer_head *main_bm_bh = NULL; struct buffer_head *main_bm_bh = NULL;
struct inode *main_bm_inode = NULL; struct inode *main_bm_inode = NULL;
struct ocfs2_journal_handle *handle = NULL; handle_t *handle = NULL;
struct ocfs2_dinode *alloc; struct ocfs2_dinode *alloc;
struct ocfs2_dinode *alloc_copy = NULL; struct ocfs2_dinode *alloc_copy = NULL;
struct ocfs2_alloc_context *ac = NULL; struct ocfs2_alloc_context *ac = NULL;
mlog_entry_void(); mlog_entry_void();
handle = ocfs2_alloc_handle(osb);
if (!handle) {
status = -ENOMEM;
mlog_errno(status);
goto bail;
}
/* This will lock the main bitmap for us. */ /* This will lock the main bitmap for us. */
status = ocfs2_local_alloc_reserve_for_window(osb, status = ocfs2_local_alloc_reserve_for_window(osb,
handle,
&ac, &ac,
&main_bm_inode, &main_bm_inode,
&main_bm_bh); &main_bm_bh);
...@@ -914,7 +896,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb, ...@@ -914,7 +896,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
goto bail; goto bail;
} }
handle = ocfs2_start_trans(osb, handle, OCFS2_WINDOW_MOVE_CREDITS); handle = ocfs2_start_trans(osb, OCFS2_WINDOW_MOVE_CREDITS);
if (IS_ERR(handle)) { if (IS_ERR(handle)) {
status = PTR_ERR(handle); status = PTR_ERR(handle);
handle = NULL; handle = NULL;
...@@ -972,7 +954,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb, ...@@ -972,7 +954,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
status = 0; status = 0;
bail: bail:
if (handle) if (handle)
ocfs2_commit_trans(handle); ocfs2_commit_trans(osb, handle);
if (main_bm_bh) if (main_bm_bh)
brelse(main_bm_bh); brelse(main_bm_bh);
......
fs/ocfs2/localalloc.h
View file @ 651857a1
...@@ -42,12 +42,11 @@ int ocfs2_alloc_should_use_local(struct ocfs2_super *osb, ...@@ -42,12 +42,11 @@ int ocfs2_alloc_should_use_local(struct ocfs2_super *osb,
struct ocfs2_alloc_context; struct ocfs2_alloc_context;
int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb, int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb,
struct ocfs2_journal_handle *passed_handle,
u32 bits_wanted, u32 bits_wanted,
struct ocfs2_alloc_context *ac); struct ocfs2_alloc_context *ac);
int ocfs2_claim_local_alloc_bits(struct ocfs2_super *osb, int ocfs2_claim_local_alloc_bits(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct ocfs2_alloc_context *ac, struct ocfs2_alloc_context *ac,
u32 min_bits, u32 min_bits,
u32 *bit_off, u32 *bit_off,
......
fs/ocfs2/mmap.c
View file @ 651857a1
...@@ -82,6 +82,8 @@ static struct vm_operations_struct ocfs2_file_vm_ops = { ...@@ -82,6 +82,8 @@ static struct vm_operations_struct ocfs2_file_vm_ops = {
int ocfs2_mmap(struct file *file, struct vm_area_struct *vma) int ocfs2_mmap(struct file *file, struct vm_area_struct *vma)
{ {
int ret = 0, lock_level = 0;
/* We don't want to support shared writable mappings yet. */ /* We don't want to support shared writable mappings yet. */
if (((vma->vm_flags & VM_SHARED) || (vma->vm_flags & VM_MAYSHARE)) if (((vma->vm_flags & VM_SHARED) || (vma->vm_flags & VM_MAYSHARE))
&& ((vma->vm_flags & VM_WRITE) || (vma->vm_flags & VM_MAYWRITE))) { && ((vma->vm_flags & VM_WRITE) || (vma->vm_flags & VM_MAYWRITE))) {
...@@ -91,7 +93,14 @@ int ocfs2_mmap(struct file *file, struct vm_area_struct *vma) ...@@ -91,7 +93,14 @@ int ocfs2_mmap(struct file *file, struct vm_area_struct *vma)
return -EINVAL; return -EINVAL;
} }
file_accessed(file); ret = ocfs2_meta_lock_atime(file->f_dentry->d_inode,
file->f_vfsmnt, &lock_level);
if (ret < 0) {
mlog_errno(ret);
goto out;
}
ocfs2_meta_unlock(file->f_dentry->d_inode, lock_level);
out:
vma->vm_ops = &ocfs2_file_vm_ops; vma->vm_ops = &ocfs2_file_vm_ops;
return 0; return 0;
} }
......
fs/ocfs2/namei.c
View file @ 651857a1
...@@ -75,12 +75,12 @@ static int inline ocfs2_search_dirblock(struct buffer_head *bh, ...@@ -75,12 +75,12 @@ static int inline ocfs2_search_dirblock(struct buffer_head *bh,
unsigned long offset, unsigned long offset,
struct ocfs2_dir_entry **res_dir); struct ocfs2_dir_entry **res_dir);
static int ocfs2_delete_entry(struct ocfs2_journal_handle *handle, static int ocfs2_delete_entry(handle_t *handle,
struct inode *dir, struct inode *dir,
struct ocfs2_dir_entry *de_del, struct ocfs2_dir_entry *de_del,
struct buffer_head *bh); struct buffer_head *bh);
static int __ocfs2_add_entry(struct ocfs2_journal_handle *handle, static int __ocfs2_add_entry(handle_t *handle,
struct inode *dir, struct inode *dir,
const char *name, int namelen, const char *name, int namelen,
struct inode *inode, u64 blkno, struct inode *inode, u64 blkno,
...@@ -93,43 +93,37 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb, ...@@ -93,43 +93,37 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb,
dev_t dev, dev_t dev,
struct buffer_head **new_fe_bh, struct buffer_head **new_fe_bh,
struct buffer_head *parent_fe_bh, struct buffer_head *parent_fe_bh,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode **ret_inode, struct inode **ret_inode,
struct ocfs2_alloc_context *inode_ac); struct ocfs2_alloc_context *inode_ac);
static int ocfs2_fill_new_dir(struct ocfs2_super *osb, static int ocfs2_fill_new_dir(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode *parent, struct inode *parent,
struct inode *inode, struct inode *inode,
struct buffer_head *fe_bh, struct buffer_head *fe_bh,
struct ocfs2_alloc_context *data_ac); struct ocfs2_alloc_context *data_ac);
static int ocfs2_double_lock(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct buffer_head **bh1,
struct inode *inode1,
struct buffer_head **bh2,
struct inode *inode2);
static int ocfs2_prepare_orphan_dir(struct ocfs2_super *osb, static int ocfs2_prepare_orphan_dir(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, struct inode **ret_orphan_dir,
struct inode *inode, struct inode *inode,
char *name, char *name,
struct buffer_head **de_bh); struct buffer_head **de_bh);
static int ocfs2_orphan_add(struct ocfs2_super *osb, static int ocfs2_orphan_add(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode *inode, struct inode *inode,
struct ocfs2_dinode *fe, struct ocfs2_dinode *fe,
char *name, char *name,
struct buffer_head *de_bh); struct buffer_head *de_bh,
struct inode *orphan_dir_inode);
static int ocfs2_create_symlink_data(struct ocfs2_super *osb, static int ocfs2_create_symlink_data(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode *inode, struct inode *inode,
const char *symname); const char *symname);
static inline int ocfs2_add_entry(struct ocfs2_journal_handle *handle, static inline int ocfs2_add_entry(handle_t *handle,
struct dentry *dentry, struct dentry *dentry,
struct inode *inode, u64 blkno, struct inode *inode, u64 blkno,
struct buffer_head *parent_fe_bh, struct buffer_head *parent_fe_bh,
...@@ -165,7 +159,7 @@ static struct dentry *ocfs2_lookup(struct inode *dir, struct dentry *dentry, ...@@ -165,7 +159,7 @@ static struct dentry *ocfs2_lookup(struct inode *dir, struct dentry *dentry,
mlog(0, "find name %.*s in directory %llu\n", dentry->d_name.len, mlog(0, "find name %.*s in directory %llu\n", dentry->d_name.len,
dentry->d_name.name, (unsigned long long)OCFS2_I(dir)->ip_blkno); dentry->d_name.name, (unsigned long long)OCFS2_I(dir)->ip_blkno);
status = ocfs2_meta_lock(dir, NULL, NULL, 0); status = ocfs2_meta_lock(dir, NULL, 0);
if (status < 0) { if (status < 0) {
if (status != -ENOENT) if (status != -ENOENT)
mlog_errno(status); mlog_errno(status);
...@@ -242,7 +236,7 @@ static struct dentry *ocfs2_lookup(struct inode *dir, struct dentry *dentry, ...@@ -242,7 +236,7 @@ static struct dentry *ocfs2_lookup(struct inode *dir, struct dentry *dentry,
} }
static int ocfs2_fill_new_dir(struct ocfs2_super *osb, static int ocfs2_fill_new_dir(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode *parent, struct inode *parent,
struct inode *inode, struct inode *inode,
struct buffer_head *fe_bh, struct buffer_head *fe_bh,
...@@ -317,7 +311,7 @@ static int ocfs2_mknod(struct inode *dir, ...@@ -317,7 +311,7 @@ static int ocfs2_mknod(struct inode *dir,
{ {
int status = 0; int status = 0;
struct buffer_head *parent_fe_bh = NULL; struct buffer_head *parent_fe_bh = NULL;
struct ocfs2_journal_handle *handle = NULL; handle_t *handle = NULL;
struct ocfs2_super *osb; struct ocfs2_super *osb;
struct ocfs2_dinode *dirfe; struct ocfs2_dinode *dirfe;
struct buffer_head *new_fe_bh = NULL; struct buffer_head *new_fe_bh = NULL;
...@@ -333,18 +327,11 @@ static int ocfs2_mknod(struct inode *dir, ...@@ -333,18 +327,11 @@ static int ocfs2_mknod(struct inode *dir,
/* get our super block */ /* get our super block */
osb = OCFS2_SB(dir->i_sb); osb = OCFS2_SB(dir->i_sb);
handle = ocfs2_alloc_handle(osb); status = ocfs2_meta_lock(dir, &parent_fe_bh, 1);
if (handle == NULL) {
status = -ENOMEM;
mlog_errno(status);
goto leave;
}
status = ocfs2_meta_lock(dir, handle, &parent_fe_bh, 1);
if (status < 0) { if (status < 0) {
if (status != -ENOENT) if (status != -ENOENT)
mlog_errno(status); mlog_errno(status);
goto leave; return status;
} }
if (S_ISDIR(mode) && (dir->i_nlink >= OCFS2_LINK_MAX)) { if (S_ISDIR(mode) && (dir->i_nlink >= OCFS2_LINK_MAX)) {
...@@ -374,7 +361,7 @@ static int ocfs2_mknod(struct inode *dir, ...@@ -374,7 +361,7 @@ static int ocfs2_mknod(struct inode *dir,
} }
/* reserve an inode spot */ /* reserve an inode spot */
status = ocfs2_reserve_new_inode(osb, handle, &inode_ac); status = ocfs2_reserve_new_inode(osb, &inode_ac);
if (status < 0) { if (status < 0) {
if (status != -ENOSPC) if (status != -ENOSPC)
mlog_errno(status); mlog_errno(status);
...@@ -384,7 +371,7 @@ static int ocfs2_mknod(struct inode *dir, ...@@ -384,7 +371,7 @@ static int ocfs2_mknod(struct inode *dir,
/* are we making a directory? If so, reserve a cluster for his /* are we making a directory? If so, reserve a cluster for his
* 1st extent. */ * 1st extent. */
if (S_ISDIR(mode)) { if (S_ISDIR(mode)) {
status = ocfs2_reserve_clusters(osb, handle, 1, &data_ac); status = ocfs2_reserve_clusters(osb, 1, &data_ac);
if (status < 0) { if (status < 0) {
if (status != -ENOSPC) if (status != -ENOSPC)
mlog_errno(status); mlog_errno(status);
...@@ -392,7 +379,7 @@ static int ocfs2_mknod(struct inode *dir, ...@@ -392,7 +379,7 @@ static int ocfs2_mknod(struct inode *dir,
} }
} }
handle = ocfs2_start_trans(osb, handle, OCFS2_MKNOD_CREDITS); handle = ocfs2_start_trans(osb, OCFS2_MKNOD_CREDITS);
if (IS_ERR(handle)) { if (IS_ERR(handle)) {
status = PTR_ERR(handle); status = PTR_ERR(handle);
handle = NULL; handle = NULL;
...@@ -453,7 +440,9 @@ static int ocfs2_mknod(struct inode *dir, ...@@ -453,7 +440,9 @@ static int ocfs2_mknod(struct inode *dir,
status = 0; status = 0;
leave: leave:
if (handle) if (handle)
ocfs2_commit_trans(handle); ocfs2_commit_trans(osb, handle);
ocfs2_meta_unlock(dir, 1);
if (status == -ENOSPC) if (status == -ENOSPC)
mlog(0, "Disk is full\n"); mlog(0, "Disk is full\n");
...@@ -487,7 +476,7 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb, ...@@ -487,7 +476,7 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb,
dev_t dev, dev_t dev,
struct buffer_head **new_fe_bh, struct buffer_head **new_fe_bh,
struct buffer_head *parent_fe_bh, struct buffer_head *parent_fe_bh,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode **ret_inode, struct inode **ret_inode,
struct ocfs2_alloc_context *inode_ac) struct ocfs2_alloc_context *inode_ac)
{ {
...@@ -653,7 +642,7 @@ static int ocfs2_link(struct dentry *old_dentry, ...@@ -653,7 +642,7 @@ static int ocfs2_link(struct dentry *old_dentry,
struct inode *dir, struct inode *dir,
struct dentry *dentry) struct dentry *dentry)
{ {
struct ocfs2_journal_handle *handle = NULL; handle_t *handle;
struct inode *inode = old_dentry->d_inode; struct inode *inode = old_dentry->d_inode;
int err; int err;
struct buffer_head *fe_bh = NULL; struct buffer_head *fe_bh = NULL;
...@@ -666,68 +655,60 @@ static int ocfs2_link(struct dentry *old_dentry, ...@@ -666,68 +655,60 @@ static int ocfs2_link(struct dentry *old_dentry,
old_dentry->d_name.len, old_dentry->d_name.name, old_dentry->d_name.len, old_dentry->d_name.name,
dentry->d_name.len, dentry->d_name.name); dentry->d_name.len, dentry->d_name.name);
if (S_ISDIR(inode->i_mode)) { if (S_ISDIR(inode->i_mode))
err = -EPERM; return -EPERM;
goto bail;
}
handle = ocfs2_alloc_handle(osb);
if (handle == NULL) {
err = -ENOMEM;
goto bail;
}
err = ocfs2_meta_lock(dir, handle, &parent_fe_bh, 1); err = ocfs2_meta_lock(dir, &parent_fe_bh, 1);
if (err < 0) { if (err < 0) {
if (err != -ENOENT) if (err != -ENOENT)
mlog_errno(err); mlog_errno(err);
goto bail; return err;
} }
if (!dir->i_nlink) { if (!dir->i_nlink) {
err = -ENOENT; err = -ENOENT;
goto bail; goto out;
} }
err = ocfs2_check_dir_for_entry(dir, dentry->d_name.name, err = ocfs2_check_dir_for_entry(dir, dentry->d_name.name,
dentry->d_name.len); dentry->d_name.len);
if (err) if (err)
goto bail; goto out;
err = ocfs2_prepare_dir_for_insert(osb, dir, parent_fe_bh, err = ocfs2_prepare_dir_for_insert(osb, dir, parent_fe_bh,
dentry->d_name.name, dentry->d_name.name,
dentry->d_name.len, &de_bh); dentry->d_name.len, &de_bh);
if (err < 0) { if (err < 0) {
mlog_errno(err); mlog_errno(err);
goto bail; goto out;
} }
err = ocfs2_meta_lock(inode, handle, &fe_bh, 1); err = ocfs2_meta_lock(inode, &fe_bh, 1);
if (err < 0) { if (err < 0) {
if (err != -ENOENT) if (err != -ENOENT)
mlog_errno(err); mlog_errno(err);
goto bail; goto out;
} }
fe = (struct ocfs2_dinode *) fe_bh->b_data; fe = (struct ocfs2_dinode *) fe_bh->b_data;
if (le16_to_cpu(fe->i_links_count) >= OCFS2_LINK_MAX) { if (le16_to_cpu(fe->i_links_count) >= OCFS2_LINK_MAX) {
err = -EMLINK; err = -EMLINK;
goto bail; goto out_unlock_inode;
} }
handle = ocfs2_start_trans(osb, handle, OCFS2_LINK_CREDITS); handle = ocfs2_start_trans(osb, OCFS2_LINK_CREDITS);
if (IS_ERR(handle)) { if (IS_ERR(handle)) {
err = PTR_ERR(handle); err = PTR_ERR(handle);
handle = NULL; handle = NULL;
mlog_errno(err); mlog_errno(err);
goto bail; goto out_unlock_inode;
} }
err = ocfs2_journal_access(handle, inode, fe_bh, err = ocfs2_journal_access(handle, inode, fe_bh,
OCFS2_JOURNAL_ACCESS_WRITE); OCFS2_JOURNAL_ACCESS_WRITE);
if (err < 0) { if (err < 0) {
mlog_errno(err); mlog_errno(err);
goto bail; goto out_commit;
} }
inc_nlink(inode); inc_nlink(inode);
...@@ -741,7 +722,7 @@ static int ocfs2_link(struct dentry *old_dentry, ...@@ -741,7 +722,7 @@ static int ocfs2_link(struct dentry *old_dentry,
le16_add_cpu(&fe->i_links_count, -1); le16_add_cpu(&fe->i_links_count, -1);
drop_nlink(inode); drop_nlink(inode);
mlog_errno(err); mlog_errno(err);
goto bail; goto out_commit;
} }
err = ocfs2_add_entry(handle, dentry, inode, err = ocfs2_add_entry(handle, dentry, inode,
...@@ -751,21 +732,27 @@ static int ocfs2_link(struct dentry *old_dentry, ...@@ -751,21 +732,27 @@ static int ocfs2_link(struct dentry *old_dentry,
le16_add_cpu(&fe->i_links_count, -1); le16_add_cpu(&fe->i_links_count, -1);
drop_nlink(inode); drop_nlink(inode);
mlog_errno(err); mlog_errno(err);
goto bail; goto out_commit;
} }
err = ocfs2_dentry_attach_lock(dentry, inode, OCFS2_I(dir)->ip_blkno); err = ocfs2_dentry_attach_lock(dentry, inode, OCFS2_I(dir)->ip_blkno);
if (err) { if (err) {
mlog_errno(err); mlog_errno(err);
goto bail; goto out_commit;
} }
atomic_inc(&inode->i_count); atomic_inc(&inode->i_count);
dentry->d_op = &ocfs2_dentry_ops; dentry->d_op = &ocfs2_dentry_ops;
d_instantiate(dentry, inode); d_instantiate(dentry, inode);
bail:
if (handle) out_commit:
ocfs2_commit_trans(handle); ocfs2_commit_trans(osb, handle);
out_unlock_inode:
ocfs2_meta_unlock(inode, 1);
out:
ocfs2_meta_unlock(dir, 1);
if (de_bh) if (de_bh)
brelse(de_bh); brelse(de_bh);
if (fe_bh) if (fe_bh)
...@@ -812,13 +799,15 @@ static int ocfs2_unlink(struct inode *dir, ...@@ -812,13 +799,15 @@ static int ocfs2_unlink(struct inode *dir,
struct dentry *dentry) struct dentry *dentry)
{ {
int status; int status;
int child_locked = 0;
struct inode *inode = dentry->d_inode; struct inode *inode = dentry->d_inode;
struct inode *orphan_dir = NULL;
struct ocfs2_super *osb = OCFS2_SB(dir->i_sb); struct ocfs2_super *osb = OCFS2_SB(dir->i_sb);
u64 blkno; u64 blkno;
struct ocfs2_dinode *fe = NULL; struct ocfs2_dinode *fe = NULL;
struct buffer_head *fe_bh = NULL; struct buffer_head *fe_bh = NULL;
struct buffer_head *parent_node_bh = NULL; struct buffer_head *parent_node_bh = NULL;
struct ocfs2_journal_handle *handle = NULL; handle_t *handle = NULL;
struct ocfs2_dir_entry *dirent = NULL; struct ocfs2_dir_entry *dirent = NULL;
struct buffer_head *dirent_bh = NULL; struct buffer_head *dirent_bh = NULL;
char orphan_name[OCFS2_ORPHAN_NAMELEN + 1]; char orphan_name[OCFS2_ORPHAN_NAMELEN + 1];
...@@ -833,22 +822,14 @@ static int ocfs2_unlink(struct inode *dir, ...@@ -833,22 +822,14 @@ static int ocfs2_unlink(struct inode *dir,
if (inode == osb->root_inode) { if (inode == osb->root_inode) {
mlog(0, "Cannot delete the root directory\n"); mlog(0, "Cannot delete the root directory\n");
status = -EPERM; return -EPERM;
goto leave;
} }
handle = ocfs2_alloc_handle(osb); status = ocfs2_meta_lock(dir, &parent_node_bh, 1);
if (handle == NULL) {
status = -ENOMEM;
mlog_errno(status);
goto leave;
}
status = ocfs2_meta_lock(dir, handle, &parent_node_bh, 1);
if (status < 0) { if (status < 0) {
if (status != -ENOENT) if (status != -ENOENT)
mlog_errno(status); mlog_errno(status);
goto leave; return status;
} }
status = ocfs2_find_files_on_disk(dentry->d_name.name, status = ocfs2_find_files_on_disk(dentry->d_name.name,
...@@ -869,12 +850,13 @@ static int ocfs2_unlink(struct inode *dir, ...@@ -869,12 +850,13 @@ static int ocfs2_unlink(struct inode *dir,
goto leave; goto leave;
} }
status = ocfs2_meta_lock(inode, handle, &fe_bh, 1); status = ocfs2_meta_lock(inode, &fe_bh, 1);
if (status < 0) { if (status < 0) {
if (status != -ENOENT) if (status != -ENOENT)
mlog_errno(status); mlog_errno(status);
goto leave; goto leave;
} }
child_locked = 1;
if (S_ISDIR(inode->i_mode)) { if (S_ISDIR(inode->i_mode)) {
if (!ocfs2_empty_dir(inode)) { if (!ocfs2_empty_dir(inode)) {
...@@ -895,7 +877,7 @@ static int ocfs2_unlink(struct inode *dir, ...@@ -895,7 +877,7 @@ static int ocfs2_unlink(struct inode *dir,
} }
if (inode_is_unlinkable(inode)) { if (inode_is_unlinkable(inode)) {
status = ocfs2_prepare_orphan_dir(osb, handle, inode, status = ocfs2_prepare_orphan_dir(osb, &orphan_dir, inode,
orphan_name, orphan_name,
&orphan_entry_bh); &orphan_entry_bh);
if (status < 0) { if (status < 0) {
...@@ -904,7 +886,7 @@ static int ocfs2_unlink(struct inode *dir, ...@@ -904,7 +886,7 @@ static int ocfs2_unlink(struct inode *dir,
} }
} }
handle = ocfs2_start_trans(osb, handle, OCFS2_UNLINK_CREDITS); handle = ocfs2_start_trans(osb, OCFS2_UNLINK_CREDITS);
if (IS_ERR(handle)) { if (IS_ERR(handle)) {
status = PTR_ERR(handle); status = PTR_ERR(handle);
handle = NULL; handle = NULL;
...@@ -923,7 +905,7 @@ static int ocfs2_unlink(struct inode *dir, ...@@ -923,7 +905,7 @@ static int ocfs2_unlink(struct inode *dir,
if (inode_is_unlinkable(inode)) { if (inode_is_unlinkable(inode)) {
status = ocfs2_orphan_add(osb, handle, inode, fe, orphan_name, status = ocfs2_orphan_add(osb, handle, inode, fe, orphan_name,
orphan_entry_bh); orphan_entry_bh, orphan_dir);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
goto leave; goto leave;
...@@ -960,7 +942,19 @@ static int ocfs2_unlink(struct inode *dir, ...@@ -960,7 +942,19 @@ static int ocfs2_unlink(struct inode *dir,
leave: leave:
if (handle) if (handle)
ocfs2_commit_trans(handle); ocfs2_commit_trans(osb, handle);
if (child_locked)
ocfs2_meta_unlock(inode, 1);
ocfs2_meta_unlock(dir, 1);
if (orphan_dir) {
/* This was locked for us in ocfs2_prepare_orphan_dir() */
ocfs2_meta_unlock(orphan_dir, 1);
mutex_unlock(&orphan_dir->i_mutex);
iput(orphan_dir);
}
if (fe_bh) if (fe_bh)
brelse(fe_bh); brelse(fe_bh);
...@@ -984,7 +978,6 @@ static int ocfs2_unlink(struct inode *dir, ...@@ -984,7 +978,6 @@ static int ocfs2_unlink(struct inode *dir,
* if they have the same id, then the 1st one is the only one locked. * if they have the same id, then the 1st one is the only one locked.
*/ */
static int ocfs2_double_lock(struct ocfs2_super *osb, static int ocfs2_double_lock(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct buffer_head **bh1, struct buffer_head **bh1,
struct inode *inode1, struct inode *inode1,
struct buffer_head **bh2, struct buffer_head **bh2,
...@@ -1000,8 +993,6 @@ static int ocfs2_double_lock(struct ocfs2_super *osb, ...@@ -1000,8 +993,6 @@ static int ocfs2_double_lock(struct ocfs2_super *osb,
(unsigned long long)oi1->ip_blkno, (unsigned long long)oi1->ip_blkno,
(unsigned long long)oi2->ip_blkno); (unsigned long long)oi2->ip_blkno);
BUG_ON(!handle);
if (*bh1) if (*bh1)
*bh1 = NULL; *bh1 = NULL;
if (*bh2) if (*bh2)
...@@ -1021,25 +1012,41 @@ static int ocfs2_double_lock(struct ocfs2_super *osb, ...@@ -1021,25 +1012,41 @@ static int ocfs2_double_lock(struct ocfs2_super *osb,
inode1 = tmpinode; inode1 = tmpinode;
} }
/* lock id2 */ /* lock id2 */
status = ocfs2_meta_lock(inode2, handle, bh2, 1); status = ocfs2_meta_lock(inode2, bh2, 1);
if (status < 0) { if (status < 0) {
if (status != -ENOENT) if (status != -ENOENT)
mlog_errno(status); mlog_errno(status);
goto bail; goto bail;
} }
} }
/* lock id1 */ /* lock id1 */
status = ocfs2_meta_lock(inode1, handle, bh1, 1); status = ocfs2_meta_lock(inode1, bh1, 1);
if (status < 0) { if (status < 0) {
/*
* An error return must mean that no cluster locks
* were held on function exit.
*/
if (oi1->ip_blkno != oi2->ip_blkno)
ocfs2_meta_unlock(inode2, 1);
if (status != -ENOENT) if (status != -ENOENT)
mlog_errno(status); mlog_errno(status);
goto bail;
} }
bail: bail:
mlog_exit(status); mlog_exit(status);
return status; return status;
} }
static void ocfs2_double_unlock(struct inode *inode1, struct inode *inode2)
{
ocfs2_meta_unlock(inode1, 1);
if (inode1 != inode2)
ocfs2_meta_unlock(inode2, 1);
}
#define PARENT_INO(buffer) \ #define PARENT_INO(buffer) \
((struct ocfs2_dir_entry *) \ ((struct ocfs2_dir_entry *) \
((char *)buffer + \ ((char *)buffer + \
...@@ -1050,9 +1057,11 @@ static int ocfs2_rename(struct inode *old_dir, ...@@ -1050,9 +1057,11 @@ static int ocfs2_rename(struct inode *old_dir,
struct inode *new_dir, struct inode *new_dir,
struct dentry *new_dentry) struct dentry *new_dentry)
{ {
int status = 0, rename_lock = 0; int status = 0, rename_lock = 0, parents_locked = 0;
int old_child_locked = 0, new_child_locked = 0;
struct inode *old_inode = old_dentry->d_inode; struct inode *old_inode = old_dentry->d_inode;
struct inode *new_inode = new_dentry->d_inode; struct inode *new_inode = new_dentry->d_inode;
struct inode *orphan_dir = NULL;
struct ocfs2_dinode *newfe = NULL; struct ocfs2_dinode *newfe = NULL;
char orphan_name[OCFS2_ORPHAN_NAMELEN + 1]; char orphan_name[OCFS2_ORPHAN_NAMELEN + 1];
struct buffer_head *orphan_entry_bh = NULL; struct buffer_head *orphan_entry_bh = NULL;
...@@ -1060,7 +1069,7 @@ static int ocfs2_rename(struct inode *old_dir, ...@@ -1060,7 +1069,7 @@ static int ocfs2_rename(struct inode *old_dir,
struct buffer_head *insert_entry_bh = NULL; struct buffer_head *insert_entry_bh = NULL;
struct ocfs2_super *osb = NULL; struct ocfs2_super *osb = NULL;
u64 newfe_blkno; u64 newfe_blkno;
struct ocfs2_journal_handle *handle = NULL; handle_t *handle = NULL;
struct buffer_head *old_dir_bh = NULL; struct buffer_head *old_dir_bh = NULL;
struct buffer_head *new_dir_bh = NULL; struct buffer_head *new_dir_bh = NULL;
struct ocfs2_dir_entry *old_de = NULL, *new_de = NULL; // dirent for old_dentry struct ocfs2_dir_entry *old_de = NULL, *new_de = NULL; // dirent for old_dentry
...@@ -1105,21 +1114,14 @@ static int ocfs2_rename(struct inode *old_dir, ...@@ -1105,21 +1114,14 @@ static int ocfs2_rename(struct inode *old_dir,
rename_lock = 1; rename_lock = 1;
} }
handle = ocfs2_alloc_handle(osb);
if (handle == NULL) {
status = -ENOMEM;
mlog_errno(status);
goto bail;
}
/* if old and new are the same, this'll just do one lock. */ /* if old and new are the same, this'll just do one lock. */
status = ocfs2_double_lock(osb, handle, status = ocfs2_double_lock(osb, &old_dir_bh, old_dir,
&old_dir_bh, old_dir, &new_dir_bh, new_dir);
&new_dir_bh, new_dir);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
goto bail; goto bail;
} }
parents_locked = 1;
/* make sure both dirs have bhs /* make sure both dirs have bhs
* get an extra ref on old_dir_bh if old==new */ * get an extra ref on old_dir_bh if old==new */
...@@ -1140,12 +1142,13 @@ static int ocfs2_rename(struct inode *old_dir, ...@@ -1140,12 +1142,13 @@ static int ocfs2_rename(struct inode *old_dir,
* the vote thread on other nodes won't have to concurrently * the vote thread on other nodes won't have to concurrently
* downconvert the inode and the dentry locks. * downconvert the inode and the dentry locks.
*/ */
status = ocfs2_meta_lock(old_inode, handle, NULL, 1); status = ocfs2_meta_lock(old_inode, NULL, 1);
if (status < 0) { if (status < 0) {
if (status != -ENOENT) if (status != -ENOENT)
mlog_errno(status); mlog_errno(status);
goto bail; goto bail;
} }
old_child_locked = 1;
status = ocfs2_remote_dentry_delete(old_dentry); status = ocfs2_remote_dentry_delete(old_dentry);
if (status < 0) { if (status < 0) {
...@@ -1231,12 +1234,13 @@ static int ocfs2_rename(struct inode *old_dir, ...@@ -1231,12 +1234,13 @@ static int ocfs2_rename(struct inode *old_dir,
goto bail; goto bail;
} }
status = ocfs2_meta_lock(new_inode, handle, &newfe_bh, 1); status = ocfs2_meta_lock(new_inode, &newfe_bh, 1);
if (status < 0) { if (status < 0) {
if (status != -ENOENT) if (status != -ENOENT)
mlog_errno(status); mlog_errno(status);
goto bail; goto bail;
} }
new_child_locked = 1;
status = ocfs2_remote_dentry_delete(new_dentry); status = ocfs2_remote_dentry_delete(new_dentry);
if (status < 0) { if (status < 0) {
...@@ -1252,7 +1256,7 @@ static int ocfs2_rename(struct inode *old_dir, ...@@ -1252,7 +1256,7 @@ static int ocfs2_rename(struct inode *old_dir,
(unsigned long long)newfe_bh->b_blocknr : 0ULL); (unsigned long long)newfe_bh->b_blocknr : 0ULL);
if (S_ISDIR(new_inode->i_mode) || (new_inode->i_nlink == 1)) { if (S_ISDIR(new_inode->i_mode) || (new_inode->i_nlink == 1)) {
status = ocfs2_prepare_orphan_dir(osb, handle, status = ocfs2_prepare_orphan_dir(osb, &orphan_dir,
new_inode, new_inode,
orphan_name, orphan_name,
&orphan_entry_bh); &orphan_entry_bh);
...@@ -1280,7 +1284,7 @@ static int ocfs2_rename(struct inode *old_dir, ...@@ -1280,7 +1284,7 @@ static int ocfs2_rename(struct inode *old_dir,
} }
} }
handle = ocfs2_start_trans(osb, handle, OCFS2_RENAME_CREDITS); handle = ocfs2_start_trans(osb, OCFS2_RENAME_CREDITS);
if (IS_ERR(handle)) { if (IS_ERR(handle)) {
status = PTR_ERR(handle); status = PTR_ERR(handle);
handle = NULL; handle = NULL;
...@@ -1307,7 +1311,7 @@ static int ocfs2_rename(struct inode *old_dir, ...@@ -1307,7 +1311,7 @@ static int ocfs2_rename(struct inode *old_dir,
(newfe->i_links_count == cpu_to_le16(1))){ (newfe->i_links_count == cpu_to_le16(1))){
status = ocfs2_orphan_add(osb, handle, new_inode, status = ocfs2_orphan_add(osb, handle, new_inode,
newfe, orphan_name, newfe, orphan_name,
orphan_entry_bh); orphan_entry_bh, orphan_dir);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
goto bail; goto bail;
...@@ -1424,7 +1428,23 @@ static int ocfs2_rename(struct inode *old_dir, ...@@ -1424,7 +1428,23 @@ static int ocfs2_rename(struct inode *old_dir,
ocfs2_rename_unlock(osb); ocfs2_rename_unlock(osb);
if (handle) if (handle)
ocfs2_commit_trans(handle); ocfs2_commit_trans(osb, handle);
if (parents_locked)
ocfs2_double_unlock(old_dir, new_dir);
if (old_child_locked)
ocfs2_meta_unlock(old_inode, 1);
if (new_child_locked)
ocfs2_meta_unlock(new_inode, 1);
if (orphan_dir) {
/* This was locked for us in ocfs2_prepare_orphan_dir() */
ocfs2_meta_unlock(orphan_dir, 1);
mutex_unlock(&orphan_dir->i_mutex);
iput(orphan_dir);
}
if (new_inode) if (new_inode)
sync_mapping_buffers(old_inode->i_mapping); sync_mapping_buffers(old_inode->i_mapping);
...@@ -1458,7 +1478,7 @@ static int ocfs2_rename(struct inode *old_dir, ...@@ -1458,7 +1478,7 @@ static int ocfs2_rename(struct inode *old_dir,
* data, including the null terminator. * data, including the null terminator.
*/ */
static int ocfs2_create_symlink_data(struct ocfs2_super *osb, static int ocfs2_create_symlink_data(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode *inode, struct inode *inode,
const char *symname) const char *symname)
{ {
...@@ -1573,7 +1593,7 @@ static int ocfs2_symlink(struct inode *dir, ...@@ -1573,7 +1593,7 @@ static int ocfs2_symlink(struct inode *dir,
struct buffer_head *parent_fe_bh = NULL; struct buffer_head *parent_fe_bh = NULL;
struct ocfs2_dinode *fe = NULL; struct ocfs2_dinode *fe = NULL;
struct ocfs2_dinode *dirfe; struct ocfs2_dinode *dirfe;
struct ocfs2_journal_handle *handle = NULL; handle_t *handle = NULL;
struct ocfs2_alloc_context *inode_ac = NULL; struct ocfs2_alloc_context *inode_ac = NULL;
struct ocfs2_alloc_context *data_ac = NULL; struct ocfs2_alloc_context *data_ac = NULL;
...@@ -1587,19 +1607,12 @@ static int ocfs2_symlink(struct inode *dir, ...@@ -1587,19 +1607,12 @@ static int ocfs2_symlink(struct inode *dir,
credits = ocfs2_calc_symlink_credits(sb); credits = ocfs2_calc_symlink_credits(sb);
handle = ocfs2_alloc_handle(osb);
if (handle == NULL) {
status = -ENOMEM;
mlog_errno(status);
goto bail;
}
/* lock the parent directory */ /* lock the parent directory */
status = ocfs2_meta_lock(dir, handle, &parent_fe_bh, 1); status = ocfs2_meta_lock(dir, &parent_fe_bh, 1);
if (status < 0) { if (status < 0) {
if (status != -ENOENT) if (status != -ENOENT)
mlog_errno(status); mlog_errno(status);
goto bail; return status;
} }
dirfe = (struct ocfs2_dinode *) parent_fe_bh->b_data; dirfe = (struct ocfs2_dinode *) parent_fe_bh->b_data;
...@@ -1622,7 +1635,7 @@ static int ocfs2_symlink(struct inode *dir, ...@@ -1622,7 +1635,7 @@ static int ocfs2_symlink(struct inode *dir,
goto bail; goto bail;
} }
status = ocfs2_reserve_new_inode(osb, handle, &inode_ac); status = ocfs2_reserve_new_inode(osb, &inode_ac);
if (status < 0) { if (status < 0) {
if (status != -ENOSPC) if (status != -ENOSPC)
mlog_errno(status); mlog_errno(status);
...@@ -1631,7 +1644,7 @@ static int ocfs2_symlink(struct inode *dir, ...@@ -1631,7 +1644,7 @@ static int ocfs2_symlink(struct inode *dir,
/* don't reserve bitmap space for fast symlinks. */ /* don't reserve bitmap space for fast symlinks. */
if (l > ocfs2_fast_symlink_chars(sb)) { if (l > ocfs2_fast_symlink_chars(sb)) {
status = ocfs2_reserve_clusters(osb, handle, 1, &data_ac); status = ocfs2_reserve_clusters(osb, 1, &data_ac);
if (status < 0) { if (status < 0) {
if (status != -ENOSPC) if (status != -ENOSPC)
mlog_errno(status); mlog_errno(status);
...@@ -1639,7 +1652,7 @@ static int ocfs2_symlink(struct inode *dir, ...@@ -1639,7 +1652,7 @@ static int ocfs2_symlink(struct inode *dir,
} }
} }
handle = ocfs2_start_trans(osb, handle, credits); handle = ocfs2_start_trans(osb, credits);
if (IS_ERR(handle)) { if (IS_ERR(handle)) {
status = PTR_ERR(handle); status = PTR_ERR(handle);
handle = NULL; handle = NULL;
...@@ -1717,7 +1730,10 @@ static int ocfs2_symlink(struct inode *dir, ...@@ -1717,7 +1730,10 @@ static int ocfs2_symlink(struct inode *dir,
d_instantiate(dentry, inode); d_instantiate(dentry, inode);
bail: bail:
if (handle) if (handle)
ocfs2_commit_trans(handle); ocfs2_commit_trans(osb, handle);
ocfs2_meta_unlock(dir, 1);
if (new_fe_bh) if (new_fe_bh)
brelse(new_fe_bh); brelse(new_fe_bh);
if (parent_fe_bh) if (parent_fe_bh)
...@@ -1768,7 +1784,7 @@ int ocfs2_check_dir_entry(struct inode * dir, ...@@ -1768,7 +1784,7 @@ int ocfs2_check_dir_entry(struct inode * dir,
* If you pass me insert_bh, I'll skip the search of the other dir * If you pass me insert_bh, I'll skip the search of the other dir
* blocks and put the record in there. * blocks and put the record in there.
*/ */
static int __ocfs2_add_entry(struct ocfs2_journal_handle *handle, static int __ocfs2_add_entry(handle_t *handle,
struct inode *dir, struct inode *dir,
const char *name, int namelen, const char *name, int namelen,
struct inode *inode, u64 blkno, struct inode *inode, u64 blkno,
...@@ -1854,7 +1870,7 @@ static int __ocfs2_add_entry(struct ocfs2_journal_handle *handle, ...@@ -1854,7 +1870,7 @@ static int __ocfs2_add_entry(struct ocfs2_journal_handle *handle,
* ocfs2_delete_entry deletes a directory entry by merging it with the * ocfs2_delete_entry deletes a directory entry by merging it with the
* previous entry * previous entry
*/ */
static int ocfs2_delete_entry(struct ocfs2_journal_handle *handle, static int ocfs2_delete_entry(handle_t *handle,
struct inode *dir, struct inode *dir,
struct ocfs2_dir_entry *de_del, struct ocfs2_dir_entry *de_del,
struct buffer_head *bh) struct buffer_head *bh)
...@@ -2085,19 +2101,19 @@ static int ocfs2_blkno_stringify(u64 blkno, char *name) ...@@ -2085,19 +2101,19 @@ static int ocfs2_blkno_stringify(u64 blkno, char *name)
} }
static int ocfs2_prepare_orphan_dir(struct ocfs2_super *osb, static int ocfs2_prepare_orphan_dir(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, struct inode **ret_orphan_dir,
struct inode *inode, struct inode *inode,
char *name, char *name,
struct buffer_head **de_bh) struct buffer_head **de_bh)
{ {
struct inode *orphan_dir_inode = NULL; struct inode *orphan_dir_inode;
struct buffer_head *orphan_dir_bh = NULL; struct buffer_head *orphan_dir_bh = NULL;
int status = 0; int status = 0;
status = ocfs2_blkno_stringify(OCFS2_I(inode)->ip_blkno, name); status = ocfs2_blkno_stringify(OCFS2_I(inode)->ip_blkno, name);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
goto leave; return status;
} }
orphan_dir_inode = ocfs2_get_system_file_inode(osb, orphan_dir_inode = ocfs2_get_system_file_inode(osb,
...@@ -2106,11 +2122,12 @@ static int ocfs2_prepare_orphan_dir(struct ocfs2_super *osb, ...@@ -2106,11 +2122,12 @@ static int ocfs2_prepare_orphan_dir(struct ocfs2_super *osb,
if (!orphan_dir_inode) { if (!orphan_dir_inode) {
status = -ENOENT; status = -ENOENT;
mlog_errno(status); mlog_errno(status);
goto leave; return status;
} }
ocfs2_handle_add_inode(handle, orphan_dir_inode); mutex_lock(&orphan_dir_inode->i_mutex);
status = ocfs2_meta_lock(orphan_dir_inode, handle, &orphan_dir_bh, 1);
status = ocfs2_meta_lock(orphan_dir_inode, &orphan_dir_bh, 1);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
goto leave; goto leave;
...@@ -2120,13 +2137,19 @@ static int ocfs2_prepare_orphan_dir(struct ocfs2_super *osb, ...@@ -2120,13 +2137,19 @@ static int ocfs2_prepare_orphan_dir(struct ocfs2_super *osb,
orphan_dir_bh, name, orphan_dir_bh, name,
OCFS2_ORPHAN_NAMELEN, de_bh); OCFS2_ORPHAN_NAMELEN, de_bh);
if (status < 0) { if (status < 0) {
ocfs2_meta_unlock(orphan_dir_inode, 1);
mlog_errno(status); mlog_errno(status);
goto leave; goto leave;
} }
*ret_orphan_dir = orphan_dir_inode;
leave: leave:
if (orphan_dir_inode) if (status) {
mutex_unlock(&orphan_dir_inode->i_mutex);
iput(orphan_dir_inode); iput(orphan_dir_inode);
}
if (orphan_dir_bh) if (orphan_dir_bh)
brelse(orphan_dir_bh); brelse(orphan_dir_bh);
...@@ -2136,28 +2159,19 @@ static int ocfs2_prepare_orphan_dir(struct ocfs2_super *osb, ...@@ -2136,28 +2159,19 @@ static int ocfs2_prepare_orphan_dir(struct ocfs2_super *osb,
} }
static int ocfs2_orphan_add(struct ocfs2_super *osb, static int ocfs2_orphan_add(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode *inode, struct inode *inode,
struct ocfs2_dinode *fe, struct ocfs2_dinode *fe,
char *name, char *name,
struct buffer_head *de_bh) struct buffer_head *de_bh,
struct inode *orphan_dir_inode)
{ {
struct inode *orphan_dir_inode = NULL;
struct buffer_head *orphan_dir_bh = NULL; struct buffer_head *orphan_dir_bh = NULL;
int status = 0; int status = 0;
struct ocfs2_dinode *orphan_fe; struct ocfs2_dinode *orphan_fe;
mlog_entry("(inode->i_ino = %lu)\n", inode->i_ino); mlog_entry("(inode->i_ino = %lu)\n", inode->i_ino);
orphan_dir_inode = ocfs2_get_system_file_inode(osb,
ORPHAN_DIR_SYSTEM_INODE,
osb->slot_num);
if (!orphan_dir_inode) {
status = -ENOENT;
mlog_errno(status);
goto leave;
}
status = ocfs2_read_block(osb, status = ocfs2_read_block(osb,
OCFS2_I(orphan_dir_inode)->ip_blkno, OCFS2_I(orphan_dir_inode)->ip_blkno,
&orphan_dir_bh, OCFS2_BH_CACHED, &orphan_dir_bh, OCFS2_BH_CACHED,
...@@ -2209,9 +2223,6 @@ static int ocfs2_orphan_add(struct ocfs2_super *osb, ...@@ -2209,9 +2223,6 @@ static int ocfs2_orphan_add(struct ocfs2_super *osb,
(unsigned long long)OCFS2_I(inode)->ip_blkno, osb->slot_num); (unsigned long long)OCFS2_I(inode)->ip_blkno, osb->slot_num);
leave: leave:
if (orphan_dir_inode)
iput(orphan_dir_inode);
if (orphan_dir_bh) if (orphan_dir_bh)
brelse(orphan_dir_bh); brelse(orphan_dir_bh);
...@@ -2221,7 +2232,7 @@ static int ocfs2_orphan_add(struct ocfs2_super *osb, ...@@ -2221,7 +2232,7 @@ static int ocfs2_orphan_add(struct ocfs2_super *osb,
/* unlike orphan_add, we expect the orphan dir to already be locked here. */ /* unlike orphan_add, we expect the orphan dir to already be locked here. */
int ocfs2_orphan_del(struct ocfs2_super *osb, int ocfs2_orphan_del(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode *orphan_dir_inode, struct inode *orphan_dir_inode,
struct inode *inode, struct inode *inode,
struct buffer_head *orphan_dir_bh) struct buffer_head *orphan_dir_bh)
...@@ -2300,4 +2311,5 @@ struct inode_operations ocfs2_dir_iops = { ...@@ -2300,4 +2311,5 @@ struct inode_operations ocfs2_dir_iops = {
.rename = ocfs2_rename, .rename = ocfs2_rename,
.setattr = ocfs2_setattr, .setattr = ocfs2_setattr,
.getattr = ocfs2_getattr, .getattr = ocfs2_getattr,
.permission = ocfs2_permission,
}; };
fs/ocfs2/namei.h
View file @ 651857a1
...@@ -39,7 +39,7 @@ struct buffer_head *ocfs2_find_entry(const char *name, ...@@ -39,7 +39,7 @@ struct buffer_head *ocfs2_find_entry(const char *name,
struct inode *dir, struct inode *dir,
struct ocfs2_dir_entry **res_dir); struct ocfs2_dir_entry **res_dir);
int ocfs2_orphan_del(struct ocfs2_super *osb, int ocfs2_orphan_del(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct inode *orphan_dir_inode, struct inode *orphan_dir_inode,
struct inode *inode, struct inode *inode,
struct buffer_head *orphan_dir_bh); struct buffer_head *orphan_dir_bh);
......
fs/ocfs2/ocfs2.h
View file @ 651857a1
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/kref.h> #include <linux/kref.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/jbd.h>
#include "cluster/nodemanager.h" #include "cluster/nodemanager.h"
#include "cluster/heartbeat.h" #include "cluster/heartbeat.h"
...@@ -179,9 +180,9 @@ enum ocfs2_mount_options ...@@ -179,9 +180,9 @@ enum ocfs2_mount_options
#define OCFS2_OSB_SOFT_RO 0x0001 #define OCFS2_OSB_SOFT_RO 0x0001
#define OCFS2_OSB_HARD_RO 0x0002 #define OCFS2_OSB_HARD_RO 0x0002
#define OCFS2_OSB_ERROR_FS 0x0004 #define OCFS2_OSB_ERROR_FS 0x0004
#define OCFS2_DEFAULT_ATIME_QUANTUM 60
struct ocfs2_journal; struct ocfs2_journal;
struct ocfs2_journal_handle;
struct ocfs2_super struct ocfs2_super
{ {
struct task_struct *commit_task; struct task_struct *commit_task;
...@@ -218,6 +219,7 @@ struct ocfs2_super ...@@ -218,6 +219,7 @@ struct ocfs2_super
unsigned long osb_flags; unsigned long osb_flags;
unsigned long s_mount_opt; unsigned long s_mount_opt;
unsigned int s_atime_quantum;
u16 max_slots; u16 max_slots;
s16 node_num; s16 node_num;
......
fs/ocfs2/suballoc.c
View file @ 651857a1
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
static inline void ocfs2_debug_bg(struct ocfs2_group_desc *bg); static inline void ocfs2_debug_bg(struct ocfs2_group_desc *bg);
static inline void ocfs2_debug_suballoc_inode(struct ocfs2_dinode *fe); static inline void ocfs2_debug_suballoc_inode(struct ocfs2_dinode *fe);
static inline u16 ocfs2_find_victim_chain(struct ocfs2_chain_list *cl); static inline u16 ocfs2_find_victim_chain(struct ocfs2_chain_list *cl);
static int ocfs2_block_group_fill(struct ocfs2_journal_handle *handle, static int ocfs2_block_group_fill(handle_t *handle,
struct inode *alloc_inode, struct inode *alloc_inode,
struct buffer_head *bg_bh, struct buffer_head *bg_bh,
u64 group_blkno, u64 group_blkno,
...@@ -59,9 +59,6 @@ static int ocfs2_block_group_alloc(struct ocfs2_super *osb, ...@@ -59,9 +59,6 @@ static int ocfs2_block_group_alloc(struct ocfs2_super *osb,
struct inode *alloc_inode, struct inode *alloc_inode,
struct buffer_head *bh); struct buffer_head *bh);
static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
struct ocfs2_alloc_context *ac);
static int ocfs2_cluster_group_search(struct inode *inode, static int ocfs2_cluster_group_search(struct inode *inode,
struct buffer_head *group_bh, struct buffer_head *group_bh,
u32 bits_wanted, u32 min_bits, u32 bits_wanted, u32 min_bits,
...@@ -72,6 +69,7 @@ static int ocfs2_block_group_search(struct inode *inode, ...@@ -72,6 +69,7 @@ static int ocfs2_block_group_search(struct inode *inode,
u16 *bit_off, u16 *bits_found); u16 *bit_off, u16 *bits_found);
static int ocfs2_claim_suballoc_bits(struct ocfs2_super *osb, static int ocfs2_claim_suballoc_bits(struct ocfs2_super *osb,
struct ocfs2_alloc_context *ac, struct ocfs2_alloc_context *ac,
handle_t *handle,
u32 bits_wanted, u32 bits_wanted,
u32 min_bits, u32 min_bits,
u16 *bit_off, u16 *bit_off,
...@@ -79,20 +77,20 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_super *osb, ...@@ -79,20 +77,20 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_super *osb,
u64 *bg_blkno); u64 *bg_blkno);
static int ocfs2_test_bg_bit_allocatable(struct buffer_head *bg_bh, static int ocfs2_test_bg_bit_allocatable(struct buffer_head *bg_bh,
int nr); int nr);
static inline int ocfs2_block_group_set_bits(struct ocfs2_journal_handle *handle, static inline int ocfs2_block_group_set_bits(handle_t *handle,
struct inode *alloc_inode, struct inode *alloc_inode,
struct ocfs2_group_desc *bg, struct ocfs2_group_desc *bg,
struct buffer_head *group_bh, struct buffer_head *group_bh,
unsigned int bit_off, unsigned int bit_off,
unsigned int num_bits); unsigned int num_bits);
static inline int ocfs2_block_group_clear_bits(struct ocfs2_journal_handle *handle, static inline int ocfs2_block_group_clear_bits(handle_t *handle,
struct inode *alloc_inode, struct inode *alloc_inode,
struct ocfs2_group_desc *bg, struct ocfs2_group_desc *bg,
struct buffer_head *group_bh, struct buffer_head *group_bh,
unsigned int bit_off, unsigned int bit_off,
unsigned int num_bits); unsigned int num_bits);
static int ocfs2_relink_block_group(struct ocfs2_journal_handle *handle, static int ocfs2_relink_block_group(handle_t *handle,
struct inode *alloc_inode, struct inode *alloc_inode,
struct buffer_head *fe_bh, struct buffer_head *fe_bh,
struct buffer_head *bg_bh, struct buffer_head *bg_bh,
...@@ -100,7 +98,7 @@ static int ocfs2_relink_block_group(struct ocfs2_journal_handle *handle, ...@@ -100,7 +98,7 @@ static int ocfs2_relink_block_group(struct ocfs2_journal_handle *handle,
u16 chain); u16 chain);
static inline int ocfs2_block_group_reasonably_empty(struct ocfs2_group_desc *bg, static inline int ocfs2_block_group_reasonably_empty(struct ocfs2_group_desc *bg,
u32 wanted); u32 wanted);
static int ocfs2_free_suballoc_bits(struct ocfs2_journal_handle *handle, static int ocfs2_free_suballoc_bits(handle_t *handle,
struct inode *alloc_inode, struct inode *alloc_inode,
struct buffer_head *alloc_bh, struct buffer_head *alloc_bh,
unsigned int start_bit, unsigned int start_bit,
...@@ -120,8 +118,16 @@ static inline void ocfs2_block_to_cluster_group(struct inode *inode, ...@@ -120,8 +118,16 @@ static inline void ocfs2_block_to_cluster_group(struct inode *inode,
void ocfs2_free_alloc_context(struct ocfs2_alloc_context *ac) void ocfs2_free_alloc_context(struct ocfs2_alloc_context *ac)
{ {
if (ac->ac_inode) struct inode *inode = ac->ac_inode;
iput(ac->ac_inode);
if (inode) {
if (ac->ac_which != OCFS2_AC_USE_LOCAL)
ocfs2_meta_unlock(inode, 1);
mutex_unlock(&inode->i_mutex);
iput(inode);
}
if (ac->ac_bh) if (ac->ac_bh)
brelse(ac->ac_bh); brelse(ac->ac_bh);
kfree(ac); kfree(ac);
...@@ -190,7 +196,7 @@ static int ocfs2_check_group_descriptor(struct super_block *sb, ...@@ -190,7 +196,7 @@ static int ocfs2_check_group_descriptor(struct super_block *sb,
return 0; return 0;
} }
static int ocfs2_block_group_fill(struct ocfs2_journal_handle *handle, static int ocfs2_block_group_fill(handle_t *handle,
struct inode *alloc_inode, struct inode *alloc_inode,
struct buffer_head *bg_bh, struct buffer_head *bg_bh,
u64 group_blkno, u64 group_blkno,
...@@ -273,7 +279,7 @@ static int ocfs2_block_group_alloc(struct ocfs2_super *osb, ...@@ -273,7 +279,7 @@ static int ocfs2_block_group_alloc(struct ocfs2_super *osb,
struct ocfs2_dinode *fe = (struct ocfs2_dinode *) bh->b_data; struct ocfs2_dinode *fe = (struct ocfs2_dinode *) bh->b_data;
struct ocfs2_chain_list *cl; struct ocfs2_chain_list *cl;
struct ocfs2_alloc_context *ac = NULL; struct ocfs2_alloc_context *ac = NULL;
struct ocfs2_journal_handle *handle = NULL; handle_t *handle = NULL;
u32 bit_off, num_bits; u32 bit_off, num_bits;
u16 alloc_rec; u16 alloc_rec;
u64 bg_blkno; u64 bg_blkno;
...@@ -284,16 +290,8 @@ static int ocfs2_block_group_alloc(struct ocfs2_super *osb, ...@@ -284,16 +290,8 @@ static int ocfs2_block_group_alloc(struct ocfs2_super *osb,
mlog_entry_void(); mlog_entry_void();
handle = ocfs2_alloc_handle(osb);
if (!handle) {
status = -ENOMEM;
mlog_errno(status);
goto bail;
}
cl = &fe->id2.i_chain; cl = &fe->id2.i_chain;
status = ocfs2_reserve_clusters(osb, status = ocfs2_reserve_clusters(osb,
handle,
le16_to_cpu(cl->cl_cpg), le16_to_cpu(cl->cl_cpg),
&ac); &ac);
if (status < 0) { if (status < 0) {
...@@ -304,7 +302,7 @@ static int ocfs2_block_group_alloc(struct ocfs2_super *osb, ...@@ -304,7 +302,7 @@ static int ocfs2_block_group_alloc(struct ocfs2_super *osb,
credits = ocfs2_calc_group_alloc_credits(osb->sb, credits = ocfs2_calc_group_alloc_credits(osb->sb,
le16_to_cpu(cl->cl_cpg)); le16_to_cpu(cl->cl_cpg));
handle = ocfs2_start_trans(osb, handle, credits); handle = ocfs2_start_trans(osb, credits);
if (IS_ERR(handle)) { if (IS_ERR(handle)) {
status = PTR_ERR(handle); status = PTR_ERR(handle);
handle = NULL; handle = NULL;
...@@ -389,7 +387,7 @@ static int ocfs2_block_group_alloc(struct ocfs2_super *osb, ...@@ -389,7 +387,7 @@ static int ocfs2_block_group_alloc(struct ocfs2_super *osb,
status = 0; status = 0;
bail: bail:
if (handle) if (handle)
ocfs2_commit_trans(handle); ocfs2_commit_trans(osb, handle);
if (ac) if (ac)
ocfs2_free_alloc_context(ac); ocfs2_free_alloc_context(ac);
...@@ -402,27 +400,38 @@ static int ocfs2_block_group_alloc(struct ocfs2_super *osb, ...@@ -402,27 +400,38 @@ static int ocfs2_block_group_alloc(struct ocfs2_super *osb,
} }
static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb, static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
struct ocfs2_alloc_context *ac) struct ocfs2_alloc_context *ac,
int type,
u32 slot)
{ {
int status; int status;
u32 bits_wanted = ac->ac_bits_wanted; u32 bits_wanted = ac->ac_bits_wanted;
struct inode *alloc_inode = ac->ac_inode; struct inode *alloc_inode;
struct buffer_head *bh = NULL; struct buffer_head *bh = NULL;
struct ocfs2_journal_handle *handle = ac->ac_handle;
struct ocfs2_dinode *fe; struct ocfs2_dinode *fe;
u32 free_bits; u32 free_bits;
mlog_entry_void(); mlog_entry_void();
BUG_ON(handle->flags & OCFS2_HANDLE_STARTED); alloc_inode = ocfs2_get_system_file_inode(osb, type, slot);
if (!alloc_inode) {
mlog_errno(-EINVAL);
return -EINVAL;
}
ocfs2_handle_add_inode(handle, alloc_inode); mutex_lock(&alloc_inode->i_mutex);
status = ocfs2_meta_lock(alloc_inode, handle, &bh, 1);
status = ocfs2_meta_lock(alloc_inode, &bh, 1);
if (status < 0) { if (status < 0) {
mutex_unlock(&alloc_inode->i_mutex);
iput(alloc_inode);
mlog_errno(status); mlog_errno(status);
goto bail; return status;
} }
ac->ac_inode = alloc_inode;
fe = (struct ocfs2_dinode *) bh->b_data; fe = (struct ocfs2_dinode *) bh->b_data;
if (!OCFS2_IS_VALID_DINODE(fe)) { if (!OCFS2_IS_VALID_DINODE(fe)) {
OCFS2_RO_ON_INVALID_DINODE(alloc_inode->i_sb, fe); OCFS2_RO_ON_INVALID_DINODE(alloc_inode->i_sb, fe);
...@@ -473,12 +482,11 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb, ...@@ -473,12 +482,11 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
} }
int ocfs2_reserve_new_metadata(struct ocfs2_super *osb, int ocfs2_reserve_new_metadata(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_dinode *fe, struct ocfs2_dinode *fe,
struct ocfs2_alloc_context **ac) struct ocfs2_alloc_context **ac)
{ {
int status; int status;
struct inode *alloc_inode = NULL; u32 slot;
*ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL); *ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
if (!(*ac)) { if (!(*ac)) {
...@@ -488,28 +496,18 @@ int ocfs2_reserve_new_metadata(struct ocfs2_super *osb, ...@@ -488,28 +496,18 @@ int ocfs2_reserve_new_metadata(struct ocfs2_super *osb,
} }
(*ac)->ac_bits_wanted = ocfs2_extend_meta_needed(fe); (*ac)->ac_bits_wanted = ocfs2_extend_meta_needed(fe);
(*ac)->ac_handle = handle;
(*ac)->ac_which = OCFS2_AC_USE_META; (*ac)->ac_which = OCFS2_AC_USE_META;
#ifndef OCFS2_USE_ALL_METADATA_SUBALLOCATORS #ifndef OCFS2_USE_ALL_METADATA_SUBALLOCATORS
alloc_inode = ocfs2_get_system_file_inode(osb, slot = 0;
EXTENT_ALLOC_SYSTEM_INODE,
0);
#else #else
alloc_inode = ocfs2_get_system_file_inode(osb, slot = osb->slot_num;
EXTENT_ALLOC_SYSTEM_INODE,
osb->slot_num);
#endif #endif
if (!alloc_inode) {
status = -ENOMEM;
mlog_errno(status);
goto bail;
}
(*ac)->ac_inode = igrab(alloc_inode);
(*ac)->ac_group_search = ocfs2_block_group_search; (*ac)->ac_group_search = ocfs2_block_group_search;
status = ocfs2_reserve_suballoc_bits(osb, (*ac)); status = ocfs2_reserve_suballoc_bits(osb, (*ac),
EXTENT_ALLOC_SYSTEM_INODE, slot);
if (status < 0) { if (status < 0) {
if (status != -ENOSPC) if (status != -ENOSPC)
mlog_errno(status); mlog_errno(status);
...@@ -523,19 +521,14 @@ int ocfs2_reserve_new_metadata(struct ocfs2_super *osb, ...@@ -523,19 +521,14 @@ int ocfs2_reserve_new_metadata(struct ocfs2_super *osb,
*ac = NULL; *ac = NULL;
} }
if (alloc_inode)
iput(alloc_inode);
mlog_exit(status); mlog_exit(status);
return status; return status;
} }
int ocfs2_reserve_new_inode(struct ocfs2_super *osb, int ocfs2_reserve_new_inode(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_alloc_context **ac) struct ocfs2_alloc_context **ac)
{ {
int status; int status;
struct inode *alloc_inode = NULL;
*ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL); *ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
if (!(*ac)) { if (!(*ac)) {
...@@ -545,22 +538,13 @@ int ocfs2_reserve_new_inode(struct ocfs2_super *osb, ...@@ -545,22 +538,13 @@ int ocfs2_reserve_new_inode(struct ocfs2_super *osb,
} }
(*ac)->ac_bits_wanted = 1; (*ac)->ac_bits_wanted = 1;
(*ac)->ac_handle = handle;
(*ac)->ac_which = OCFS2_AC_USE_INODE; (*ac)->ac_which = OCFS2_AC_USE_INODE;
alloc_inode = ocfs2_get_system_file_inode(osb,
INODE_ALLOC_SYSTEM_INODE,
osb->slot_num);
if (!alloc_inode) {
status = -ENOMEM;
mlog_errno(status);
goto bail;
}
(*ac)->ac_inode = igrab(alloc_inode);
(*ac)->ac_group_search = ocfs2_block_group_search; (*ac)->ac_group_search = ocfs2_block_group_search;
status = ocfs2_reserve_suballoc_bits(osb, *ac); status = ocfs2_reserve_suballoc_bits(osb, *ac,
INODE_ALLOC_SYSTEM_INODE,
osb->slot_num);
if (status < 0) { if (status < 0) {
if (status != -ENOSPC) if (status != -ENOSPC)
mlog_errno(status); mlog_errno(status);
...@@ -574,9 +558,6 @@ int ocfs2_reserve_new_inode(struct ocfs2_super *osb, ...@@ -574,9 +558,6 @@ int ocfs2_reserve_new_inode(struct ocfs2_super *osb,
*ac = NULL; *ac = NULL;
} }
if (alloc_inode)
iput(alloc_inode);
mlog_exit(status); mlog_exit(status);
return status; return status;
} }
...@@ -588,20 +569,17 @@ int ocfs2_reserve_cluster_bitmap_bits(struct ocfs2_super *osb, ...@@ -588,20 +569,17 @@ int ocfs2_reserve_cluster_bitmap_bits(struct ocfs2_super *osb,
{ {
int status; int status;
ac->ac_inode = ocfs2_get_system_file_inode(osb,
GLOBAL_BITMAP_SYSTEM_INODE,
OCFS2_INVALID_SLOT);
if (!ac->ac_inode) {
status = -EINVAL;
mlog(ML_ERROR, "Could not get bitmap inode!\n");
goto bail;
}
ac->ac_which = OCFS2_AC_USE_MAIN; ac->ac_which = OCFS2_AC_USE_MAIN;
ac->ac_group_search = ocfs2_cluster_group_search; ac->ac_group_search = ocfs2_cluster_group_search;
status = ocfs2_reserve_suballoc_bits(osb, ac); status = ocfs2_reserve_suballoc_bits(osb, ac,
if (status < 0 && status != -ENOSPC) GLOBAL_BITMAP_SYSTEM_INODE,
OCFS2_INVALID_SLOT);
if (status < 0 && status != -ENOSPC) {
mlog_errno(status); mlog_errno(status);
goto bail;
}
bail: bail:
return status; return status;
} }
...@@ -610,7 +588,6 @@ int ocfs2_reserve_cluster_bitmap_bits(struct ocfs2_super *osb, ...@@ -610,7 +588,6 @@ int ocfs2_reserve_cluster_bitmap_bits(struct ocfs2_super *osb,
* use so we figure it out for them, but unfortunately this clutters * use so we figure it out for them, but unfortunately this clutters
* things a bit. */ * things a bit. */
int ocfs2_reserve_clusters(struct ocfs2_super *osb, int ocfs2_reserve_clusters(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
u32 bits_wanted, u32 bits_wanted,
struct ocfs2_alloc_context **ac) struct ocfs2_alloc_context **ac)
{ {
...@@ -618,8 +595,6 @@ int ocfs2_reserve_clusters(struct ocfs2_super *osb, ...@@ -618,8 +595,6 @@ int ocfs2_reserve_clusters(struct ocfs2_super *osb,
mlog_entry_void(); mlog_entry_void();
BUG_ON(!handle);
*ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL); *ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
if (!(*ac)) { if (!(*ac)) {
status = -ENOMEM; status = -ENOMEM;
...@@ -628,12 +603,10 @@ int ocfs2_reserve_clusters(struct ocfs2_super *osb, ...@@ -628,12 +603,10 @@ int ocfs2_reserve_clusters(struct ocfs2_super *osb,
} }
(*ac)->ac_bits_wanted = bits_wanted; (*ac)->ac_bits_wanted = bits_wanted;
(*ac)->ac_handle = handle;
status = -ENOSPC; status = -ENOSPC;
if (ocfs2_alloc_should_use_local(osb, bits_wanted)) { if (ocfs2_alloc_should_use_local(osb, bits_wanted)) {
status = ocfs2_reserve_local_alloc_bits(osb, status = ocfs2_reserve_local_alloc_bits(osb,
handle,
bits_wanted, bits_wanted,
*ac); *ac);
if ((status < 0) && (status != -ENOSPC)) { if ((status < 0) && (status != -ENOSPC)) {
...@@ -774,7 +747,7 @@ static int ocfs2_block_group_find_clear_bits(struct ocfs2_super *osb, ...@@ -774,7 +747,7 @@ static int ocfs2_block_group_find_clear_bits(struct ocfs2_super *osb,
return status; return status;
} }
static inline int ocfs2_block_group_set_bits(struct ocfs2_journal_handle *handle, static inline int ocfs2_block_group_set_bits(handle_t *handle,
struct inode *alloc_inode, struct inode *alloc_inode,
struct ocfs2_group_desc *bg, struct ocfs2_group_desc *bg,
struct buffer_head *group_bh, struct buffer_head *group_bh,
...@@ -845,7 +818,7 @@ static inline u16 ocfs2_find_victim_chain(struct ocfs2_chain_list *cl) ...@@ -845,7 +818,7 @@ static inline u16 ocfs2_find_victim_chain(struct ocfs2_chain_list *cl)
return best; return best;
} }
static int ocfs2_relink_block_group(struct ocfs2_journal_handle *handle, static int ocfs2_relink_block_group(handle_t *handle,
struct inode *alloc_inode, struct inode *alloc_inode,
struct buffer_head *fe_bh, struct buffer_head *fe_bh,
struct buffer_head *bg_bh, struct buffer_head *bg_bh,
...@@ -1025,7 +998,7 @@ static int ocfs2_block_group_search(struct inode *inode, ...@@ -1025,7 +998,7 @@ static int ocfs2_block_group_search(struct inode *inode,
} }
static int ocfs2_alloc_dinode_update_counts(struct inode *inode, static int ocfs2_alloc_dinode_update_counts(struct inode *inode,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct buffer_head *di_bh, struct buffer_head *di_bh,
u32 num_bits, u32 num_bits,
u16 chain) u16 chain)
...@@ -1055,6 +1028,7 @@ static int ocfs2_alloc_dinode_update_counts(struct inode *inode, ...@@ -1055,6 +1028,7 @@ static int ocfs2_alloc_dinode_update_counts(struct inode *inode,
} }
static int ocfs2_search_one_group(struct ocfs2_alloc_context *ac, static int ocfs2_search_one_group(struct ocfs2_alloc_context *ac,
handle_t *handle,
u32 bits_wanted, u32 bits_wanted,
u32 min_bits, u32 min_bits,
u16 *bit_off, u16 *bit_off,
...@@ -1067,7 +1041,6 @@ static int ocfs2_search_one_group(struct ocfs2_alloc_context *ac, ...@@ -1067,7 +1041,6 @@ static int ocfs2_search_one_group(struct ocfs2_alloc_context *ac,
struct buffer_head *group_bh = NULL; struct buffer_head *group_bh = NULL;
struct ocfs2_group_desc *gd; struct ocfs2_group_desc *gd;
struct inode *alloc_inode = ac->ac_inode; struct inode *alloc_inode = ac->ac_inode;
struct ocfs2_journal_handle *handle = ac->ac_handle;
ret = ocfs2_read_block(OCFS2_SB(alloc_inode->i_sb), gd_blkno, ret = ocfs2_read_block(OCFS2_SB(alloc_inode->i_sb), gd_blkno,
&group_bh, OCFS2_BH_CACHED, alloc_inode); &group_bh, OCFS2_BH_CACHED, alloc_inode);
...@@ -1115,6 +1088,7 @@ static int ocfs2_search_one_group(struct ocfs2_alloc_context *ac, ...@@ -1115,6 +1088,7 @@ static int ocfs2_search_one_group(struct ocfs2_alloc_context *ac,
} }
static int ocfs2_search_chain(struct ocfs2_alloc_context *ac, static int ocfs2_search_chain(struct ocfs2_alloc_context *ac,
handle_t *handle,
u32 bits_wanted, u32 bits_wanted,
u32 min_bits, u32 min_bits,
u16 *bit_off, u16 *bit_off,
...@@ -1126,7 +1100,6 @@ static int ocfs2_search_chain(struct ocfs2_alloc_context *ac, ...@@ -1126,7 +1100,6 @@ static int ocfs2_search_chain(struct ocfs2_alloc_context *ac,
u16 chain, tmp_bits; u16 chain, tmp_bits;
u32 tmp_used; u32 tmp_used;
u64 next_group; u64 next_group;
struct ocfs2_journal_handle *handle = ac->ac_handle;
struct inode *alloc_inode = ac->ac_inode; struct inode *alloc_inode = ac->ac_inode;
struct buffer_head *group_bh = NULL; struct buffer_head *group_bh = NULL;
struct buffer_head *prev_group_bh = NULL; struct buffer_head *prev_group_bh = NULL;
...@@ -1272,6 +1245,7 @@ static int ocfs2_search_chain(struct ocfs2_alloc_context *ac, ...@@ -1272,6 +1245,7 @@ static int ocfs2_search_chain(struct ocfs2_alloc_context *ac,
/* will give out up to bits_wanted contiguous bits. */ /* will give out up to bits_wanted contiguous bits. */
static int ocfs2_claim_suballoc_bits(struct ocfs2_super *osb, static int ocfs2_claim_suballoc_bits(struct ocfs2_super *osb,
struct ocfs2_alloc_context *ac, struct ocfs2_alloc_context *ac,
handle_t *handle,
u32 bits_wanted, u32 bits_wanted,
u32 min_bits, u32 min_bits,
u16 *bit_off, u16 *bit_off,
...@@ -1313,8 +1287,8 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_super *osb, ...@@ -1313,8 +1287,8 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_super *osb,
* by jumping straight to the most recently used * by jumping straight to the most recently used
* allocation group. This helps us mantain some * allocation group. This helps us mantain some
* contiguousness across allocations. */ * contiguousness across allocations. */
status = ocfs2_search_one_group(ac, bits_wanted, min_bits, status = ocfs2_search_one_group(ac, handle, bits_wanted,
bit_off, num_bits, min_bits, bit_off, num_bits,
hint_blkno, &bits_left); hint_blkno, &bits_left);
if (!status) { if (!status) {
/* Be careful to update *bg_blkno here as the /* Be careful to update *bg_blkno here as the
...@@ -1336,7 +1310,7 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_super *osb, ...@@ -1336,7 +1310,7 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_super *osb,
ac->ac_chain = victim; ac->ac_chain = victim;
ac->ac_allow_chain_relink = 1; ac->ac_allow_chain_relink = 1;
status = ocfs2_search_chain(ac, bits_wanted, min_bits, bit_off, status = ocfs2_search_chain(ac, handle, bits_wanted, min_bits, bit_off,
num_bits, bg_blkno, &bits_left); num_bits, bg_blkno, &bits_left);
if (!status) if (!status)
goto set_hint; goto set_hint;
...@@ -1360,7 +1334,7 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_super *osb, ...@@ -1360,7 +1334,7 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_super *osb,
continue; continue;
ac->ac_chain = i; ac->ac_chain = i;
status = ocfs2_search_chain(ac, bits_wanted, min_bits, status = ocfs2_search_chain(ac, handle, bits_wanted, min_bits,
bit_off, num_bits, bg_blkno, bit_off, num_bits, bg_blkno,
&bits_left); &bits_left);
if (!status) if (!status)
...@@ -1388,7 +1362,7 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_super *osb, ...@@ -1388,7 +1362,7 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_super *osb,
} }
int ocfs2_claim_metadata(struct ocfs2_super *osb, int ocfs2_claim_metadata(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct ocfs2_alloc_context *ac, struct ocfs2_alloc_context *ac,
u32 bits_wanted, u32 bits_wanted,
u16 *suballoc_bit_start, u16 *suballoc_bit_start,
...@@ -1401,10 +1375,10 @@ int ocfs2_claim_metadata(struct ocfs2_super *osb, ...@@ -1401,10 +1375,10 @@ int ocfs2_claim_metadata(struct ocfs2_super *osb,
BUG_ON(!ac); BUG_ON(!ac);
BUG_ON(ac->ac_bits_wanted < (ac->ac_bits_given + bits_wanted)); BUG_ON(ac->ac_bits_wanted < (ac->ac_bits_given + bits_wanted));
BUG_ON(ac->ac_which != OCFS2_AC_USE_META); BUG_ON(ac->ac_which != OCFS2_AC_USE_META);
BUG_ON(ac->ac_handle != handle);
status = ocfs2_claim_suballoc_bits(osb, status = ocfs2_claim_suballoc_bits(osb,
ac, ac,
handle,
bits_wanted, bits_wanted,
1, 1,
suballoc_bit_start, suballoc_bit_start,
...@@ -1425,7 +1399,7 @@ int ocfs2_claim_metadata(struct ocfs2_super *osb, ...@@ -1425,7 +1399,7 @@ int ocfs2_claim_metadata(struct ocfs2_super *osb,
} }
int ocfs2_claim_new_inode(struct ocfs2_super *osb, int ocfs2_claim_new_inode(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct ocfs2_alloc_context *ac, struct ocfs2_alloc_context *ac,
u16 *suballoc_bit, u16 *suballoc_bit,
u64 *fe_blkno) u64 *fe_blkno)
...@@ -1440,10 +1414,10 @@ int ocfs2_claim_new_inode(struct ocfs2_super *osb, ...@@ -1440,10 +1414,10 @@ int ocfs2_claim_new_inode(struct ocfs2_super *osb,
BUG_ON(ac->ac_bits_given != 0); BUG_ON(ac->ac_bits_given != 0);
BUG_ON(ac->ac_bits_wanted != 1); BUG_ON(ac->ac_bits_wanted != 1);
BUG_ON(ac->ac_which != OCFS2_AC_USE_INODE); BUG_ON(ac->ac_which != OCFS2_AC_USE_INODE);
BUG_ON(ac->ac_handle != handle);
status = ocfs2_claim_suballoc_bits(osb, status = ocfs2_claim_suballoc_bits(osb,
ac, ac,
handle,
1, 1,
1, 1,
suballoc_bit, suballoc_bit,
...@@ -1528,7 +1502,7 @@ static inline void ocfs2_block_to_cluster_group(struct inode *inode, ...@@ -1528,7 +1502,7 @@ static inline void ocfs2_block_to_cluster_group(struct inode *inode,
* of any size. * of any size.
*/ */
int ocfs2_claim_clusters(struct ocfs2_super *osb, int ocfs2_claim_clusters(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct ocfs2_alloc_context *ac, struct ocfs2_alloc_context *ac,
u32 min_clusters, u32 min_clusters,
u32 *cluster_start, u32 *cluster_start,
...@@ -1546,7 +1520,6 @@ int ocfs2_claim_clusters(struct ocfs2_super *osb, ...@@ -1546,7 +1520,6 @@ int ocfs2_claim_clusters(struct ocfs2_super *osb,
BUG_ON(ac->ac_which != OCFS2_AC_USE_LOCAL BUG_ON(ac->ac_which != OCFS2_AC_USE_LOCAL
&& ac->ac_which != OCFS2_AC_USE_MAIN); && ac->ac_which != OCFS2_AC_USE_MAIN);
BUG_ON(ac->ac_handle != handle);
if (ac->ac_which == OCFS2_AC_USE_LOCAL) { if (ac->ac_which == OCFS2_AC_USE_LOCAL) {
status = ocfs2_claim_local_alloc_bits(osb, status = ocfs2_claim_local_alloc_bits(osb,
...@@ -1572,6 +1545,7 @@ int ocfs2_claim_clusters(struct ocfs2_super *osb, ...@@ -1572,6 +1545,7 @@ int ocfs2_claim_clusters(struct ocfs2_super *osb,
status = ocfs2_claim_suballoc_bits(osb, status = ocfs2_claim_suballoc_bits(osb,
ac, ac,
handle,
bits_wanted, bits_wanted,
min_clusters, min_clusters,
&bg_bit_off, &bg_bit_off,
...@@ -1598,7 +1572,7 @@ int ocfs2_claim_clusters(struct ocfs2_super *osb, ...@@ -1598,7 +1572,7 @@ int ocfs2_claim_clusters(struct ocfs2_super *osb,
return status; return status;
} }
static inline int ocfs2_block_group_clear_bits(struct ocfs2_journal_handle *handle, static inline int ocfs2_block_group_clear_bits(handle_t *handle,
struct inode *alloc_inode, struct inode *alloc_inode,
struct ocfs2_group_desc *bg, struct ocfs2_group_desc *bg,
struct buffer_head *group_bh, struct buffer_head *group_bh,
...@@ -1653,7 +1627,7 @@ static inline int ocfs2_block_group_clear_bits(struct ocfs2_journal_handle *hand ...@@ -1653,7 +1627,7 @@ static inline int ocfs2_block_group_clear_bits(struct ocfs2_journal_handle *hand
/* /*
* expects the suballoc inode to already be locked. * expects the suballoc inode to already be locked.
*/ */
static int ocfs2_free_suballoc_bits(struct ocfs2_journal_handle *handle, static int ocfs2_free_suballoc_bits(handle_t *handle,
struct inode *alloc_inode, struct inode *alloc_inode,
struct buffer_head *alloc_bh, struct buffer_head *alloc_bh,
unsigned int start_bit, unsigned int start_bit,
...@@ -1737,7 +1711,7 @@ static inline u64 ocfs2_which_suballoc_group(u64 block, unsigned int bit) ...@@ -1737,7 +1711,7 @@ static inline u64 ocfs2_which_suballoc_group(u64 block, unsigned int bit)
return group; return group;
} }
int ocfs2_free_dinode(struct ocfs2_journal_handle *handle, int ocfs2_free_dinode(handle_t *handle,
struct inode *inode_alloc_inode, struct inode *inode_alloc_inode,
struct buffer_head *inode_alloc_bh, struct buffer_head *inode_alloc_bh,
struct ocfs2_dinode *di) struct ocfs2_dinode *di)
...@@ -1750,7 +1724,7 @@ int ocfs2_free_dinode(struct ocfs2_journal_handle *handle, ...@@ -1750,7 +1724,7 @@ int ocfs2_free_dinode(struct ocfs2_journal_handle *handle,
inode_alloc_bh, bit, bg_blkno, 1); inode_alloc_bh, bit, bg_blkno, 1);
} }
int ocfs2_free_extent_block(struct ocfs2_journal_handle *handle, int ocfs2_free_extent_block(handle_t *handle,
struct inode *eb_alloc_inode, struct inode *eb_alloc_inode,
struct buffer_head *eb_alloc_bh, struct buffer_head *eb_alloc_bh,
struct ocfs2_extent_block *eb) struct ocfs2_extent_block *eb)
...@@ -1763,7 +1737,7 @@ int ocfs2_free_extent_block(struct ocfs2_journal_handle *handle, ...@@ -1763,7 +1737,7 @@ int ocfs2_free_extent_block(struct ocfs2_journal_handle *handle,
bit, bg_blkno, 1); bit, bg_blkno, 1);
} }
int ocfs2_free_clusters(struct ocfs2_journal_handle *handle, int ocfs2_free_clusters(handle_t *handle,
struct inode *bitmap_inode, struct inode *bitmap_inode,
struct buffer_head *bitmap_bh, struct buffer_head *bitmap_bh,
u64 start_blk, u64 start_blk,
......
fs/ocfs2/suballoc.h
View file @ 651857a1
...@@ -43,7 +43,6 @@ struct ocfs2_alloc_context { ...@@ -43,7 +43,6 @@ struct ocfs2_alloc_context {
#define OCFS2_AC_USE_INODE 3 #define OCFS2_AC_USE_INODE 3
#define OCFS2_AC_USE_META 4 #define OCFS2_AC_USE_META 4
u32 ac_which; u32 ac_which;
struct ocfs2_journal_handle *ac_handle;
/* these are used by the chain search */ /* these are used by the chain search */
u16 ac_chain; u16 ac_chain;
...@@ -60,45 +59,42 @@ static inline int ocfs2_alloc_context_bits_left(struct ocfs2_alloc_context *ac) ...@@ -60,45 +59,42 @@ static inline int ocfs2_alloc_context_bits_left(struct ocfs2_alloc_context *ac)
} }
int ocfs2_reserve_new_metadata(struct ocfs2_super *osb, int ocfs2_reserve_new_metadata(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_dinode *fe, struct ocfs2_dinode *fe,
struct ocfs2_alloc_context **ac); struct ocfs2_alloc_context **ac);
int ocfs2_reserve_new_inode(struct ocfs2_super *osb, int ocfs2_reserve_new_inode(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
struct ocfs2_alloc_context **ac); struct ocfs2_alloc_context **ac);
int ocfs2_reserve_clusters(struct ocfs2_super *osb, int ocfs2_reserve_clusters(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
u32 bits_wanted, u32 bits_wanted,
struct ocfs2_alloc_context **ac); struct ocfs2_alloc_context **ac);
int ocfs2_claim_metadata(struct ocfs2_super *osb, int ocfs2_claim_metadata(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct ocfs2_alloc_context *ac, struct ocfs2_alloc_context *ac,
u32 bits_wanted, u32 bits_wanted,
u16 *suballoc_bit_start, u16 *suballoc_bit_start,
u32 *num_bits, u32 *num_bits,
u64 *blkno_start); u64 *blkno_start);
int ocfs2_claim_new_inode(struct ocfs2_super *osb, int ocfs2_claim_new_inode(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct ocfs2_alloc_context *ac, struct ocfs2_alloc_context *ac,
u16 *suballoc_bit, u16 *suballoc_bit,
u64 *fe_blkno); u64 *fe_blkno);
int ocfs2_claim_clusters(struct ocfs2_super *osb, int ocfs2_claim_clusters(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle, handle_t *handle,
struct ocfs2_alloc_context *ac, struct ocfs2_alloc_context *ac,
u32 min_clusters, u32 min_clusters,
u32 *cluster_start, u32 *cluster_start,
u32 *num_clusters); u32 *num_clusters);
int ocfs2_free_dinode(struct ocfs2_journal_handle *handle, int ocfs2_free_dinode(handle_t *handle,
struct inode *inode_alloc_inode, struct inode *inode_alloc_inode,
struct buffer_head *inode_alloc_bh, struct buffer_head *inode_alloc_bh,
struct ocfs2_dinode *di); struct ocfs2_dinode *di);
int ocfs2_free_extent_block(struct ocfs2_journal_handle *handle, int ocfs2_free_extent_block(handle_t *handle,
struct inode *eb_alloc_inode, struct inode *eb_alloc_inode,
struct buffer_head *eb_alloc_bh, struct buffer_head *eb_alloc_bh,
struct ocfs2_extent_block *eb); struct ocfs2_extent_block *eb);
int ocfs2_free_clusters(struct ocfs2_journal_handle *handle, int ocfs2_free_clusters(handle_t *handle,
struct inode *bitmap_inode, struct inode *bitmap_inode,
struct buffer_head *bitmap_bh, struct buffer_head *bitmap_bh,
u64 start_blk, u64 start_blk,
......
fs/ocfs2/super.c
View file @ 651857a1
...@@ -70,8 +70,6 @@ ...@@ -70,8 +70,6 @@
static kmem_cache_t *ocfs2_inode_cachep = NULL; static kmem_cache_t *ocfs2_inode_cachep = NULL;
kmem_cache_t *ocfs2_lock_cache = NULL;
/* OCFS2 needs to schedule several differnt types of work which /* OCFS2 needs to schedule several differnt types of work which
* require cluster locking, disk I/O, recovery waits, etc. Since these * require cluster locking, disk I/O, recovery waits, etc. Since these
* types of work tend to be heavy we avoid using the kernel events * types of work tend to be heavy we avoid using the kernel events
...@@ -141,6 +139,7 @@ enum { ...@@ -141,6 +139,7 @@ enum {
Opt_hb_local, Opt_hb_local,
Opt_data_ordered, Opt_data_ordered,
Opt_data_writeback, Opt_data_writeback,
Opt_atime_quantum,
Opt_err, Opt_err,
}; };
...@@ -154,6 +153,7 @@ static match_table_t tokens = { ...@@ -154,6 +153,7 @@ static match_table_t tokens = {
{Opt_hb_local, OCFS2_HB_LOCAL}, {Opt_hb_local, OCFS2_HB_LOCAL},
{Opt_data_ordered, "data=ordered"}, {Opt_data_ordered, "data=ordered"},
{Opt_data_writeback, "data=writeback"}, {Opt_data_writeback, "data=writeback"},
{Opt_atime_quantum, "atime_quantum=%u"},
{Opt_err, NULL} {Opt_err, NULL}
}; };
...@@ -707,6 +707,7 @@ static int ocfs2_parse_options(struct super_block *sb, ...@@ -707,6 +707,7 @@ static int ocfs2_parse_options(struct super_block *sb,
while ((p = strsep(&options, ",")) != NULL) { while ((p = strsep(&options, ",")) != NULL) {
int token, option; int token, option;
substring_t args[MAX_OPT_ARGS]; substring_t args[MAX_OPT_ARGS];
struct ocfs2_super * osb = OCFS2_SB(sb);
if (!*p) if (!*p)
continue; continue;
...@@ -747,6 +748,16 @@ static int ocfs2_parse_options(struct super_block *sb, ...@@ -747,6 +748,16 @@ static int ocfs2_parse_options(struct super_block *sb,
case Opt_data_writeback: case Opt_data_writeback:
*mount_opt |= OCFS2_MOUNT_DATA_WRITEBACK; *mount_opt |= OCFS2_MOUNT_DATA_WRITEBACK;
break; break;
case Opt_atime_quantum:
if (match_int(&args[0], &option)) {
status = 0;
goto bail;
}
if (option >= 0)
osb->s_atime_quantum = option;
else
osb->s_atime_quantum = OCFS2_DEFAULT_ATIME_QUANTUM;
break;
default: default:
mlog(ML_ERROR, mlog(ML_ERROR,
"Unrecognized mount option \"%s\" " "Unrecognized mount option \"%s\" "
...@@ -867,7 +878,7 @@ static int ocfs2_statfs(struct dentry *dentry, struct kstatfs *buf) ...@@ -867,7 +878,7 @@ static int ocfs2_statfs(struct dentry *dentry, struct kstatfs *buf)
goto bail; goto bail;
} }
status = ocfs2_meta_lock(inode, NULL, &bh, 0); status = ocfs2_meta_lock(inode, &bh, 0);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
goto bail; goto bail;
...@@ -914,9 +925,7 @@ static void ocfs2_inode_init_once(void *data, ...@@ -914,9 +925,7 @@ static void ocfs2_inode_init_once(void *data,
oi->ip_open_count = 0; oi->ip_open_count = 0;
spin_lock_init(&oi->ip_lock); spin_lock_init(&oi->ip_lock);
ocfs2_extent_map_init(&oi->vfs_inode); ocfs2_extent_map_init(&oi->vfs_inode);
INIT_LIST_HEAD(&oi->ip_handle_list);
INIT_LIST_HEAD(&oi->ip_io_markers); INIT_LIST_HEAD(&oi->ip_io_markers);
oi->ip_handle = NULL;
oi->ip_created_trans = 0; oi->ip_created_trans = 0;
oi->ip_last_trans = 0; oi->ip_last_trans = 0;
oi->ip_dir_start_lookup = 0; oi->ip_dir_start_lookup = 0;
...@@ -948,14 +957,6 @@ static int ocfs2_initialize_mem_caches(void) ...@@ -948,14 +957,6 @@ static int ocfs2_initialize_mem_caches(void)
if (!ocfs2_inode_cachep) if (!ocfs2_inode_cachep)
return -ENOMEM; return -ENOMEM;
ocfs2_lock_cache = kmem_cache_create("ocfs2_lock",
sizeof(struct ocfs2_journal_lock),
0,
SLAB_HWCACHE_ALIGN,
NULL, NULL);
if (!ocfs2_lock_cache)
return -ENOMEM;
return 0; return 0;
} }
...@@ -963,11 +964,8 @@ static void ocfs2_free_mem_caches(void) ...@@ -963,11 +964,8 @@ static void ocfs2_free_mem_caches(void)
{ {
if (ocfs2_inode_cachep) if (ocfs2_inode_cachep)
kmem_cache_destroy(ocfs2_inode_cachep); kmem_cache_destroy(ocfs2_inode_cachep);
if (ocfs2_lock_cache)
kmem_cache_destroy(ocfs2_lock_cache);
ocfs2_inode_cachep = NULL; ocfs2_inode_cachep = NULL;
ocfs2_lock_cache = NULL;
} }
static int ocfs2_get_sector(struct super_block *sb, static int ocfs2_get_sector(struct super_block *sb,
...@@ -1280,6 +1278,8 @@ static int ocfs2_initialize_super(struct super_block *sb, ...@@ -1280,6 +1278,8 @@ static int ocfs2_initialize_super(struct super_block *sb,
init_waitqueue_head(&osb->checkpoint_event); init_waitqueue_head(&osb->checkpoint_event);
atomic_set(&osb->needs_checkpoint, 0); atomic_set(&osb->needs_checkpoint, 0);
osb->s_atime_quantum = OCFS2_DEFAULT_ATIME_QUANTUM;
osb->node_num = O2NM_INVALID_NODE_NUM; osb->node_num = O2NM_INVALID_NODE_NUM;
osb->slot_num = OCFS2_INVALID_SLOT; osb->slot_num = OCFS2_INVALID_SLOT;
......
fs/ocfs2/symlink.c
View file @ 651857a1
...@@ -126,6 +126,10 @@ static int ocfs2_readlink(struct dentry *dentry, ...@@ -126,6 +126,10 @@ static int ocfs2_readlink(struct dentry *dentry,
goto out; goto out;
} }
/*
* Without vfsmount we can't update atime now,
* but we will update atime here ultimately.
*/
ret = vfs_readlink(dentry, buffer, buflen, link); ret = vfs_readlink(dentry, buffer, buflen, link);
brelse(bh); brelse(bh);
......
mm/filemap.c
View file @ 651857a1
...@@ -1893,6 +1893,7 @@ int should_remove_suid(struct dentry *dentry) ...@@ -1893,6 +1893,7 @@ int should_remove_suid(struct dentry *dentry)
return 0; return 0;
} }
EXPORT_SYMBOL(should_remove_suid);
int __remove_suid(struct dentry *dentry, int kill) int __remove_suid(struct dentry *dentry, int kill)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7