[Ocfs2-commits] manish commits r2455 - in trunk: . fs/configfs
fs/ocfs2 fs/ocfs2/cluster fs/ocfs2/dlm include/linux
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Fri Jul 1 19:12:16 CDT 2005
Author: manish
Signed-off-by: mfasheh
Date: 2005-07-01 19:12:02 -0500 (Fri, 01 Jul 2005)
New Revision: 2455
Modified:
trunk/README
trunk/fs/configfs/bobtest.c
trunk/fs/configfs/configfs_example.c
trunk/fs/configfs/configfs_internal.h
trunk/fs/configfs/dir.c
trunk/fs/configfs/file.c
trunk/fs/configfs/inode.c
trunk/fs/configfs/item.c
trunk/fs/configfs/mount.c
trunk/fs/configfs/symlink.c
trunk/fs/ocfs2/aio.c
trunk/fs/ocfs2/aio.h
trunk/fs/ocfs2/alloc.c
trunk/fs/ocfs2/alloc.h
trunk/fs/ocfs2/aops.c
trunk/fs/ocfs2/buffer_head_io.c
trunk/fs/ocfs2/buffer_head_io.h
trunk/fs/ocfs2/cluster/heartbeat.c
trunk/fs/ocfs2/cluster/heartbeat.h
trunk/fs/ocfs2/cluster/masklog.c
trunk/fs/ocfs2/cluster/masklog.h
trunk/fs/ocfs2/cluster/net_proc.c
trunk/fs/ocfs2/cluster/nodemanager.c
trunk/fs/ocfs2/cluster/nodemanager.h
trunk/fs/ocfs2/cluster/ocfs2_heartbeat.h
trunk/fs/ocfs2/cluster/ocfs2_nodemanager.h
trunk/fs/ocfs2/cluster/quorum.c
trunk/fs/ocfs2/cluster/quorum.h
trunk/fs/ocfs2/cluster/tcp.c
trunk/fs/ocfs2/cluster/tcp.h
trunk/fs/ocfs2/cluster/tcp_internal.h
trunk/fs/ocfs2/cluster/ver.c
trunk/fs/ocfs2/cluster/ver.h
trunk/fs/ocfs2/dcache.c
trunk/fs/ocfs2/dcache.h
trunk/fs/ocfs2/dir.c
trunk/fs/ocfs2/dir.h
trunk/fs/ocfs2/dlm/dlmapi.h
trunk/fs/ocfs2/dlm/dlmast.c
trunk/fs/ocfs2/dlm/dlmcommon.h
trunk/fs/ocfs2/dlm/dlmconvert.c
trunk/fs/ocfs2/dlm/dlmconvert.h
trunk/fs/ocfs2/dlm/dlmdebug.c
trunk/fs/ocfs2/dlm/dlmdebug.h
trunk/fs/ocfs2/dlm/dlmdomain.c
trunk/fs/ocfs2/dlm/dlmdomain.h
trunk/fs/ocfs2/dlm/dlmfs.c
trunk/fs/ocfs2/dlm/dlmfsver.c
trunk/fs/ocfs2/dlm/dlmfsver.h
trunk/fs/ocfs2/dlm/dlmlock.c
trunk/fs/ocfs2/dlm/dlmmaster.c
trunk/fs/ocfs2/dlm/dlmrecovery.c
trunk/fs/ocfs2/dlm/dlmthread.c
trunk/fs/ocfs2/dlm/dlmunlock.c
trunk/fs/ocfs2/dlm/dlmver.c
trunk/fs/ocfs2/dlm/dlmver.h
trunk/fs/ocfs2/dlm/userdlm.c
trunk/fs/ocfs2/dlm/userdlm.h
trunk/fs/ocfs2/dlmglue.c
trunk/fs/ocfs2/dlmglue.h
trunk/fs/ocfs2/extent_map.c
trunk/fs/ocfs2/extent_map.h
trunk/fs/ocfs2/file.c
trunk/fs/ocfs2/file.h
trunk/fs/ocfs2/heartbeat.c
trunk/fs/ocfs2/heartbeat.h
trunk/fs/ocfs2/inode.c
trunk/fs/ocfs2/inode.h
trunk/fs/ocfs2/journal.c
trunk/fs/ocfs2/journal.h
trunk/fs/ocfs2/localalloc.c
trunk/fs/ocfs2/localalloc.h
trunk/fs/ocfs2/mmap.c
trunk/fs/ocfs2/mmap.h
trunk/fs/ocfs2/namei.c
trunk/fs/ocfs2/namei.h
trunk/fs/ocfs2/ocfs1_fs_compat.h
trunk/fs/ocfs2/ocfs2.h
trunk/fs/ocfs2/ocfs2_fs.h
trunk/fs/ocfs2/ocfs2_lockid.h
trunk/fs/ocfs2/proc.c
trunk/fs/ocfs2/proc.h
trunk/fs/ocfs2/slot_map.c
trunk/fs/ocfs2/slot_map.h
trunk/fs/ocfs2/suballoc.c
trunk/fs/ocfs2/suballoc.h
trunk/fs/ocfs2/super.c
trunk/fs/ocfs2/super.h
trunk/fs/ocfs2/symlink.c
trunk/fs/ocfs2/symlink.h
trunk/fs/ocfs2/sysfile.c
trunk/fs/ocfs2/sysfile.h
trunk/fs/ocfs2/uptodate.c
trunk/fs/ocfs2/uptodate.h
trunk/fs/ocfs2/ver.c
trunk/fs/ocfs2/ver.h
trunk/fs/ocfs2/vote.c
trunk/fs/ocfs2/vote.h
trunk/include/linux/configfs.h
Log:
Whitespace cleanup
Signed-off-by: mfasheh
Modified: trunk/README
===================================================================
--- trunk/README 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/README 2005-07-02 00:12:02 UTC (rev 2455)
@@ -31,7 +31,7 @@
- extended attributes
- readonly mount
- shared writeable mmap
- - loopback is supported, but data written will not
+ - loopback is supported, but data written will not
be cluster coherent.
- quotas
- cluster aware flock
Modified: trunk/fs/configfs/bobtest.c
===================================================================
--- trunk/fs/configfs/bobtest.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/configfs/bobtest.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -5,12 +5,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/configfs/configfs_example.c
===================================================================
--- trunk/fs/configfs/configfs_example.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/configfs/configfs_example.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -8,12 +8,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -37,7 +37,7 @@
* 01-childless
*
* This first example is a childless subsystem. It cannot create
- * any config_items. It just has attributes.
+ * any config_items. It just has attributes.
*
* Note that we are enclosing the configfs_subsystem inside a container.
* This is not necessary if a subsystem has no attributes directly
@@ -338,7 +338,7 @@
* 03-group-children
*
* This example reuses the simple_children group from above. However,
- * the simple_children group is not the subsystem itself, it is a
+ * the simple_children group is not the subsystem itself, it is a
* child of the subsystem. Creation of a group in the subsystem creates
* a new simple_children group. That group can then have simple_child
* children of its own.
Modified: trunk/fs/configfs/configfs_internal.h
===================================================================
--- trunk/fs/configfs/configfs_internal.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/configfs/configfs_internal.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -7,12 +7,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/configfs/dir.c
===================================================================
--- trunk/fs/configfs/dir.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/configfs/dir.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -7,12 +7,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -151,7 +151,7 @@
/**
* configfs_create_dir - create a directory for an config_item.
- * @item: config_itemwe're creating directory for.
+ * @item: config_itemwe're creating directory for.
* @dentry: config_item's dentry.
*/
@@ -211,9 +211,9 @@
/**
* configfs_remove_dir - remove an config_item's directory.
- * @item: config_item we're removing.
+ * @item: config_item we're removing.
*
- * The only thing special about this is that we remove any files in
+ * The only thing special about this is that we remove any files in
* the directory before we remove the directory, and we've inlined
* what used to be configfs_rmdir() below, instead of calling separately.
*/
@@ -299,7 +299,7 @@
struct configfs_dirent *parent_sd = dentry->d_fsdata;
struct configfs_dirent *sd;
int ret;
-
+
ret = -EBUSY;
if (!list_empty(&parent_sd->s_links))
goto out;
@@ -421,7 +421,7 @@
configfs_detach_group(sd->s_element);
child->d_inode->i_flags |= S_DEAD;
-
+
/*
* From rmdir/unregister, a configfs_detach_prep() pass
* has taken our i_sem for us. Drop it.
@@ -444,7 +444,7 @@
* This fakes mkdir(2) on a default_groups[] entry. It
* creates a dentry, attachs it, and then does fixup
* on the sd->s_type.
- *
+ *
* We could, perhaps, tweak our parent's ->mkdir for a minute and
* try using vfs_mkdir. Just a thought.
*/
@@ -593,7 +593,7 @@
* configfs_attach_group()) can be called from either the VFS or this
* module. That is, they assume that the items have been created,
* the dentry allocated, and the dcache is all ready to go.
- *
+ *
* If they fail, they must clean up after themselves as if they
* had never been called. The caller (VFS or local function) will
* handle cleaning up the dcache bits.
@@ -672,7 +672,7 @@
if (type->ct_group_ops && type->ct_group_ops->drop_item)
type->ct_group_ops->drop_item(to_config_group(parent_item),
item);
- else
+ else
config_item_put(item);
}
@@ -794,7 +794,7 @@
config_item_put(parent_item);
return -EINVAL;
}
-
+
ret = configfs_detach_prep(dentry);
if (ret) {
configfs_detach_rollback(dentry);
@@ -805,7 +805,7 @@
item = configfs_get_config_item(dentry);
/* Drop reference from above, item already holds one. */
- config_item_put(parent_item);
+ config_item_put(parent_item);
if (item->ci_type)
owner = item->ci_type->ct_owner;
@@ -872,7 +872,7 @@
error = -EEXIST;
dput(new_dentry);
}
- up(&parent->d_inode->i_sem);
+ up(&parent->d_inode->i_sem);
up_write(&configfs_rename_sem);
return error;
@@ -1047,7 +1047,7 @@
dentry = d_alloc(configfs_sb->s_root, &name);
if (!dentry)
goto out_release;
-
+
d_add(dentry, NULL);
err = configfs_attach_group(sd->s_element, &group->cg_item,
Modified: trunk/fs/configfs/file.c
===================================================================
--- trunk/fs/configfs/file.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/configfs/file.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -7,12 +7,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -51,9 +51,9 @@
* @buffer: data buffer for file.
*
* Allocate @buffer->page, if it hasn't been already, then call the
- * config_item's show() method to fill the buffer with this attribute's
- * data.
- * This is called only once, on the file's first read.
+ * config_item's show() method to fill the buffer with this attribute's
+ * data.
+ * This is called only once, on the file's first read.
*/
static int fill_read_buffer(struct dentry * dentry, struct configfs_buffer * buffer)
{
@@ -87,7 +87,7 @@
* @ppos: file position.
*
* Copy the buffer we filled in fill_read_buffer() to userspace.
- * This is done at the reader's leisure, copying and advancing
+ * This is done at the reader's leisure, copying and advancing
* the amount they specify each time.
* This may be called continuously until the buffer is empty.
*/
@@ -109,7 +109,7 @@
}
/**
- * configfs_read_file - read an attribute.
+ * configfs_read_file - read an attribute.
* @file: file pointer.
* @buf: buffer to fill.
* @count: number of bytes to read.
@@ -157,7 +157,7 @@
* copy the user-supplied buffer into it.
*/
-static int
+static int
fill_write_buffer(struct configfs_buffer * buffer, const char __user * buf, size_t count)
{
int error;
@@ -181,11 +181,11 @@
* @buffer: data buffer for file.
*
* Get the correct pointers for the config_item and the attribute we're
- * dealing with, then call the store() method for the attribute,
+ * dealing with, then call the store() method for the attribute,
* passing the buffer that we acquired in fill_write_buffer().
*/
-static int
+static int
flush_write_buffer(struct dentry * dentry, struct configfs_buffer * buffer, size_t count)
{
struct configfs_attribute * attr = to_attr(dentry);
@@ -208,9 +208,9 @@
* then push it to the config_item in flush_write_buffer().
* There is no easy way for us to know if userspace is only doing a partial
* write, so we don't support them. We expect the entire buffer to come
- * on the first write.
+ * on the first write.
* Hint: if you're writing a value, first read the file, modify only the
- * the value you're changing, then write entire buffer back.
+ * the value you're changing, then write entire buffer back.
*/
static ssize_t
@@ -251,7 +251,7 @@
goto Eaccess;
/* File needs write support.
- * The inode's perms must say it's ok,
+ * The inode's perms must say it's ok,
* and we must have a store method.
*/
if (file->f_mode & FMODE_WRITE) {
@@ -308,7 +308,7 @@
struct module * owner = attr->ca_owner;
struct configfs_buffer * buffer = filp->private_data;
- if (item)
+ if (item)
config_item_put(item);
/* After this point, attr should not be accessed. */
module_put(owner);
@@ -346,7 +346,7 @@
/**
* configfs_create_file - create an attribute file for an item.
- * @item: item we're creating for.
+ * @item: item we're creating for.
* @attr: atrribute descriptor.
*/
Modified: trunk/fs/configfs/inode.c
===================================================================
--- trunk/fs/configfs/inode.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/configfs/inode.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -7,12 +7,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -26,7 +26,7 @@
* Please see Documentation/filesystems/configfs.txt for more information.
*/
-#undef DEBUG
+#undef DEBUG
#include <linux/pagemap.h>
#include <linux/namei.h>
@@ -81,11 +81,11 @@
}
goto Proceed;
}
- else
+ else
error = -ENOMEM;
} else
error = -EEXIST;
- } else
+ } else
error = -ENOENT;
goto Done;
Modified: trunk/fs/configfs/item.c
===================================================================
--- trunk/fs/configfs/item.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/configfs/item.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -7,12 +7,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -56,7 +56,7 @@
/**
* config_item_set_name - Set the name of an item
* @item: item.
- * @name: name.
+ * @name: name.
*
* If strlen(name) >= CONFIGFS_ITEM_NAME_LEN, then use a
* dynamically allocated string that @item->ci_name points to.
@@ -71,17 +71,17 @@
va_list args;
char * name;
- /*
- * First, try the static array
+ /*
+ * First, try the static array
*/
va_start(args,fmt);
need = vsnprintf(item->ci_namebuf,limit,fmt,args);
va_end(args);
- if (need < limit)
+ if (need < limit)
name = item->ci_namebuf;
else {
- /*
- * Need more space? Allocate it and try again
+ /*
+ * Need more space? Allocate it and try again
*/
limit = need + 1;
name = kmalloc(limit,GFP_KERNEL);
@@ -140,7 +140,7 @@
}
/**
- * config_item_cleanup - free config_item resources.
+ * config_item_cleanup - free config_item resources.
* @item: item.
*/
@@ -182,7 +182,7 @@
/**
* config_group_init - initialize a group for use
- * @k: group
+ * @k: group
*/
void config_group_init(struct config_group *group)
Modified: trunk/fs/configfs/mount.c
===================================================================
--- trunk/fs/configfs/mount.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/configfs/mount.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -7,12 +7,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -80,7 +80,7 @@
inode->i_op = &configfs_dir_inode_operations;
inode->i_fop = &configfs_dir_operations;
/* directory inodes start off with i_nlink == 2 (for "." entry) */
- inode->i_nlink++;
+ inode->i_nlink++;
} else {
pr_debug("configfs: could not get root inode\n");
return -ENOMEM;
Modified: trunk/fs/configfs/symlink.c
===================================================================
--- trunk/fs/configfs/symlink.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/configfs/symlink.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -7,12 +7,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -241,7 +241,7 @@
down_read(&configfs_rename_sem);
error = configfs_get_target_path(item, target_item, path);
up_read(&configfs_rename_sem);
-
+
config_item_put(item);
config_item_put(target_item);
return error;
@@ -288,7 +288,7 @@
int error = -ENOMEM;
unsigned long page = get_zeroed_page(GFP_KERNEL);
if (page)
- error = configfs_getlink(dentry, (char *) page);
+ error = configfs_getlink(dentry, (char *) page);
nd_set_link(nd, error ? ERR_PTR(error) : (char *)page);
return 0;
}
Modified: trunk/fs/ocfs2/aio.c
===================================================================
--- trunk/fs/ocfs2/aio.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/aio.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -65,7 +65,7 @@
if (okp->kp_info.wl_unlock_ctxt)
ocfs2_unlock_buffer_inodes(&okp->kp_ctxt);
- if (okp->kp_have_alloc_sem)
+ if (okp->kp_have_alloc_sem)
up_read(&OCFS2_I(okp->kp_inode)->ip_alloc_sem);
iput(okp->kp_inode);
@@ -142,19 +142,19 @@
/* first wait for okps to enter the work queue */
wait_event(osb->osb_okp_pending_wq,
atomic_read(&osb->osb_okp_pending) == 0);
- /*
+ /*
* then wait for keventd to finish with all its work, including ours.
- *
+ *
* XXX this makes me very nervous. what if our work blocks keventd
* during an unlock and the unlock can only proceed if keventd
- * can get to some more work that the dlm might have queued?
+ * can get to some more work that the dlm might have queued?
* do we push any dlm work to keventd?
*/
flush_scheduled_work();
}
-/* just to stop sys_io_cancel() from spewing to the console when it sees an
- * iocb without ki_cancel */
+/* just to stop sys_io_cancel() from spewing to the console when it sees an
+ * iocb without ki_cancel */
static int ocfs2_ki_cancel(struct kiocb *iocb, struct io_event *ev)
{
mlog(0, "iocb %p\n", iocb);
@@ -300,12 +300,12 @@
&okp->kp_ctxt);
okp->kp_have_write_locks = 1;
if (okp->kp_info.wl_extended) {
- /*
+ /*
* this is not a particularly nice place to do this but
* extending aio in ocfs2 is not yet a priority. it
* means that we'll write zeros in the buffered case
* before then over-writing them with the real op. It
- * also sleeps in the aio submission context.
+ * also sleeps in the aio submission context.
*/
ocfs2_file_finish_extension(inode,
!okp->kp_info.wl_newsize,
@@ -317,7 +317,7 @@
goto out;
}
}
-
+
/* hold the ip_alloc_sem across the op */
if (!okp->kp_have_alloc_sem) {
down_read(&OCFS2_I(inode)->ip_alloc_sem);
@@ -325,17 +325,17 @@
}
out:
- /*
+ /*
* never hold i_sem when we leave this function, nor when we call
* g_f_a_w(). we've done all extending and inode field updating under
* the i_sem and we hold the ip_alloc_sem for reading across the ops.
- * ocfs2_direct_IO calls blockdev_direct_IO with NO_LOCKING.
+ * ocfs2_direct_IO calls blockdev_direct_IO with NO_LOCKING.
*/
if (okp->kp_info.wl_have_i_sem) {
up(&inode->i_sem);
okp->kp_info.wl_have_i_sem = 0;
}
- if (ret == 0)
+ if (ret == 0)
ret = generic_file_aio_write_nolock(iocb, &local_iov, 1,
&iocb->ki_pos);
Modified: trunk/fs/ocfs2/aio.h
===================================================================
--- trunk/fs/ocfs2/aio.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/aio.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/alloc.c
===================================================================
--- trunk/fs/ocfs2/alloc.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/alloc.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -51,10 +51,10 @@
ocfs2_extent_rec *ext,
u64 blkno);
-static int ocfs2_create_new_meta_bhs(ocfs2_super *osb,
+static int ocfs2_create_new_meta_bhs(ocfs2_super *osb,
ocfs2_journal_handle *handle,
struct inode *inode,
- int wanted,
+ int wanted,
ocfs2_alloc_context *meta_ac,
struct buffer_head *bhs[]);
@@ -104,7 +104,7 @@
/*
* How many free extents have we got before we need more meta data?
*/
-int ocfs2_num_free_extents(ocfs2_super *osb,
+int ocfs2_num_free_extents(ocfs2_super *osb,
struct inode *inode,
ocfs2_dinode *fe)
{
@@ -118,7 +118,7 @@
OCFS2_BUG_ON_INVALID_DINODE(fe);
if (fe->i_last_eb_blk) {
- retval = ocfs2_read_block(osb, fe->i_last_eb_blk, &eb_bh,
+ retval = ocfs2_read_block(osb, fe->i_last_eb_blk, &eb_bh,
OCFS2_BH_CACHED, inode);
if (retval < 0) {
mlog_errno(retval);
@@ -143,12 +143,12 @@
/* expects array to already be allocated
*
* sets h_signature, h_blkno, h_suballoc_bit, h_suballoc_slot, and
- * l_count for you
+ * l_count for you
*/
-static int ocfs2_create_new_meta_bhs(ocfs2_super *osb,
+static int ocfs2_create_new_meta_bhs(ocfs2_super *osb,
ocfs2_journal_handle *handle,
struct inode *inode,
- int wanted,
+ int wanted,
ocfs2_alloc_context *meta_ac,
struct buffer_head *bhs[])
{
@@ -162,11 +162,11 @@
count = 0;
while (count < wanted) {
- status = ocfs2_claim_metadata(osb,
- handle,
+ status = ocfs2_claim_metadata(osb,
+ handle,
meta_ac,
- wanted - count,
- &suballoc_bit_start,
+ wanted - count,
+ &suballoc_bit_start,
&num_got,
&first_blkno);
if (status < 0) {
@@ -238,7 +238,7 @@
* Add an entire tree branch to our inode. eb_bh is the extent block
* to start at, if we don't want to start the branch at the dinode
* structure.
- *
+ *
* last_eb_bh is required as we have to update it's next_leaf pointer
* for the new last extent block.
*
@@ -271,7 +271,7 @@
if (eb_bh) {
eb = (ocfs2_extent_block *) eb_bh->b_data;
el = &eb->h_list;
- } else
+ } else
el = &fe->id2.i_list;
/* we never add a branch to a leaf. */
@@ -288,7 +288,7 @@
goto bail;
}
- status = ocfs2_create_new_meta_bhs(osb, handle, inode, new_blocks,
+ status = ocfs2_create_new_meta_bhs(osb, handle, inode, new_blocks,
meta_ac, new_eb_bhs);
if (status < 0) {
mlog_errno(status);
@@ -296,9 +296,9 @@
}
/* Note: new_eb_bhs[new_blocks - 1] is the guy which will be
- * linked with the rest of the tree.
- * conversly, new_eb_bhs[0] is the new bottommost leaf.
- *
+ * linked with the rest of the tree.
+ * conversly, new_eb_bhs[0] is the new bottommost leaf.
+ *
* when we leave the loop, new_last_eb_blk will point to the
* newest leaf, and next_blkno will point to the topmost extent
* block. */
@@ -309,7 +309,7 @@
OCFS2_BUG_ON_INVALID_EXTENT_BLOCK(eb);
eb_el = &eb->h_list;
- status = ocfs2_journal_access(handle, inode, bh,
+ status = ocfs2_journal_access(handle, inode, bh,
OCFS2_JOURNAL_ACCESS_CREATE);
if (status < 0) {
mlog_errno(status);
@@ -340,20 +340,20 @@
* journal_dirty erroring as it won't unless we've aborted the
* handle (in which case we would never be here) so reserving
* the write with journal_access is all we need to do. */
- status = ocfs2_journal_access(handle, inode, last_eb_bh,
+ status = ocfs2_journal_access(handle, inode, last_eb_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
if (status < 0) {
mlog_errno(status);
goto bail;
}
- status = ocfs2_journal_access(handle, inode, fe_bh,
+ status = ocfs2_journal_access(handle, inode, fe_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
if (status < 0) {
mlog_errno(status);
goto bail;
}
if (eb_bh) {
- status = ocfs2_journal_access(handle, inode, eb_bh,
+ status = ocfs2_journal_access(handle, inode, eb_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
if (status < 0) {
mlog_errno(status);
@@ -404,7 +404,7 @@
/*
* adds another level to the allocation tree.
* returns back the new extent block so you can add a branch to it
- * after this call.
+ * after this call.
*/
static int ocfs2_shift_tree_depth(ocfs2_super *osb,
ocfs2_journal_handle *handle,
@@ -422,7 +422,7 @@
mlog_entry_void();
- status = ocfs2_create_new_meta_bhs(osb, handle, inode, 1, meta_ac,
+ status = ocfs2_create_new_meta_bhs(osb, handle, inode, 1, meta_ac,
&new_eb_bh);
if (status < 0) {
mlog_errno(status);
@@ -435,7 +435,7 @@
fe = (ocfs2_dinode *) fe_bh->b_data;
fe_el = &fe->id2.i_list;
- status = ocfs2_journal_access(handle, inode, new_eb_bh,
+ status = ocfs2_journal_access(handle, inode, new_eb_bh,
OCFS2_JOURNAL_ACCESS_CREATE);
if (status < 0) {
mlog_errno(status);
@@ -457,7 +457,7 @@
goto bail;
}
- status = ocfs2_journal_access(handle, inode, fe_bh,
+ status = ocfs2_journal_access(handle, inode, fe_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
if (status < 0) {
mlog_errno(status);
@@ -519,7 +519,7 @@
mlog_entry_void();
- status = ocfs2_journal_access(handle, inode, fe_bh,
+ status = ocfs2_journal_access(handle, inode, fe_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
if (status < 0) {
mlog_errno(status);
@@ -550,7 +550,7 @@
next_blkno = el->l_recs[el->l_next_free_rec-1].e_blkno;
BUG_ON(i >= num_bhs);
- status = ocfs2_read_block(osb, next_blkno, &eb_bhs[i],
+ status = ocfs2_read_block(osb, next_blkno, &eb_bhs[i],
OCFS2_BH_CACHED, inode);
if (status < 0) {
mlog_errno(status);
@@ -604,8 +604,8 @@
/* yay, we can finally add the actual extent now! */
i = el->l_next_free_rec - 1;
- if (el->l_next_free_rec && ocfs2_extent_contig(inode,
- &el->l_recs[i],
+ if (el->l_next_free_rec && ocfs2_extent_contig(inode,
+ &el->l_recs[i],
start_blk)) {
el->l_recs[i].e_clusters += new_clusters;
} else if (el->l_next_free_rec && !el->l_recs[i].e_clusters) {
@@ -625,7 +625,7 @@
el->l_recs[i].e_cpos = fe->i_clusters;
el->l_next_free_rec++;
}
-
+
/*
* extent_map errors are not fatal, so they are ignored outside
* of flushing the thing.
@@ -707,7 +707,7 @@
bh = NULL;
}
- status = ocfs2_read_block(osb, blkno, &bh, OCFS2_BH_CACHED,
+ status = ocfs2_read_block(osb, blkno, &bh, OCFS2_BH_CACHED,
inode);
if (status < 0) {
mlog_errno(status);
@@ -728,7 +728,7 @@
/* If we didn't find one and the fe doesn't have any room,
* then return '1' */
- if (!lowest_bh
+ if (!lowest_bh
&& (fe->id2.i_list.l_next_free_rec == fe->id2.i_list.l_count))
status = 1;
@@ -742,11 +742,11 @@
}
/* the caller needs to update fe->i_clusters */
-int ocfs2_insert_extent(ocfs2_super *osb,
+int ocfs2_insert_extent(ocfs2_super *osb,
ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *fe_bh,
- u64 start_blk,
+ u64 start_blk,
u32 new_clusters,
ocfs2_alloc_context *meta_ac)
{
@@ -809,7 +809,7 @@
/* ocfs2_shift_tree_depth will return us a buffer with
* the new extent block (so we can pass that to
* ocfs2_add_branch). */
- status = ocfs2_shift_tree_depth(osb, handle, inode, fe_bh,
+ status = ocfs2_shift_tree_depth(osb, handle, inode, fe_bh,
meta_ac, &bh);
if (status < 0) {
mlog_errno(status);
@@ -824,7 +824,7 @@
/* call ocfs2_add_branch to add the final part of the tree with
* the new data. */
mlog(0, "ocfs2_allocate_extent: add branch. bh = %p\n", bh);
- status = ocfs2_add_branch(osb, handle, inode, fe_bh, bh, last_eb_bh,
+ status = ocfs2_add_branch(osb, handle, inode, fe_bh, bh, last_eb_bh,
meta_ac);
if (status < 0) {
mlog_errno(status);
@@ -833,7 +833,7 @@
out_add:
/* Finally, we can add clusters. */
- status = ocfs2_do_insert_extent(osb, handle, inode, fe_bh,
+ status = ocfs2_do_insert_extent(osb, handle, inode, fe_bh,
start_blk, new_clusters);
if (status < 0)
mlog_errno(status);
@@ -905,7 +905,7 @@
tl = &di->id2.i_dealloc;
OCFS2_BUG_ON_INVALID_DINODE(di);
tl_count = le16_to_cpu(tl->tl_count);
- mlog_bug_on_msg(tl_count > ocfs2_truncate_recs_per_inode(osb->sb) ||
+ mlog_bug_on_msg(tl_count > ocfs2_truncate_recs_per_inode(osb->sb) ||
tl_count == 0,
"Truncate record count on #%"MLFu64" invalid ("
"wanted %u, actual %u\n", OCFS2_I(tl_inode)->ip_blkno,
@@ -1445,7 +1445,7 @@
return status;
}
-static int ocfs2_do_truncate(ocfs2_super *osb,
+static int ocfs2_do_truncate(ocfs2_super *osb,
unsigned int clusters_to_del,
struct inode *inode,
struct buffer_head *fe_bh,
@@ -1465,9 +1465,9 @@
fe = (ocfs2_dinode *) fe_bh->b_data;
- status = ocfs2_find_new_last_ext_blk(osb,
+ status = ocfs2_find_new_last_ext_blk(osb,
inode,
- fe,
+ fe,
fe->i_clusters - clusters_to_del,
old_last_eb_bh,
&last_eb_bh);
@@ -1478,7 +1478,7 @@
if (last_eb_bh)
last_eb = (ocfs2_extent_block *) last_eb_bh->b_data;
- status = ocfs2_journal_access(handle, inode, fe_bh,
+ status = ocfs2_journal_access(handle, inode, fe_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
if (status < 0) {
mlog_errno(status);
@@ -1501,10 +1501,10 @@
* we need to record the offset of the next level extent block
* as we may overwrite it. */
if (!el->l_tree_depth)
- delete_blk = el->l_recs[i].e_blkno
+ delete_blk = el->l_recs[i].e_blkno
+ ocfs2_clusters_to_blocks(osb->sb,
el->l_recs[i].e_clusters);
- else
+ else
next_eb = el->l_recs[i].e_blkno;
if (!el->l_recs[i].e_clusters) {
@@ -1536,7 +1536,7 @@
/* If there will be a new last extent block, then by
* definition, there cannot be any leaves to the right of
* him. */
- status = ocfs2_journal_access(handle, inode, last_eb_bh,
+ status = ocfs2_journal_access(handle, inode, last_eb_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
if (status < 0) {
mlog_errno(status);
@@ -1554,7 +1554,7 @@
while (depth) {
mlog(0, "traveling tree (depth = %d, next_eb = %"MLFu64")\n",
depth, next_eb);
- status = ocfs2_read_block(osb, next_eb, &eb_bh,
+ status = ocfs2_read_block(osb, next_eb, &eb_bh,
OCFS2_BH_CACHED, inode);
if (status < 0) {
mlog_errno(status);
@@ -1578,8 +1578,8 @@
mlog(0, "extent block %"MLFu64", before: record %d: "
"(%u, %u, %"MLFu64"), next = %u\n",
- le64_to_cpu(eb->h_blkno), i,
- el->l_recs[i].e_cpos, el->l_recs[i].e_clusters,
+ le64_to_cpu(eb->h_blkno), i,
+ el->l_recs[i].e_cpos, el->l_recs[i].e_clusters,
el->l_recs[i].e_blkno, el->l_next_free_rec);
BUG_ON(el->l_recs[i].e_clusters < clusters_to_del);
@@ -1589,7 +1589,7 @@
/* bottom-most block requires us to delete data.*/
if (!el->l_tree_depth)
delete_blk = el->l_recs[i].e_blkno
- + ocfs2_clusters_to_blocks(osb->sb,
+ + ocfs2_clusters_to_blocks(osb->sb,
el->l_recs[i].e_clusters);
if (!el->l_recs[i].e_clusters) {
el->l_recs[i].e_cpos = 0;
@@ -1599,8 +1599,8 @@
}
mlog(0, "extent block %"MLFu64", after: record %d: "
"(%u, %u, %"MLFu64"), next = %u\n",
- le64_to_cpu(eb->h_blkno), i,
- el->l_recs[i].e_cpos, el->l_recs[i].e_clusters,
+ le64_to_cpu(eb->h_blkno), i,
+ el->l_recs[i].e_cpos, el->l_recs[i].e_clusters,
el->l_recs[i].e_blkno, el->l_next_free_rec);
status = ocfs2_journal_dirty(handle, eb_bh);
@@ -1712,8 +1712,8 @@
last_eb_bh = NULL;
}
- status = ocfs2_read_block(osb, last_eb,
- &last_eb_bh, OCFS2_BH_CACHED,
+ status = ocfs2_read_block(osb, last_eb,
+ &last_eb_bh, OCFS2_BH_CACHED,
inode);
if (status < 0) {
mlog_errno(status);
@@ -1730,7 +1730,7 @@
if (el->l_recs[i].e_cpos >= target_i_clusters)
clusters_to_del = el->l_recs[i].e_clusters;
else
- clusters_to_del = (el->l_recs[i].e_clusters
+ clusters_to_del = (el->l_recs[i].e_clusters
+ el->l_recs[i].e_cpos) - target_i_clusters;
mlog(0, "clusters_to_del = %u in this pass\n", clusters_to_del);
@@ -1748,7 +1748,7 @@
}
}
- credits = ocfs2_calc_tree_trunc_credits(osb->sb, clusters_to_del,
+ credits = ocfs2_calc_tree_trunc_credits(osb->sb, clusters_to_del,
fe, el);
handle = ocfs2_start_trans(osb, NULL, credits);
if (!handle) {
@@ -1770,7 +1770,7 @@
if (status < 0)
mlog_errno(status);
- status = ocfs2_do_truncate(osb, clusters_to_del, inode, fe_bh,
+ status = ocfs2_do_truncate(osb, clusters_to_del, inode, fe_bh,
last_eb_bh, handle, tc);
if (status < 0) {
mlog_errno(status);
@@ -1813,9 +1813,9 @@
* inodes need to be locked and will put them on the returned truncate
* context.
*/
-int ocfs2_prepare_truncate(ocfs2_super *osb,
- struct inode *inode,
- struct buffer_head *fe_bh,
+int ocfs2_prepare_truncate(ocfs2_super *osb,
+ struct inode *inode,
+ struct buffer_head *fe_bh,
struct ocfs2_truncate_context **tc)
{
int status, metadata_delete;
Modified: trunk/fs/ocfs2/alloc.h
===================================================================
--- trunk/fs/ocfs2/alloc.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/alloc.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -27,14 +27,14 @@
#define OCFS2_ALLOC_H
struct _ocfs2_alloc_context;
-int ocfs2_insert_extent(ocfs2_super *osb,
+int ocfs2_insert_extent(ocfs2_super *osb,
ocfs2_journal_handle *handle,
struct inode *inode,
struct buffer_head *fe_bh,
- u64 blkno,
+ u64 blkno,
u32 new_clusters,
struct _ocfs2_alloc_context *meta_ac);
-int ocfs2_num_free_extents(ocfs2_super *osb,
+int ocfs2_num_free_extents(ocfs2_super *osb,
struct inode *inode,
ocfs2_dinode *fe);
/* how many new metadata chunks would an allocation need at maximum? */
@@ -72,9 +72,9 @@
void ocfs2_free_truncate_context(struct ocfs2_truncate_context *tc);
-int ocfs2_prepare_truncate(ocfs2_super *osb,
- struct inode *inode,
- struct buffer_head *fe_bh,
+int ocfs2_prepare_truncate(ocfs2_super *osb,
+ struct inode *inode,
+ struct buffer_head *fe_bh,
struct ocfs2_truncate_context **tc);
int ocfs2_commit_truncate(ocfs2_super *osb,
struct inode *inode,
Modified: trunk/fs/ocfs2/aops.c
===================================================================
--- trunk/fs/ocfs2/aops.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/aops.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -7,12 +7,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -87,7 +87,7 @@
/* We don't use the page cache to create symlink data, so if
* need be, copy it over from the buffer cache. */
if (!buffer_uptodate(bh_result) && ocfs2_inode_is_new(inode)) {
- buffer_cache_bh = sb_getblk(osb->sb,
+ buffer_cache_bh = sb_getblk(osb->sb,
fe->id2.i_list.l_recs[0].e_blkno + iblock);
if (!buffer_cache_bh) {
mlog(ML_ERROR, "couldn't getblock for symlink!\n");
@@ -98,15 +98,15 @@
* could've happened. Since we've got a reference on
* the bh, even if it commits while we're doing the
* copy, the data is still good. */
- if (buffer_jbd(buffer_cache_bh)
+ if (buffer_jbd(buffer_cache_bh)
&& ocfs2_inode_is_new(inode)) {
kaddr = kmap_atomic(bh_result->b_page, KM_USER0);
if (!kaddr) {
mlog(ML_ERROR, "couldn't kmap!\n");
goto bail;
}
- memcpy(kaddr + (bh_result->b_size * iblock),
- buffer_cache_bh->b_data,
+ memcpy(kaddr + (bh_result->b_size * iblock),
+ buffer_cache_bh->b_data,
bh_result->b_size);
kunmap_atomic(kaddr, KM_USER0);
set_buffer_uptodate(bh_result);
@@ -262,7 +262,7 @@
return ret;
}
-static sector_t ocfs2_bmap(struct address_space *mapping, sector_t block)
+static sector_t ocfs2_bmap(struct address_space *mapping, sector_t block)
{
sector_t status;
u64 p_blkno = 0;
@@ -286,7 +286,7 @@
err = ocfs2_extent_map_get_blocks(inode, block, 1, &p_blkno,
NULL);
-
+
if (!INODE_JOURNAL(inode)) {
up_read(&OCFS2_I(inode)->ip_alloc_sem);
ocfs2_meta_unlock(inode, 0);
@@ -312,8 +312,8 @@
* TODO: Make this into a generic get_blocks function.
*
* From do_direct_io in direct-io.c:
- * "So what we do is to permit the ->get_blocks function to populate
- * bh.b_size with the size of IO which is permitted at this offset and
+ * "So what we do is to permit the ->get_blocks function to populate
+ * bh.b_size with the size of IO which is permitted at this offset and
* this i_blkbits."
*
* This function is called directly from get_more_blocks in direct-io.c.
@@ -355,7 +355,7 @@
spin_unlock(&OCFS2_I(inode)->ip_lock);
/* This figures out the size of the next contiguous block, and
- * our logical offset */
+ * our logical offset */
ret = ocfs2_extent_map_get_blocks(inode, iblock, 1, &p_blkno,
&contig_blocks);
if (ret) {
@@ -393,7 +393,7 @@
inode->i_sb->s_bdev, iov, offset,
nr_segs, ocfs2_direct_IO_get_blocks,
NULL);
-
+
mlog_exit(ret);
return ret;
}
Modified: trunk/fs/ocfs2/buffer_head_io.c
===================================================================
--- trunk/fs/ocfs2/buffer_head_io.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/buffer_head_io.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -52,15 +52,15 @@
unlock_buffer(bh);
}
-int ocfs2_write_blocks(ocfs2_super *osb, struct buffer_head *bhs[],
+int ocfs2_write_blocks(ocfs2_super *osb, struct buffer_head *bhs[],
int nr, struct inode *inode)
{
int status = 0;
int i;
struct super_block *sb;
struct buffer_head *bh;
-
- mlog_entry("(bh[0]->b_blocknr = %llu, nr=%d, inode=%p)\n",
+
+ mlog_entry("(bh[0]->b_blocknr = %llu, nr=%d, inode=%p)\n",
(unsigned long long)bhs[0]->b_blocknr, nr, inode);
if (osb == NULL || osb->sb == NULL || bhs == NULL) {
@@ -85,7 +85,7 @@
if (unlikely(bh->b_blocknr < OCFS2_SUPER_BLOCK_BLKNO)) {
BUG();
- status = -EIO;
+ status = -EIO;
mlog_errno(status);
goto bail;
}
@@ -93,7 +93,7 @@
if (unlikely(buffer_jbd(bh))) {
/* What are you thinking?! */
mlog(ML_ERROR, "trying to write a jbd managed bh "
- "(blocknr = %llu), nr=%d\n",
+ "(blocknr = %llu), nr=%d\n",
(unsigned long long)bh->b_blocknr, nr);
BUG();
}
@@ -126,8 +126,8 @@
return status;
}
-int ocfs2_read_blocks(ocfs2_super *osb, u64 block, int nr,
- struct buffer_head *bhs[], int flags,
+int ocfs2_read_blocks(ocfs2_super *osb, u64 block, int nr,
+ struct buffer_head *bhs[], int flags,
struct inode *inode)
{
int status = 0;
@@ -135,7 +135,7 @@
int i, ignore_cache = 0;
struct buffer_head *bh;
- mlog_entry("(block=(%"MLFu64"), nr=(%d), flags=%d, inode=%p)\n",
+ mlog_entry("(block=(%"MLFu64"), nr=(%d), flags=%d, inode=%p)\n",
block, nr, flags, inode);
if (osb == NULL || osb->sb == NULL || bhs == NULL) {
@@ -211,7 +211,7 @@
if (buffer_jbd(bh)) {
#ifdef CATCH_BH_JBD_RACES
mlog(ML_ERROR, "block %llu had the JBD bit set "
- "while I was in lock_buffer!",
+ "while I was in lock_buffer!",
(unsigned long long)bh->b_blocknr);
BUG();
#else
@@ -248,7 +248,7 @@
if (inode)
up(&OCFS2_I(inode)->ip_io_sem);
- mlog(ML_BH_IO, "block=(%"MLFu64"), nr=(%d), cached=%s\n", block, nr,
+ mlog(ML_BH_IO, "block=(%"MLFu64"), nr=(%d), cached=%s\n", block, nr,
(!(flags & OCFS2_BH_CACHED) || ignore_cache) ? "no" : "yes");
bail:
Modified: trunk/fs/ocfs2/buffer_head_io.h
===================================================================
--- trunk/fs/ocfs2/buffer_head_io.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/buffer_head_io.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -32,31 +32,31 @@
int uptodate);
/* Yosh made me do it. */
-static inline int ocfs2_write_block(ocfs2_super *osb,
- struct buffer_head *bh,
+static inline int ocfs2_write_block(ocfs2_super *osb,
+ struct buffer_head *bh,
struct inode *inode);
-static inline int ocfs2_read_block(ocfs2_super *osb,
- u64 off,
- struct buffer_head **bh,
- int flags,
+static inline int ocfs2_read_block(ocfs2_super *osb,
+ u64 off,
+ struct buffer_head **bh,
+ int flags,
struct inode *inode);
int ocfs2_write_blocks(ocfs2_super *osb,
- struct buffer_head *bh[],
- int nr,
+ struct buffer_head *bh[],
+ int nr,
struct inode *inode);
-int ocfs2_read_blocks(ocfs2_super *osb,
+int ocfs2_read_blocks(ocfs2_super *osb,
u64 block,
- int nr,
- struct buffer_head *bhs[],
- int flags,
+ int nr,
+ struct buffer_head *bhs[],
+ int flags,
struct inode *inode);
#define OCFS2_BH_CACHED 1
#define OCFS2_BH_READAHEAD 8 /* use this to pass READA down to submit_bh */
-static inline int ocfs2_write_block(ocfs2_super * osb, struct buffer_head *bh,
+static inline int ocfs2_write_block(ocfs2_super * osb, struct buffer_head *bh,
struct inode *inode)
{
int status;
@@ -66,8 +66,8 @@
return status;
}
-static inline int ocfs2_read_block(ocfs2_super * osb, u64 off,
- struct buffer_head **bh, int flags,
+static inline int ocfs2_read_block(ocfs2_super * osb, u64 off,
+ struct buffer_head **bh, int flags,
struct inode *inode)
{
int status = 0;
Modified: trunk/fs/ocfs2/cluster/heartbeat.c
===================================================================
--- trunk/fs/ocfs2/cluster/heartbeat.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/cluster/heartbeat.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -7,12 +7,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -38,7 +38,7 @@
#include "masklog.h"
-/*
+/*
* The first heartbeat pass had one global thread that would serialize all hb
* callback calls. This global serializing sem should only be removed once
* we've made sure that all callees can deal with being called concurrently
@@ -46,8 +46,8 @@
*/
static DECLARE_RWSEM(o2hb_callback_sem);
-/*
- * multiple hb threads are watching multiple regions. A node is live
+/*
+ * multiple hb threads are watching multiple regions. A node is live
* whenever any of the threads sees activity from the node in its region.
*/
static spinlock_t o2hb_live_lock = SPIN_LOCK_UNLOCKED;
@@ -483,7 +483,7 @@
down_write(&o2hb_callback_sem);
spin_lock(&o2hb_live_lock);
- while (!list_empty(&o2hb_node_events)
+ while (!list_empty(&o2hb_node_events)
&& !list_empty(&queued_event->hn_item)) {
event = list_entry(o2hb_node_events.next,
struct o2hb_node_event,
@@ -563,7 +563,7 @@
struct o2hb_disk_slot *slot)
{
int changed = 0, gen_changed = 0;
- struct o2hb_node_event event =
+ struct o2hb_node_event event =
{ .hn_item = LIST_HEAD_INIT(event.hn_item), };
struct o2nm_node *node;
struct o2hb_disk_heartbeat_block *hb_block = slot->ds_raw_block;
@@ -630,7 +630,7 @@
spin_lock(&o2hb_live_lock);
fire_callbacks:
- /* dead nodes only come to life after some number of
+ /* dead nodes only come to life after some number of
* changes at any time during their dead time */
if (list_empty(&slot->ds_live_item) &&
slot->ds_changed_samples >= O2HB_LIVE_THRESHOLD) {
@@ -659,7 +659,7 @@
goto out;
/* live nodes only go dead after enough consequtive missed
- * samples.. reset the missed counter whenever we see
+ * samples.. reset the missed counter whenever we see
* activity */
if (slot->ds_equal_samples >= reg->hr_dead_iter || gen_changed) {
mlog(ML_HEARTBEAT, "Node %d left my region\n",
@@ -808,8 +808,8 @@
/* Explicit down notification - avoid forcing the other nodes
* to timeout on this region when we could just as easily
* write a clear generation - thus indicating to them that
- * this node has left this region.
- *
+ * this node has left this region.
+ *
* XXX: Should we skip this on unclean_stop? */
o2hb_prepare_block(reg, 0);
ret = o2hb_issue_node_write(reg, &write_bio, &write_wc);
@@ -868,7 +868,7 @@
}
EXPORT_SYMBOL_GPL(o2hb_fill_node_map);
-/*
+/*
* heartbeat configfs bits. The heartbeat set is a default set under
* the cluster set in nodemanager.c.
*/
@@ -1479,7 +1479,7 @@
break;
}
}
- if (list_empty(&hc->hc_item))
+ if (list_empty(&hc->hc_item))
list_add_tail(&hc->hc_item, &hbcall->list);
up_write(&o2hb_callback_sem);
@@ -1593,5 +1593,5 @@
reg->hr_unclean_stop = 1;
spin_unlock(&o2hb_live_lock);
-}
+}
EXPORT_SYMBOL_GPL(o2hb_stop_all_regions);
Modified: trunk/fs/ocfs2/cluster/heartbeat.h
===================================================================
--- trunk/fs/ocfs2/cluster/heartbeat.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/cluster/heartbeat.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -31,9 +31,9 @@
#define O2HB_REGION_TIMEOUT_MS 2000
-/* number of changes to be seen as live */
+/* number of changes to be seen as live */
#define O2HB_LIVE_THRESHOLD 2
-/* number of equal samples to be seen as dead */
+/* number of equal samples to be seen as dead */
#define O2HB_DEAD_THRESHOLD 7
#define O2HB_CB_MAGIC 0x51d1e4ec
@@ -66,7 +66,7 @@
void *data,
int priority);
int o2hb_register_callback(struct o2hb_callback_func *hc);
-int o2hb_unregister_callback(struct o2hb_callback_func *hc);
+int o2hb_unregister_callback(struct o2hb_callback_func *hc);
void o2hb_fill_node_map(unsigned long *map,
unsigned bytes);
void o2hb_fill_node_map_from_callback(unsigned long *map, unsigned bytes);
Modified: trunk/fs/ocfs2/cluster/masklog.c
===================================================================
--- trunk/fs/ocfs2/cluster/masklog.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/cluster/masklog.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -7,12 +7,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -69,7 +69,7 @@
state = "allow";
else if (__mlog_test_u64((u64)1 << bit, mlog_not_bits))
state = "deny";
- else
+ else
state = "off";
seq_printf(seq, "%s %s\n", *name, state);
Modified: trunk/fs/ocfs2/cluster/masklog.h
===================================================================
--- trunk/fs/ocfs2/cluster/masklog.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/cluster/masklog.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -7,12 +7,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -163,7 +163,7 @@
#endif
-/*
+/*
* smp_processor_id() "helpfully" screams when called outside preemptible
* regions in current kernels. sles doesn't have the variants that don't
* scream. just do this instead of trying to guess which we're building
Modified: trunk/fs/ocfs2/cluster/net_proc.c
===================================================================
--- trunk/fs/ocfs2/cluster/net_proc.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/cluster/net_proc.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -7,12 +7,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -94,7 +94,7 @@
spin_lock(&o2net_proc_lock);
nst = next_nst(dummy_nst);
list_del_init(&dummy_nst->st_net_proc_item);
- if (nst)
+ if (nst)
list_add(&dummy_nst->st_net_proc_item,
&nst->st_net_proc_item);
spin_unlock(&o2net_proc_lock);
@@ -109,7 +109,7 @@
spin_lock(&o2net_proc_lock);
nst = next_nst(dummy_nst);
- if (nst != NULL) {
+ if (nst != NULL) {
/* get_task_comm isn't exported. oh well. */
seq_printf(seq, "%p:\n"
" pid: %lu\n"
@@ -246,7 +246,7 @@
spin_lock(&o2net_proc_lock);
sc = next_sc(dummy_sc);
list_del_init(&dummy_sc->sc_net_proc_item);
- if (sc)
+ if (sc)
list_add(&dummy_sc->sc_net_proc_item, &sc->sc_net_proc_item);
spin_unlock(&o2net_proc_lock);
@@ -262,7 +262,7 @@
if (sc != NULL) {
/* netdev 1, world 0 */
-#ifdef INET_SK_RETURNS_INET_OPT
+#ifdef INET_SK_RETURNS_INET_OPT
struct inet_opt *inet = NULL;
#else
struct inet_sock *inet = NULL;
Modified: trunk/fs/ocfs2/cluster/nodemanager.c
===================================================================
--- trunk/fs/ocfs2/cluster/nodemanager.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/cluster/nodemanager.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -7,12 +7,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -61,7 +61,7 @@
.mode = 0555,
.child = ocfs2_nm_table
},
- { .ctl_name = 0}
+ { .ctl_name = 0}
};
static ctl_table ocfs2_kern_table[] = {
@@ -73,7 +73,7 @@
.mode = 0555,
.child = ocfs2_mod_table
},
- { .ctl_name = 0}
+ { .ctl_name = 0}
};
static ctl_table ocfs2_root_table[] = {
@@ -533,8 +533,8 @@
#if 0
static struct o2nm_node_group *to_o2nm_node_group(struct config_group *group)
{
- return group ?
- container_of(group, struct o2nm_node_group, ns_group)
+ return group ?
+ container_of(group, struct o2nm_node_group, ns_group)
: NULL;
}
#endif
Modified: trunk/fs/ocfs2/cluster/nodemanager.h
===================================================================
--- trunk/fs/ocfs2/cluster/nodemanager.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/cluster/nodemanager.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -40,7 +40,7 @@
struct o2nm_node {
spinlock_t nd_lock;
- struct config_item nd_item;
+ struct config_item nd_item;
char nd_name[O2NM_MAX_NAME_LEN+1]; /* replace? */
__u8 nd_num;
/* only one address per node, as attributes, for now. both
Modified: trunk/fs/ocfs2/cluster/ocfs2_heartbeat.h
===================================================================
--- trunk/fs/ocfs2/cluster/ocfs2_heartbeat.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/cluster/ocfs2_heartbeat.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/cluster/ocfs2_nodemanager.h
===================================================================
--- trunk/fs/ocfs2/cluster/ocfs2_nodemanager.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/cluster/ocfs2_nodemanager.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -12,12 +12,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/cluster/quorum.c
===================================================================
--- trunk/fs/ocfs2/cluster/quorum.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/cluster/quorum.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -8,12 +8,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -92,7 +92,7 @@
mlog(ML_ERROR, "fencing this node because it is "
"only connected to %u nodes and %u is needed "
"to make a quorum out of %u heartbeating nodes\n",
- qs->qs_connected, quorum,
+ qs->qs_connected, quorum,
qs->qs_heartbeating);
fence = 1;
}
@@ -106,10 +106,10 @@
mlog(ML_ERROR, "fencing this node because it is "
"only connected to %u nodes and %u is needed "
"to make a quorum out of %u heartbeating nodes\n",
- qs->qs_connected, quorum,
+ qs->qs_connected, quorum,
qs->qs_heartbeating);
}
- else if ((qs->qs_connected == quorum) &&
+ else if ((qs->qs_connected == quorum) &&
!lowest_reachable) {
mlog(ML_ERROR, "fencing this node because it is "
"connected to a half-quorum of %u out of %u "
@@ -119,7 +119,7 @@
fence = 1;
}
}
-
+
out:
spin_unlock(&qs->qs_lock);
/* this is horribly heavy-handed. It should instead flip the file
@@ -212,7 +212,7 @@
/* this tells us that we've decided that the node is still heartbeating
* even though we've lost it's conn. it must only be called after conn_err
- * and indicates that we must now make a quorum decision in the future,
+ * and indicates that we must now make a quorum decision in the future,
* though we might be doing so after waiting for holds to drain. Here
* we'll be dropping the hold from conn_err. */
void o2quo_hb_still_up(u8 node)
Modified: trunk/fs/ocfs2/cluster/quorum.h
===================================================================
--- trunk/fs/ocfs2/cluster/quorum.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/cluster/quorum.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -7,12 +7,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/cluster/tcp.c
===================================================================
--- trunk/fs/ocfs2/cluster/tcp.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/cluster/tcp.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -8,12 +8,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -70,7 +70,7 @@
#include "tcp_internal.h"
-/*
+/*
* In the following two log macros, the whitespace after the ',' just
* before ##args is intentional. Otherwise, gcc 2.95 will eat the
* previous token if args expands to nothing.
@@ -183,7 +183,7 @@
{
int ret = 0;
- do {
+ do {
if (!idr_pre_get(&nn->nn_status_idr, GFP_NOFS)) {
ret = -EAGAIN;
break;
@@ -232,7 +232,7 @@
static void o2net_complete_nsw(struct o2net_node *nn,
struct o2net_status_wait *nsw,
- u64 id, enum o2net_system_error sys_status,
+ u64 id, enum o2net_system_error sys_status,
s32 status)
{
spin_lock(&nn->nn_lock);
@@ -265,7 +265,7 @@
o2net_complete_nsw_locked(nn, nsw, O2NET_ERR_DIED, 0);
num_kills++;
}
-
+
mlog(0, "completed %d messages for node %u\n", num_kills,
o2net_num_from_nn(nn));
}
@@ -390,7 +390,7 @@
mlog_bug_on_msg(valid && !sc, "valid %u sc %p\n", valid, sc);
/* we won't reconnect after our valid conn goes away for
- * this hb iteration.. here so it shows up in the logs */
+ * this hb iteration.. here so it shows up in the logs */
if (was_valid && !valid && err == 0)
err = -ENOTCONN;
@@ -416,7 +416,7 @@
mlog(ML_NOTICE, "no longer connected to "
"node %s at %u.%u.%u.%u:%d\n",
old_sc->sc_node->nd_name,
- NIPQUAD(old_sc->sc_node->nd_ipv4_address),
+ NIPQUAD(old_sc->sc_node->nd_ipv4_address),
ntohs(old_sc->sc_node->nd_ipv4_port));
o2net_complete_nodes_nsw(nn);
}
@@ -432,8 +432,8 @@
mlog(ML_NOTICE, "%s node %s num %u at %u.%u.%u.%u:%d\n",
o2nm_this_node() > sc->sc_node->nd_num ?
"connected to" : "accepted connection from",
- sc->sc_node->nd_name, sc->sc_node->nd_num,
- NIPQUAD(sc->sc_node->nd_ipv4_address),
+ sc->sc_node->nd_name, sc->sc_node->nd_num,
+ NIPQUAD(sc->sc_node->nd_ipv4_address),
ntohs(sc->sc_node->nd_ipv4_port));
}
@@ -445,7 +445,7 @@
unsigned long delay;
/* delay if we're withing a RECONNECT_DELAY of the
* last attempt */
- delay = (nn->nn_last_connect_attempt +
+ delay = (nn->nn_last_connect_attempt +
msecs_to_jiffies(O2NET_RECONNECT_DELAY_MS))
- jiffies;
if (delay > msecs_to_jiffies(O2NET_RECONNECT_DELAY_MS))
@@ -501,10 +501,10 @@
switch(sk->sk_state) {
/* ignore connecting sockets as they make progress */
- case TCP_SYN_SENT:
- case TCP_SYN_RECV:
+ case TCP_SYN_SENT:
+ case TCP_SYN_RECV:
break;
- case TCP_ESTABLISHED:
+ case TCP_ESTABLISHED:
o2net_sc_queue_work(sc, &sc->sc_connect_work);
break;
default:
@@ -561,7 +561,7 @@
return ret;
}
-/*
+/*
* this is a little helper that is called by callers who have seen a problem
* with an sc and want to detach it from the nn if someone already hasn't beat
* them to it. if an error is given then the shutdown will be persistent
@@ -583,7 +583,7 @@
* sc detached from the nn. state_change will also trigger this callback
* directly when it sees errors. In that case we need to call set_nn_state
* ourselves as state_change couldn't get the nn_lock and call set_nn_state
- * itself.
+ * itself.
*/
static void o2net_shutdown_sc(void *arg)
{
@@ -645,7 +645,7 @@
break;
}
}
-
+
if (ret_p != NULL)
*ret_p = p;
if (ret_parent != NULL)
@@ -678,7 +678,7 @@
int ret = 0;
if (max_len > O2NET_MAX_PAYLOAD_BYTES) {
- mlog(0, "max_len for message handler out of range: %u\n",
+ mlog(0, "max_len for message handler out of range: %u\n",
max_len);
ret = -EINVAL;
goto out;
@@ -734,7 +734,7 @@
goto out;
out:
- if (ret)
+ if (ret)
kfree(nmh);
return ret;
@@ -779,13 +779,13 @@
{
int ret;
mm_segment_t oldfs;
- struct iovec iov = {
+ struct iovec iov = {
.iov_len = len,
- .iov_base = data
+ .iov_base = data
};
- struct msghdr msg = {
- .msg_iovlen = 1,
- .msg_iov = &iov,
+ struct msghdr msg = {
+ .msg_iovlen = 1,
+ .msg_iov = &iov,
.msg_flags = MSG_DONTWAIT,
};
@@ -839,7 +839,7 @@
ssize_t ret;
- ret = sc->sc_sock->ops->sendpage(sc->sc_sock,
+ ret = sc->sc_sock->ops->sendpage(sc->sc_sock,
virt_to_page(kmalloced_virt),
(long)kmalloced_virt & ~PAGE_MASK,
size, MSG_DONTWAIT);
@@ -871,7 +871,7 @@
if (nn->nn_persistent_error) {
ret = 1;
*sc_ret = NULL;
- *error = nn->nn_persistent_error;
+ *error = nn->nn_persistent_error;
} else if (nn->nn_sc_valid) {
kref_get(&nn->nn_sc->sc_kref);
@@ -1124,7 +1124,7 @@
mlog(ML_NOTICE, "node %s at %u.%u.%u.%u:%u advertised "
"net protocol version %llu but %llu is required,"
"disconnecting\n", sc->sc_node->nd_name,
- NIPQUAD(sc->sc_node->nd_ipv4_address),
+ NIPQUAD(sc->sc_node->nd_ipv4_address),
ntohs(sc->sc_node->nd_ipv4_port),
(unsigned long long)hand->protocol_version,
O2NET_PROTOCOL_VERSION);
@@ -1154,7 +1154,7 @@
}
/* this demuxes the queued rx bytes into header or payload bits and calls
- * handlers as each full message is read off the socket. it returns -error,
+ * handlers as each full message is read off the socket. it returns -error,
* == 0 eof, or > 0 for progress made.*/
static int o2net_advance_rx(struct o2net_sock_container *sc)
{
@@ -1263,7 +1263,7 @@
oldfs = get_fs();
set_fs(KERNEL_DS);
- /*
+ /*
* Dear unsuspecting programmer,
*
* Don't use sock_setsockopt() for SOL_TCP. It doesn't check its level
@@ -1315,7 +1315,7 @@
mlog(ML_NOTICE, "connection to node %s num %u at %u.%u.%u.%u:%d has "
"been idle for 10 seconds, shutting it down.\n",
sc->sc_node->nd_name, sc->sc_node->nd_num,
- NIPQUAD(sc->sc_node->nd_ipv4_address),
+ NIPQUAD(sc->sc_node->nd_ipv4_address),
ntohs(sc->sc_node->nd_ipv4_port));
o2net_sc_queue_work(sc, &sc->sc_shutdown_work);
@@ -1388,7 +1388,7 @@
mlog(0, "bind failed: %d\n", ret);
goto out;
}
-
+
ret = o2net_set_nodelay(sc->sc_sock);
if (ret) {
mlog(ML_ERROR, "setting TCP_NODELAY failed with %d\n", ret);
@@ -1405,9 +1405,9 @@
remoteaddr.sin_family = AF_INET;
remoteaddr.sin_addr.s_addr = node->nd_ipv4_address;
remoteaddr.sin_port = node->nd_ipv4_port;
-
+
ret = sc->sc_sock->ops->connect(sc->sc_sock,
- (struct sockaddr *)&remoteaddr,
+ (struct sockaddr *)&remoteaddr,
sizeof(remoteaddr),
O_NONBLOCK);
if (ret == -EINPROGRESS)
@@ -1417,8 +1417,8 @@
if (ret) {
mlog(ML_NOTICE, "connect attempt to node %s num %u at "
"%u.%u.%u.%u:%d failed with errno %d\n",
- sc->sc_node->nd_name, sc->sc_node->nd_num,
- NIPQUAD(sc->sc_node->nd_ipv4_address),
+ sc->sc_node->nd_name, sc->sc_node->nd_num,
+ NIPQUAD(sc->sc_node->nd_ipv4_address),
ntohs(sc->sc_node->nd_ipv4_port), ret);
/* 0 err so that another will be queued and attempted
* from set_nn_state */
@@ -1461,7 +1461,7 @@
{
struct o2net_node *nn = o2net_nn_from_num(node->nd_num);
- /* don't reconnect until it's heartbeating again */
+ /* don't reconnect until it's heartbeating again */
spin_lock(&nn->nn_lock);
o2net_set_nn_state(nn, NULL, 0, -ENOTCONN);
spin_unlock(&nn->nn_lock);
@@ -1491,7 +1491,7 @@
o2quo_hb_up(node_num);
/* ensure an immediate connect attempt */
- nn->nn_last_connect_attempt = jiffies -
+ nn->nn_last_connect_attempt = jiffies -
(msecs_to_jiffies(O2NET_RECONNECT_DELAY_MS) + 1);
if (node_num != o2nm_this_node()) {
@@ -1609,7 +1609,7 @@
if (o2nm_this_node() > node->nd_num) {
mlog(ML_NOTICE, "unexpected connect attempted from a lower "
"numbered node '%s' at " "%u.%u.%u.%u:%d with num %u\n",
- node->nd_name, NIPQUAD(sin.sin_addr.s_addr),
+ node->nd_name, NIPQUAD(sin.sin_addr.s_addr),
ntohs(sin.sin_port), node->nd_num);
ret = -EINVAL;
goto out;
@@ -1620,7 +1620,7 @@
if (!o2hb_check_node_heartbeating_from_callback(node->nd_num)) {
mlog(ML_CONN, "attempt to connect from node '%s' at "
"%u.%u.%u.%u:%d but it isn't heartbeating\n",
- node->nd_name, NIPQUAD(sin.sin_addr.s_addr),
+ node->nd_name, NIPQUAD(sin.sin_addr.s_addr),
ntohs(sin.sin_port));
ret = -EINVAL;
goto out;
@@ -1637,7 +1637,7 @@
if (ret) {
mlog(ML_NOTICE, "attempt to connect from node '%s' at "
"%u.%u.%u.%u:%d but it already has an open connection\n",
- node->nd_name, NIPQUAD(sin.sin_addr.s_addr),
+ node->nd_name, NIPQUAD(sin.sin_addr.s_addr),
ntohs(sin.sin_port));
goto out;
}
@@ -1729,14 +1729,14 @@
sock->sk->sk_reuse = 1;
ret = sock->ops->bind(sock, (struct sockaddr *)&sin, sizeof(sin));
if (ret < 0) {
- mlog(ML_ERROR, "unable to bind socket to port %d, ret=%d\n",
+ mlog(ML_ERROR, "unable to bind socket to port %d, ret=%d\n",
ntohs(port), ret);
goto out;
}
ret = sock->ops->listen(sock, 64);
if (ret < 0) {
- mlog(ML_ERROR, "unable to listen on port %d, ret=%d\n",
+ mlog(ML_ERROR, "unable to listen on port %d, ret=%d\n",
ntohs(port), ret);
}
@@ -1774,7 +1774,7 @@
if (ret) {
destroy_workqueue(o2net_wq);
o2net_wq = NULL;
- } else
+ } else
o2quo_conn_up(node->nd_num);
return ret;
@@ -1803,8 +1803,8 @@
o2nm_node_put(node);
}
}
-
- /* finish all work and tear down the work queue */
+
+ /* finish all work and tear down the work queue */
mlog(ML_KTHREAD, "waiting for o2net thread to exit....\n");
destroy_workqueue(o2net_wq);
o2net_wq = NULL;
Modified: trunk/fs/ocfs2/cluster/tcp.h
===================================================================
--- trunk/fs/ocfs2/cluster/tcp.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/cluster/tcp.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -69,7 +69,7 @@
/* ????????????????????????? */
case -ERESTARTSYS:
case -EBADF:
- /* When the server has died, an ICMP port unreachable
+ /* When the server has died, an ICMP port unreachable
* message prompts ECONNREFUSED. */
case -ECONNREFUSED:
case -ENOTCONN:
Modified: trunk/fs/ocfs2/cluster/tcp_internal.h
===================================================================
--- trunk/fs/ocfs2/cluster/tcp_internal.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/cluster/tcp_internal.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -7,12 +7,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/cluster/ver.c
===================================================================
--- trunk/fs/ocfs2/cluster/ver.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/cluster/ver.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/cluster/ver.h
===================================================================
--- trunk/fs/ocfs2/cluster/ver.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/cluster/ver.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/dcache.c
===================================================================
--- trunk/fs/ocfs2/dcache.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dcache.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/dcache.h
===================================================================
--- trunk/fs/ocfs2/dcache.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dcache.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/dir.c
===================================================================
--- trunk/fs/ocfs2/dir.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dir.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -8,12 +8,12 @@
* Copyright (C) 2002, 2004 Oracle. All rights reserved.
*
* Portions of this code from linux/fs/ext3/dir.c
- *
+ *
* Copyright (C) 1992, 1993, 1994, 1995
* Remy Card (card at masi.ibp.fr)
* Laboratoire MASI - Institut Blaise pascal
* Universite Pierre et Marie Curie (Paris VI)
- *
+ *
* from
*
* linux/fs/minix/dir.c
@@ -24,12 +24,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -63,8 +63,8 @@
DT_UNKNOWN, DT_REG, DT_DIR, DT_CHR, DT_BLK, DT_FIFO, DT_SOCK, DT_LNK
};
-static int ocfs2_extend_dir(ocfs2_super *osb,
- struct inode *dir,
+static int ocfs2_extend_dir(ocfs2_super *osb,
+ struct inode *dir,
struct buffer_head *parent_fe_bh,
struct buffer_head **new_de_bh);
/*
@@ -149,7 +149,7 @@
filp->f_version = inode->i_version;
}
- while (!error && filp->f_pos < i_size_read(inode)
+ while (!error && filp->f_pos < i_size_read(inode)
&& offset < sb->s_blocksize) {
de = (struct ocfs2_dir_entry *) (bh->b_data + offset);
if (!ocfs2_check_dir_entry(inode, de, bh, offset)) {
@@ -171,7 +171,7 @@
*/
unsigned long version = filp->f_version;
unsigned char d_type = DT_UNKNOWN;
-
+
if (de->file_type < OCFS2_FT_MAX)
d_type = ocfs2_filetype_table[de->file_type];
error = filldir(dirent, de->name,
@@ -288,7 +288,7 @@
(OCFS2_DIR_REC_LEN(1) + OCFS2_DIR_REC_LEN(2))) ||
!(bh = ocfs2_bread(inode, 0, &err, 0))) {
mlog(ML_ERROR, "bad directory (dir #%"MLFu64") - "
- "no data block\n",
+ "no data block\n",
OCFS2_I(inode)->ip_blkno);
return 1;
}
@@ -297,7 +297,7 @@
de1 = (struct ocfs2_dir_entry *)
((char *)de + le16_to_cpu(de->rec_len));
if ((le64_to_cpu(de->inode) != OCFS2_I(inode)->ip_blkno) ||
- !le64_to_cpu(de1->inode) ||
+ !le64_to_cpu(de1->inode) ||
strcmp(".", de->name) ||
strcmp("..", de1->name)) {
mlog(ML_ERROR, "bad directory (dir #%"MLFu64") - "
@@ -457,7 +457,7 @@
goto bail;
}
- status = ocfs2_do_extend_dir(osb->sb, handle, dir, parent_fe_bh,
+ status = ocfs2_do_extend_dir(osb->sb, handle, dir, parent_fe_bh,
data_ac, meta_ac, &new_bh);
if (status < 0) {
mlog_errno(status);
@@ -466,7 +466,7 @@
ocfs2_set_new_buffer_uptodate(dir, new_bh);
- status = ocfs2_journal_access(handle, dir, new_bh,
+ status = ocfs2_journal_access(handle, dir, new_bh,
OCFS2_JOURNAL_ACCESS_CREATE);
if (status < 0) {
mlog_errno(status);
@@ -476,7 +476,7 @@
de = (struct ocfs2_dir_entry *) new_bh->b_data;
de->inode = 0;
de->rec_len = le16_to_cpu(sb->s_blocksize);
- status = ocfs2_journal_dirty(handle, new_bh);
+ status = ocfs2_journal_dirty(handle, new_bh);
if (status < 0) {
mlog_errno(status);
goto bail;
@@ -513,10 +513,10 @@
* Search the dir for a good spot, extending it if necessary. The
* block containing an appropriate record is returned in ret_de_bh.
*/
-int ocfs2_prepare_dir_for_insert(ocfs2_super *osb,
+int ocfs2_prepare_dir_for_insert(ocfs2_super *osb,
struct inode *dir,
struct buffer_head *parent_fe_bh,
- const char *name,
+ const char *name,
int namelen,
struct buffer_head **ret_de_bh)
{
@@ -530,7 +530,7 @@
mlog_entry_void();
- mlog(0, "getting ready to insert namelen %d into dir %"MLFu64"\n",
+ mlog(0, "getting ready to insert namelen %d into dir %"MLFu64"\n",
namelen, OCFS2_I(dir)->ip_blkno);
BUG_ON(!S_ISDIR(dir->i_mode));
@@ -560,8 +560,8 @@
bh = NULL;
if (i_size_read(dir) <= offset) {
- status = ocfs2_extend_dir(osb,
- dir,
+ status = ocfs2_extend_dir(osb,
+ dir,
parent_fe_bh,
&bh);
if (status < 0) {
@@ -573,9 +573,9 @@
get_bh(*ret_de_bh);
goto bail;
}
- bh = ocfs2_bread(dir,
- offset >> sb->s_blocksize_bits,
- &status,
+ bh = ocfs2_bread(dir,
+ offset >> sb->s_blocksize_bits,
+ &status,
0);
if (!bh) {
mlog_errno(status);
Modified: trunk/fs/ocfs2/dir.h
===================================================================
--- trunk/fs/ocfs2/dir.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dir.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -37,10 +37,10 @@
struct buffer_head **dirent_bh,
struct ocfs2_dir_entry **dirent);
int ocfs2_readdir(struct file *filp, void *dirent, filldir_t filldir);
-int ocfs2_prepare_dir_for_insert(ocfs2_super *osb,
+int ocfs2_prepare_dir_for_insert(ocfs2_super *osb,
struct inode *dir,
struct buffer_head *parent_fe_bh,
- const char *name,
+ const char *name,
int namelen,
struct buffer_head **ret_de_bh);
struct _ocfs2_alloc_context;
Modified: trunk/fs/ocfs2/dlm/dlmapi.h
===================================================================
--- trunk/fs/ocfs2/dlm/dlmapi.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlm/dlmapi.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -6,17 +6,17 @@
* externally exported dlm interfaces
*
* Copyright (C) 2004 Oracle. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/dlm/dlmast.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmast.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlm/dlmast.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/dlm/dlmcommon.h
===================================================================
--- trunk/fs/ocfs2/dlm/dlmcommon.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlm/dlmcommon.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -9,12 +9,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/dlm/dlmconvert.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmconvert.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlm/dlmconvert.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/dlm/dlmconvert.h
===================================================================
--- trunk/fs/ocfs2/dlm/dlmconvert.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlm/dlmconvert.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -9,12 +9,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/dlm/dlmdebug.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmdebug.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlm/dlmdebug.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/dlm/dlmdebug.h
===================================================================
--- trunk/fs/ocfs2/dlm/dlmdebug.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlm/dlmdebug.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -9,12 +9,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/dlm/dlmdomain.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmdomain.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlm/dlmdomain.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/dlm/dlmdomain.h
===================================================================
--- trunk/fs/ocfs2/dlm/dlmdomain.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlm/dlmdomain.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -9,12 +9,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/dlm/dlmfs.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmfs.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlm/dlmfs.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -14,12 +14,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/dlm/dlmfsver.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmfsver.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlm/dlmfsver.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/dlm/dlmfsver.h
===================================================================
--- trunk/fs/ocfs2/dlm/dlmfsver.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlm/dlmfsver.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/dlm/dlmlock.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmlock.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlm/dlmlock.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/dlm/dlmmaster.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmmaster.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlm/dlmmaster.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/dlm/dlmrecovery.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmrecovery.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlm/dlmrecovery.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -257,7 +257,7 @@
}
/* callers of the top-level api calls (dlmlock/dlmunlock) should
- * block on the dlm->reco.event when recovery is in progress.
+ * block on the dlm->reco.event when recovery is in progress.
* the dlm recovery thread will set this state when it begins
* recovering a dead node (as the new master or not) and clear
* the state and wake as soon as all affected lock resources have
@@ -447,7 +447,7 @@
break;
}
}
-
+
mlog(0, "done requesting all lock info\n");
/* nodes should be sending reco data now
@@ -902,7 +902,7 @@
mres->master = master;
}
-
+
/* returns 1 if this lock fills the network structure,
* 0 otherwise */
static int dlm_add_lock_to_array(struct dlm_lock *lock,
@@ -977,7 +977,7 @@
total_locks++;
if (!dlm_add_lock_to_array(lock, mres, i))
continue;
-
+
/* this filled the lock message,
* we must send it immediately. */
ret = dlm_send_mig_lockres_msg(dlm, mres, send_to,
@@ -1223,7 +1223,7 @@
* event of a new_master death, so the only possible
* responses that we can get from nodes here are
* that the master is new_master, or that the master
- * is UNKNOWN.
+ * is UNKNOWN.
* if all nodes come back with UNKNOWN then we know
* the lock needs remastering here.
* if any node comes back with a valid master, check
@@ -1231,7 +1231,7 @@
* recovering. if so, then the new_master died and
* we need to remaster this lock. if not, then the
* new_master survived and that node will respond to
- * other nodes about the owner.
+ * other nodes about the owner.
* if there is an owner, this node needs to dump this
* lockres and alert the sender that this lockres
* was rejected. */
@@ -1253,8 +1253,8 @@
}
return ret;
}
-
+
static int dlm_do_master_requery(struct dlm_ctxt *dlm,
struct dlm_lock_resource *res,
u8 nodenum, u8 *real_master)
@@ -1382,7 +1382,7 @@
BUG_ON(ml->highest_blocked != LKM_IVMODE);
newlock = NULL;
lksb = NULL;
-
+
queue = dlm_list_num_to_pointer(res, ml->list);
/* if the lock is for the local node it needs to
@@ -1391,7 +1391,7 @@
if (ml->node == dlm->node_num) {
/* MIGRATION ONLY! */
BUG_ON(!(mres->flags & DLM_MRES_MIGRATION));
-
+
spin_lock(&res->spinlock);
list_for_each(iter, queue) {
lock = list_entry (iter, struct dlm_lock, list);
@@ -1410,16 +1410,16 @@
BUG();
}
BUG_ON(lock->ml.node != ml->node);
-
+
/* see NOTE above about why we do not update
* to match the master here */
-
+
/* move the lock to its proper place */
/* do not alter lock refcount. switching lists. */
list_del_init(&lock->list);
list_add_tail(&lock->list, queue);
spin_unlock(&res->spinlock);
-
+
mlog(0, "just reordered a local lock!\n");
continue;
}
@@ -1432,7 +1432,7 @@
}
lksb = newlock->lksb;
dlm_lock_attach_lockres(newlock, res);
-
+
if (ml->convert_type != LKM_IVMODE) {
BUG_ON(queue != &res->converting);
newlock->ml.convert_type = ml->convert_type;
@@ -1565,7 +1565,7 @@
struct dlm_lock_resource *res;
mlog_entry_void();
-
+
assert_spin_locked(&dlm->spinlock);
list_for_each_safe(iter, iter2, &dlm->reco.resources) {
@@ -1861,7 +1861,7 @@
}
} else if (ret == DLM_NOTQUEUED) {
mlog(0, "dlm=%s dlmlock says another node got it (this=%u)\n",
- dlm->name, dlm->node_num);
+ dlm->name, dlm->node_num);
/* another node is master. wait on
* reco.new_master != O2NM_INVALID_NODE_NUM */
status = -EEXIST;
Modified: trunk/fs/ocfs2/dlm/dlmthread.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmthread.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlm/dlmthread.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -327,7 +327,7 @@
if (can_grant) {
spin_lock(&target->spinlock);
BUG_ON(target->ml.highest_blocked != LKM_IVMODE);
-
+
mlog(0, "calling ast for converting lock: %.*s, have: %d, "
"granting: %d, node: %u\n", res->lockname.len,
res->lockname.name, target->ml.type,
@@ -391,7 +391,7 @@
if (can_grant) {
spin_lock(&target->spinlock);
BUG_ON(target->ml.highest_blocked != LKM_IVMODE);
-
+
mlog(0, "calling ast for blocked lock: %.*s, granting: %d, "
"node: %u\n", res->lockname.len, res->lockname.name,
target->ml.type, target->ml.node);
@@ -402,7 +402,7 @@
BUG_ON(!target->lksb);
target->lksb->status = DLM_NORMAL;
-
+
spin_unlock(&target->spinlock);
__dlm_lockres_reserve_ast(res);
@@ -566,14 +566,14 @@
mlog(0, "delivering a bast for this lockres "
"(blocked = %d\n", hi);
-
+
if (lock->ml.node != dlm->node_num) {
ret = dlm_send_proxy_bast(dlm, res, lock, hi);
if (ret < 0)
mlog_errno(ret);
} else
dlm_do_local_bast(dlm, res, lock, hi);
-
+
spin_lock(&dlm->ast_lock);
/* possible that another bast was queued while
@@ -584,7 +584,7 @@
"keep the bast_pending flag set.\n");
} else
lock->bast_pending = 0;
-
+
/* drop the extra ref.
* this may drop it completely. */
dlm_lock_put(lock);
@@ -608,7 +608,7 @@
while (!kthread_should_stop()) {
int n = DLM_THREAD_MAX_DIRTY;
-
+
/* dlm_shutting_down is very point-in-time, but that
* doesn't matter as we'll just loop back around if we
* get false on the leading edge of a state
@@ -627,12 +627,12 @@
int delay = 0;
res = list_entry(dlm->dirty_list.next,
struct dlm_lock_resource, dirty);
-
+
/* peel a lockres off, remove it from the list,
* unset the dirty flag and drop the dlm lock */
BUG_ON(!res);
dlm_lockres_get(res);
-
+
spin_lock(&res->spinlock);
res->state &= ~DLM_LOCK_RES_DIRTY;
list_del_init(&res->dirty);
@@ -644,7 +644,7 @@
spin_lock(&res->spinlock);
BUG_ON(res->owner != dlm->node_num);
-
+
/* it is now ok to move lockreses in these states
* to the dirty list, assuming that they will only be
* dirty for a short while. */
@@ -665,10 +665,10 @@
* recovering/in-progress. we have the lockres
* spinlock and do NOT have the dlm lock.
* safe to reserve/queue asts and run the lists. */
-
+
mlog(0, "calling dlm_shuffle_lists with dlm=%p, "
"res=%p\n", dlm, res);
-
+
/* called while holding lockres lock */
dlm_shuffle_lists(dlm, res);
spin_unlock(&res->spinlock);
@@ -687,7 +687,7 @@
spin_unlock(&res->spinlock);
}
dlm_lockres_put(res);
-
+
/* unlikely, but we may need to give time to
* other tasks */
if (!--n) {
Modified: trunk/fs/ocfs2/dlm/dlmunlock.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmunlock.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlm/dlmunlock.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -160,7 +160,7 @@
/* By now this has been masked out of cancel requests. */
if (flags & LKM_VALBLK) {
- /* make the final update to the lvb */
+ /* make the final update to the lvb */
if (master_node)
memcpy(res->lvb, lksb->lvb, DLM_LVB_LEN);
else
Modified: trunk/fs/ocfs2/dlm/dlmver.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmver.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlm/dlmver.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/dlm/dlmver.h
===================================================================
--- trunk/fs/ocfs2/dlm/dlmver.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlm/dlmver.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/dlm/userdlm.c
===================================================================
--- trunk/fs/ocfs2/dlm/userdlm.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlm/userdlm.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -15,12 +15,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/dlm/userdlm.h
===================================================================
--- trunk/fs/ocfs2/dlm/userdlm.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlm/userdlm.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/dlmglue.c
===================================================================
--- trunk/fs/ocfs2/dlmglue.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlmglue.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -123,7 +123,7 @@
static inline int ocfs2_is_inode_lock(struct ocfs2_lock_res *lockres)
{
- return lockres->l_type == OCFS2_LOCK_TYPE_META ||
+ return lockres->l_type == OCFS2_LOCK_TYPE_META ||
lockres->l_type == OCFS2_LOCK_TYPE_DATA;
}
@@ -139,7 +139,7 @@
static inline ocfs2_super *ocfs2_lock_res_super(struct ocfs2_lock_res *lockres)
{
- BUG_ON(!ocfs2_is_super_lock(lockres)
+ BUG_ON(!ocfs2_is_super_lock(lockres)
&& !ocfs2_is_rename_lock(lockres));
return (ocfs2_super *) lockres->l_priv;
@@ -278,8 +278,8 @@
BUG_ON(type >= OCFS2_NUM_LOCK_TYPES);
- len = snprintf(name, OCFS2_LOCK_ID_MAX_LEN, "%c%s%016"MLFx64"%08x",
- ocfs2_lock_type_char(type), OCFS2_LOCK_ID_PAD, blkno,
+ len = snprintf(name, OCFS2_LOCK_ID_MAX_LEN, "%c%s%016"MLFx64"%08x",
+ ocfs2_lock_type_char(type), OCFS2_LOCK_ID_PAD, blkno,
generation);
BUG_ON(len != (OCFS2_LOCK_ID_MAX_LEN - 1));
@@ -613,8 +613,8 @@
if (level > lockres->l_blocking) {
/* only schedule a downconvert if we haven't already scheduled
- * one that goes low enough to satisfy the level we're
- * blocking. this also catches the case where we get
+ * one that goes low enough to satisfy the level we're
+ * blocking. this also catches the case where we get
* duplicate BASTs */
if (ocfs2_highest_compat_lock_level(level) <
ocfs2_highest_compat_lock_level(lockres->l_blocking))
@@ -643,7 +643,7 @@
mlog(0, "BAST fired for inode %"MLFu64", blocking = %d, level = %d "
"type = %s\n", OCFS2_I(inode)->ip_blkno, level,
- lockres->l_level,
+ lockres->l_level,
(lockres->l_type == OCFS2_LOCK_TYPE_META) ? "Meta" : "Data");
BUG_ON(level <= LKM_NLMODE);
@@ -803,7 +803,7 @@
/* Note: If we detect another process working on the lock (i.e.,
* OCFS2_LOCK_BUSY), we'll bail out returning 0. It's up to the caller
- * to do the right thing in that case.
+ * to do the right thing in that case.
*/
static int ocfs2_lock_create(ocfs2_super *osb,
struct ocfs2_lock_res *lockres,
@@ -815,11 +815,11 @@
mlog_entry_void();
- mlog(0, "lock %s, level = %d, flags = %d\n", lockres->l_name, level,
+ mlog(0, "lock %s, level = %d, flags = %d\n", lockres->l_name, level,
flags);
spin_lock(&lockres->l_lock);
- if ((lockres->l_flags & OCFS2_LOCK_ATTACHED) ||
+ if ((lockres->l_flags & OCFS2_LOCK_ATTACHED) ||
(lockres->l_flags & OCFS2_LOCK_BUSY)) {
spin_unlock(&lockres->l_lock);
goto bail;
@@ -1206,7 +1206,7 @@
mlog_entry_void();
mlog(0, "inode %"MLFu64" drop %s DATA lock\n",
- OCFS2_I(inode)->ip_blkno,
+ OCFS2_I(inode)->ip_blkno,
write ? "EXMODE" : "PRMODE");
ocfs2_cluster_unlock(OCFS2_SB(inode->i_sb), lockres, level);
@@ -1249,7 +1249,7 @@
/* take advantage of the fact that we don't support holes --
* we only need the byte offset from i_clusters which nicely
* cuts our lvb storage requirement to a u32 */
- isize_off = ocfs2_clusters_to_bytes(inode->i_sb, oi->ip_clusters)
+ isize_off = ocfs2_clusters_to_bytes(inode->i_sb, oi->ip_clusters)
- i_size_read(inode);
lvb->lvb_isize_off = cpu_to_be32(isize_off);
@@ -1547,7 +1547,7 @@
return status;
}
-/*
+/*
* returns < 0 error if the callback will never be called, otherwise
* the result of the lock will be communicated via the callback.
*/
@@ -2106,7 +2106,7 @@
mlog(0, "lockres %s currently being refreshed -- backing "
"off!\n", lockres->l_name);
} else if (new_level == LKM_PRMODE)
- ret = !lockres->l_ex_holders &&
+ ret = !lockres->l_ex_holders &&
ocfs2_inode_fully_checkpointed(inode);
else /* Must be NLMODE we're converting to. */
ret = !lockres->l_ro_holders && !lockres->l_ex_holders &&
@@ -2228,7 +2228,7 @@
/* if we're blocking an exclusive and we have *any* holders,
* then requeue. */
- if ((lockres->l_blocking == LKM_EXMODE)
+ if ((lockres->l_blocking == LKM_EXMODE)
&& (lockres->l_ex_holders || lockres->l_ro_holders)) {
spin_unlock(&lockres->l_lock);
*requeue = 1;
Modified: trunk/fs/ocfs2/dlmglue.h
===================================================================
--- trunk/fs/ocfs2/dlmglue.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/dlmglue.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -42,7 +42,7 @@
* otherwise, we take the slow path to get up to date and then set our
* local seq to the lvb seq.
*
- * PR->NL:
+ * PR->NL:
* If LVB is valid:
* We increment our local seq. -- this allows up to
* one set of changes to the lvb before we considers ourselves
Modified: trunk/fs/ocfs2/extent_map.c
===================================================================
--- trunk/fs/ocfs2/extent_map.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/extent_map.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License, version 2, as published by the Free Software Foundation.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -131,7 +131,7 @@
* Find the leaf containing the interval we want. While we're on our
* way down the tree, fill in every record we see at any depth, because
* we might want it later.
- *
+ *
* Note that this code is run without ip_lock. That's because it
* sleeps while reading. If someone is also filling the extent list at
* the same time we are, we might have to restart.
@@ -184,7 +184,7 @@
* interval. We don't insert it because we're
* about to traverse it.
*/
-
+
/* Check to see if we're stradling */
ret = -ESRCH;
if ((rec->e_cpos > cpos) ||
@@ -328,7 +328,7 @@
{
struct rb_node **p, *parent;
struct ocfs2_extent_map_entry *old_ent;
-
+
old_ent = ocfs2_extent_map_lookup(em, ent->e_rec.e_cpos,
ent->e_rec.e_clusters,
&p, &parent);
@@ -397,7 +397,7 @@
*/
ctxt->need_left = !!(rec->e_cpos > old_ent->e_rec.e_cpos);
ctxt->need_right = !!((old_ent->e_rec.e_cpos +
- old_ent->e_rec.e_clusters) >
+ old_ent->e_rec.e_clusters) >
(rec->e_cpos + rec->e_clusters));
ret = -EAGAIN;
if (ctxt->need_left) {
@@ -440,7 +440,7 @@
}
ret = ocfs2_extent_map_insert_entry(em, ctxt->new_ent);
-
+
if (!ret)
ctxt->new_ent = NULL;
@@ -463,7 +463,7 @@
/* Zero e_clusters means a truncated tail record. It better be EOF */
if (!rec->e_clusters) {
- if ((rec->e_cpos + rec->e_clusters) !=
+ if ((rec->e_cpos + rec->e_clusters) !=
OCFS2_I(inode)->ip_map.em_clusters)
return -EBADR;
@@ -521,7 +521,7 @@
* Existing record in the extent map:
*
* cpos = 10, len = 10
- * |---------|
+ * |---------|
*
* New Record:
*
@@ -582,9 +582,9 @@
BUG_ON(old->e_cpos != rec->e_cpos);
BUG_ON(old->e_blkno != rec->e_blkno);
ret = 0;
- }
+ }
/*
- * Let non-leafs fall through as -ENOENT to
+ * Let non-leafs fall through as -ENOENT to
* force insertion of the new leaf.
*/
old->e_clusters += new_clusters;
@@ -638,7 +638,7 @@
ent = ocfs2_extent_map_lookup(&OCFS2_I(inode)->ip_map, cpos, 1,
NULL, NULL);
-
+
if (ent) {
*rec = &ent->e_rec;
if (tree_depth)
Modified: trunk/fs/ocfs2/extent_map.h
===================================================================
--- trunk/fs/ocfs2/extent_map.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/extent_map.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -10,12 +10,12 @@
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License, version 2, as published by the Free Software Foundation.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/file.c
===================================================================
--- trunk/fs/ocfs2/file.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/file.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -50,7 +50,7 @@
#include "buffer_head_io.h"
static int ocfs2_zero_extend(struct inode *inode);
-static int ocfs2_orphan_for_truncate(ocfs2_super *osb,
+static int ocfs2_orphan_for_truncate(ocfs2_super *osb,
struct inode *inode,
struct buffer_head *fe_bh,
u64 new_i_size);
@@ -67,7 +67,7 @@
int mode = file->f_flags;
struct ocfs2_inode_info *oi = OCFS2_I(inode);
- mlog_entry("(0x%p, 0x%p, '%.*s')\n", inode, file,
+ mlog_entry("(0x%p, 0x%p, '%.*s')\n", inode, file,
file->f_dentry->d_name.len, file->f_dentry->d_name.name);
spin_lock(&oi->ip_lock);
@@ -98,7 +98,7 @@
struct ocfs2_inode_info *oi = OCFS2_I(inode);
mlog_entry("(0x%p, 0x%p, '%.*s')\n", inode, file,
- file->f_dentry->d_name.len,
+ file->f_dentry->d_name.len,
file->f_dentry->d_name.name);
spin_lock(&oi->ip_lock);
@@ -175,7 +175,7 @@
size_t count,
loff_t *ppos)
{
- struct iovec local_iov = { .iov_base = (void __user *)buf,
+ struct iovec local_iov = { .iov_base = (void __user *)buf,
.iov_len = count };
int ret = 0;
ocfs2_super *osb = NULL;
@@ -186,7 +186,7 @@
mlog_entry("(0x%p, 0x%p, %u, '%.*s')\n", filp, buf,
(unsigned int)count,
- filp->f_dentry->d_name.len,
+ filp->f_dentry->d_name.len,
filp->f_dentry->d_name.name);
/* happy write of zero bytes */
@@ -214,7 +214,7 @@
if (osb->s_mount_opt & OCFS2_MOUNT_COMPAT_OCFS) {
unsigned int saved_flags = filp->f_flags;
- if (info.wl_do_direct_io)
+ if (info.wl_do_direct_io)
filp->f_flags |= O_DIRECT;
else
filp->f_flags &= ~O_DIRECT;
@@ -274,7 +274,7 @@
int sector_size = 1 << osb->s_sectsize_bits;
if (((*ppos) & (sector_size - 1)) ||
- (count & (sector_size - 1)) ||
+ (count & (sector_size - 1)) ||
((unsigned long)buf & (sector_size - 1)) ||
(i_size_read(inode) & (sector_size -1))) {
filp->f_flags &= ~O_DIRECT;
@@ -411,7 +411,7 @@
return status;
}
-static int ocfs2_orphan_for_truncate(ocfs2_super *osb,
+static int ocfs2_orphan_for_truncate(ocfs2_super *osb,
struct inode *inode,
struct buffer_head *fe_bh,
u64 new_i_size)
@@ -443,7 +443,7 @@
return status;
}
-static int ocfs2_truncate_file(ocfs2_super *osb,
+static int ocfs2_truncate_file(ocfs2_super *osb,
u64 new_i_size,
struct inode *inode)
{
@@ -453,7 +453,7 @@
ocfs2_journal_handle *handle = NULL;
struct ocfs2_truncate_context *tc = NULL;
- mlog_entry("(inode = %"MLFu64", new_i_size = %"MLFu64"\n",
+ mlog_entry("(inode = %"MLFu64", new_i_size = %"MLFu64"\n",
OCFS2_I(inode)->ip_blkno, new_i_size);
truncate_inode_pages(inode->i_mapping, new_i_size);
@@ -496,8 +496,8 @@
mlog(0, "fe->i_clusters = %u, so we do a simple truncate\n",
fe->i_clusters);
/* No allocation change is required, so lets fast path
- * this truncate. */
- handle = ocfs2_start_trans(osb, NULL,
+ * this truncate. */
+ handle = ocfs2_start_trans(osb, NULL,
OCFS2_INODE_UPDATE_CREDITS);
if (handle == NULL) {
status = -ENOMEM;
@@ -599,16 +599,16 @@
/*
* extend allocation only here.
* we'll update all the disk stuff, and oip->alloc_size
- *
+ *
* expect stuff to be locked, a transaction started and enough data /
* metadata reservations in the contexts. I'll return -EAGAIN, if we
* run out of transaction credits, so the caller can restart us.
*/
-int ocfs2_extend_allocation(ocfs2_super *osb,
- struct inode *inode,
- u32 clusters_to_add,
+int ocfs2_extend_allocation(ocfs2_super *osb,
+ struct inode *inode,
+ u32 clusters_to_add,
struct buffer_head *fe_bh,
- ocfs2_journal_handle *handle,
+ ocfs2_journal_handle *handle,
ocfs2_alloc_context *data_ac,
ocfs2_alloc_context *meta_ac,
enum ocfs2_alloc_restarted *reason)
@@ -629,9 +629,9 @@
}
/* there are two cases which could cause us to EAGAIN in the
- * we-need-more-metadata case:
+ * we-need-more-metadata case:
* 1) we haven't reserved *any*
- * 2) we are so fragmented, we've needed to add metadata too
+ * 2) we are so fragmented, we've needed to add metadata too
* many times. */
if (!free_extents && !meta_ac) {
mlog(0, "we haven't reserved any metadata!\n");
@@ -670,7 +670,7 @@
block = ocfs2_clusters_to_blocks(osb->sb, bit_off);
mlog(0, "Allocating %u clusters at block %u for inode %"MLFu64"\n",
num_bits, bit_off, OCFS2_I(inode)->ip_blkno);
- status = ocfs2_insert_extent(osb, handle, inode, fe_bh, block,
+ status = ocfs2_insert_extent(osb, handle, inode, fe_bh, block,
num_bits, meta_ac);
if (status < 0) {
mlog_errno(status);
@@ -711,7 +711,7 @@
* dinode->i_size, NOT how much allocated was actually added to the
* file. It will always be correct, even when we return an error.
*/
-int ocfs2_extend_file(ocfs2_super *osb,
+int ocfs2_extend_file(ocfs2_super *osb,
struct inode *inode,
u64 new_i_size,
u64 *bytes_extended)
@@ -760,19 +760,19 @@
if (i_size_read(inode) == new_i_size)
goto leave;
- clusters_to_add = ocfs2_clusters_for_bytes(osb->sb, new_i_size)
+ clusters_to_add = ocfs2_clusters_for_bytes(osb->sb, new_i_size)
- fe->i_clusters;
mlog(0, "extend inode %"MLFu64", new_i_size = %"MLFu64", "
- "i_size = %lld, fe->i_clusters = %u, clusters_to_add = %u\n",
+ "i_size = %lld, fe->i_clusters = %u, clusters_to_add = %u\n",
OCFS2_I(inode)->ip_blkno, new_i_size, i_size_read(inode),
fe->i_clusters, clusters_to_add);
if (!clusters_to_add)
goto do_start_trans;
- num_free_extents = ocfs2_num_free_extents(osb,
- inode,
+ num_free_extents = ocfs2_num_free_extents(osb,
+ inode,
fe);
if (num_free_extents < 0) {
status = num_free_extents;
@@ -781,9 +781,9 @@
}
if (!num_free_extents) {
- status = ocfs2_reserve_new_metadata(osb,
- handle,
- fe,
+ status = ocfs2_reserve_new_metadata(osb,
+ handle,
+ fe,
&meta_ac);
if (status < 0) {
if (status != -ENOSPC)
@@ -792,8 +792,8 @@
}
}
- status = ocfs2_reserve_clusters(osb,
- handle,
+ status = ocfs2_reserve_clusters(osb,
+ handle,
clusters_to_add,
&data_ac);
if (status < 0) {
@@ -834,8 +834,8 @@
if (!clusters_to_add)
goto no_alloc;
- status = ocfs2_extend_allocation(osb,
- inode,
+ status = ocfs2_extend_allocation(osb,
+ inode,
clusters_to_add,
bh,
handle,
@@ -848,8 +848,8 @@
goto leave;
}
- if (status == -EAGAIN
- && (new_i_size >
+ if (status == -EAGAIN
+ && (new_i_size >
ocfs2_clusters_to_bytes(osb->sb, fe->i_clusters))) {
if (why == RESTART_META) {
@@ -857,7 +857,7 @@
restart_func = 1;
} else {
BUG_ON(why != RESTART_TRANS);
-
+
new_fe_size = ocfs2_clusters_to_bytes(osb->sb,
fe->i_clusters);
*bytes_extended += new_fe_size - fe->i_size;
@@ -874,13 +874,13 @@
goto leave;
}
- clusters_to_add =
+ clusters_to_add =
ocfs2_clusters_for_bytes(osb->sb,
new_i_size)
- fe->i_clusters;
mlog(0, "restarting transaction.\n");
/* TODO: This can be more intelligent. */
- credits = ocfs2_calc_extend_credits(osb->sb,
+ credits = ocfs2_calc_extend_credits(osb->sb,
fe,
clusters_to_add);
status = ocfs2_extend_trans(handle, credits);
Modified: trunk/fs/ocfs2/file.h
===================================================================
--- trunk/fs/ocfs2/file.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/file.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -36,11 +36,11 @@
RESTART_TRANS = 0,
RESTART_META
};
-int ocfs2_extend_allocation(ocfs2_super *osb,
- struct inode *inode,
- u32 clusters_to_add,
+int ocfs2_extend_allocation(ocfs2_super *osb,
+ struct inode *inode,
+ u32 clusters_to_add,
struct buffer_head *fe_bh,
- ocfs2_journal_handle *handle,
+ ocfs2_journal_handle *handle,
struct _ocfs2_alloc_context *data_ac,
struct _ocfs2_alloc_context *meta_ac,
enum ocfs2_alloc_restarted *reason);
@@ -48,7 +48,7 @@
int ocfs2_getattr(struct vfsmount *mnt, struct dentry *dentry,
struct kstat *stat);
int ocfs2_sync_inode(struct inode *inode);
-int ocfs2_extend_file(ocfs2_super *osb,
+int ocfs2_extend_file(ocfs2_super *osb,
struct inode *inode,
u64 new_i_size,
u64 *bytes_extended);
Modified: trunk/fs/ocfs2/heartbeat.c
===================================================================
--- trunk/fs/ocfs2/heartbeat.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/heartbeat.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -12,12 +12,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -214,7 +214,7 @@
void ocfs2_node_map_init(struct ocfs2_node_map *map)
{
map->num_nodes = OCFS2_NODE_MAP_MAX_NODES;
- memset(map->map, 0, BITS_TO_LONGS(OCFS2_NODE_MAP_MAX_NODES) *
+ memset(map->map, 0, BITS_TO_LONGS(OCFS2_NODE_MAP_MAX_NODES) *
sizeof(unsigned long));
}
@@ -317,7 +317,7 @@
static void __ocfs2_node_map_set(struct ocfs2_node_map *target,
struct ocfs2_node_map *from)
{
- int num_longs, i;
+ int num_longs, i;
BUG_ON(target->num_nodes != from->num_nodes);
BUG_ON(target->num_nodes == 0);
Modified: trunk/fs/ocfs2/heartbeat.h
===================================================================
--- trunk/fs/ocfs2/heartbeat.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/heartbeat.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/inode.c
===================================================================
--- trunk/fs/ocfs2/inode.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/inode.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -65,8 +65,8 @@
struct ocfs2_find_inode_args *args);
static int ocfs2_init_locked_inode(struct inode *inode, void *opaque);
static int ocfs2_find_actor(struct inode *inode, void *opaque);
-static int ocfs2_truncate_for_delete(ocfs2_super *osb,
- struct inode *inode,
+static int ocfs2_truncate_for_delete(ocfs2_super *osb,
+ struct inode *inode,
struct buffer_head *fe_bh);
struct inode *ocfs2_ilookup(ocfs2_super *osb, u64 blkno)
@@ -104,7 +104,7 @@
args.fi_flags = 0;
args.fi_ino = ino_from_blkno(sb, blkno);
- inode = iget5_locked(sb, args.fi_ino, ocfs2_find_actor,
+ inode = iget5_locked(sb, args.fi_ino, ocfs2_find_actor,
ocfs2_init_locked_inode, &args);
/* inode was *not* in the inode cache. 2.6.x requires
* us to do our own read_inode call and unlock it
@@ -177,11 +177,11 @@
}
/*
- * initialize the new inode, but don't do anything that would cause
+ * initialize the new inode, but don't do anything that would cause
* us to sleep.
* return 0 on success, 1 on failure
*/
-static int ocfs2_init_locked_inode(struct inode *inode, void *opaque)
+static int ocfs2_init_locked_inode(struct inode *inode, void *opaque)
{
struct ocfs2_find_inode_args *args = opaque;
@@ -387,8 +387,8 @@
sync_blockdev(sb->s_bdev);
}
-static int ocfs2_truncate_for_delete(ocfs2_super *osb,
- struct inode *inode,
+static int ocfs2_truncate_for_delete(ocfs2_super *osb,
+ struct inode *inode,
struct buffer_head *fe_bh)
{
int status = 0;
@@ -585,7 +585,7 @@
goto bail_unblock;
}
- orphan_dir_inode = ocfs2_get_system_file_inode(osb,
+ orphan_dir_inode = ocfs2_get_system_file_inode(osb,
ORPHAN_DIR_SYSTEM_INODE,
orphaned_slot);
if (!orphan_dir_inode) {
@@ -638,7 +638,7 @@
* picture. */
ocfs2_set_inode_lock_trans(osb->journal, inode);
- status = ocfs2_orphan_del(osb, handle, orphan_dir_inode, inode,
+ status = ocfs2_orphan_del(osb, handle, orphan_dir_inode, inode,
orphan_dir_bh);
if (status < 0) {
mlog_errno(status);
@@ -813,12 +813,12 @@
/*
* TODO: this should probably be merged into ocfs2_get_block
- *
+ *
* However, you now need to pay attention to the cont_prepare_write()
* stuff in ocfs2_get_block (that is, ocfs2_get_block pretty much
* expects never to extend).
*/
-struct buffer_head *ocfs2_bread(struct inode *inode,
+struct buffer_head *ocfs2_bread(struct inode *inode,
int block, int *err, int reada)
{
struct buffer_head *bh = NULL;
@@ -874,7 +874,7 @@
int status = 0;
ocfs2_super *osb;
- mlog_entry("(inode = 0x%p, ino = %"MLFu64")\n", inode,
+ mlog_entry("(inode = 0x%p, ino = %"MLFu64")\n", inode,
inode ? OCFS2_I(inode)->ip_blkno : 0ULL);
if (!inode) {
@@ -910,12 +910,12 @@
}
/*
- * Updates a disk inode from a
+ * Updates a disk inode from a
* struct inode.
- * Only takes ip_lock.
+ * Only takes ip_lock.
*/
-int ocfs2_mark_inode_dirty(ocfs2_journal_handle *handle,
- struct inode *inode,
+int ocfs2_mark_inode_dirty(ocfs2_journal_handle *handle,
+ struct inode *inode,
struct buffer_head *bh)
{
int status;
@@ -960,9 +960,9 @@
/*
*
* Updates a struct inode from a disk inode.
- * does no i/o, only takes ip_lock.
+ * does no i/o, only takes ip_lock.
*/
-void ocfs2_refresh_inode(struct inode *inode,
+void ocfs2_refresh_inode(struct inode *inode,
ocfs2_dinode *fe)
{
ocfs2_super *osb = OCFS2_SB(inode->i_sb);
Modified: trunk/fs/ocfs2/inode.h
===================================================================
--- trunk/fs/ocfs2/inode.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/inode.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -84,7 +84,7 @@
#define OCFS2_INODE_DELETED 0x00000008
/* Another node is deleting, so our delete is a nop */
#define OCFS2_INODE_SKIP_DELETE 0x00000010
-/* Has the inode been orphaned on another node?
+/* Has the inode been orphaned on another node?
*
* This hints to ocfs2_drop_inode that it should clear i_nlink before
* continuing.
@@ -132,10 +132,10 @@
ssize_t ocfs2_rw_direct(int rw, struct file *filp, char *buf,
size_t size, loff_t *offp);
void ocfs2_sync_blockdev(struct super_block *sb);
-void ocfs2_refresh_inode(struct inode *inode,
+void ocfs2_refresh_inode(struct inode *inode,
ocfs2_dinode *fe);
-int ocfs2_mark_inode_dirty(ocfs2_journal_handle *handle,
- struct inode *inode,
+int ocfs2_mark_inode_dirty(ocfs2_journal_handle *handle,
+ struct inode *inode,
struct buffer_head *bh);
int ocfs2_aio_read(struct file *file, struct kiocb *req, struct iocb *iocb);
int ocfs2_aio_write(struct file *file, struct kiocb *req, struct iocb *iocb);
Modified: trunk/fs/ocfs2/journal.c
===================================================================
--- trunk/fs/ocfs2/journal.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/journal.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -57,7 +57,7 @@
static int __ocfs2_recovery_thread(void *arg);
static int ocfs2_commit_cache(ocfs2_super *osb);
static int ocfs2_wait_on_mount(ocfs2_super *osb);
-static void ocfs2_handle_cleanup_locks(ocfs2_journal *journal,
+static void ocfs2_handle_cleanup_locks(ocfs2_journal *journal,
ocfs2_journal_handle *handle,
int set_id);
static void ocfs2_commit_unstarted_handle(ocfs2_journal_handle *handle);
@@ -139,9 +139,9 @@
/* pass it NULL and it will allocate a new handle object for you. If
* you pass it a handle however, it may still return NULL, in which
* case it has free'd the passed handle for you. */
-ocfs2_journal_handle *ocfs2_start_trans(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
- int max_buffs)
+ocfs2_journal_handle *ocfs2_start_trans(ocfs2_super *osb,
+ ocfs2_journal_handle *handle,
+ int max_buffs)
{
journal_t *journal = osb->journal->j_journal;
@@ -217,7 +217,7 @@
list_add_tail(&(OCFS2_I(inode)->ip_handle_list), &(handle->inode_list));
}
-static void ocfs2_handle_unlock_inodes(ocfs2_journal_handle *handle)
+static void ocfs2_handle_unlock_inodes(ocfs2_journal_handle *handle)
{
struct list_head *p, *n;
struct inode *inode;
@@ -254,7 +254,7 @@
mlog_exit_void();
}
-void ocfs2_commit_trans(ocfs2_journal_handle *handle)
+void ocfs2_commit_trans(ocfs2_journal_handle *handle)
{
handle_t *jbd_handle;
int retval;
@@ -305,14 +305,14 @@
mlog_exit_void();
}
-/*
+/*
* 'nblocks' is what you want to add to the current
* transaction. extend_trans will either extend the current handle by
* nblocks, or commit it and start a new one with nblocks credits.
*
* WARNING: This will not release any semaphores or disk locks taken
* during the transaction, so make sure they were taken *before*
- * start_trans or we'll have ordering deadlocks.
+ * start_trans or we'll have ordering deadlocks.
*
* WARNING2: Note that we do *not* drop j_trans_barrier here. This is
* good because transaction ids haven't yet been recorded on the
@@ -369,9 +369,9 @@
BUG_ON(!(handle->flags & OCFS2_HANDLE_STARTED));
mlog_entry("bh->b_blocknr=%llu, type=%d (\"%s\"), bh->b_size = %hu\n",
- (unsigned long long)bh->b_blocknr, type,
- (type == OCFS2_JOURNAL_ACCESS_CREATE) ?
- "OCFS2_JOURNAL_ACCESS_CREATE" :
+ (unsigned long long)bh->b_blocknr, type,
+ (type == OCFS2_JOURNAL_ACCESS_CREATE) ?
+ "OCFS2_JOURNAL_ACCESS_CREATE" :
"OCFS2_JOURNAL_ACCESS_WRITE",
bh->b_size);
@@ -409,7 +409,7 @@
}
int ocfs2_journal_dirty(ocfs2_journal_handle *handle,
- struct buffer_head *bh)
+ struct buffer_head *bh)
{
int status;
@@ -457,7 +457,7 @@
return status;
}
-static void ocfs2_handle_cleanup_locks(ocfs2_journal *journal,
+static void ocfs2_handle_cleanup_locks(ocfs2_journal *journal,
ocfs2_journal_handle *handle,
int set_id)
{
@@ -619,7 +619,7 @@
* If the journal has been kmalloc'd it needs to be freed after this
* call.
*/
-void ocfs2_journal_shutdown(ocfs2_super *osb)
+void ocfs2_journal_shutdown(ocfs2_super *osb)
{
ocfs2_journal *journal = NULL;
int status = 0;
@@ -692,7 +692,7 @@
mlog_exit_void();
}
-int ocfs2_journal_load(ocfs2_journal *journal)
+int ocfs2_journal_load(ocfs2_journal *journal)
{
int status = 0;
int olderr = 0;
@@ -733,7 +733,7 @@
mlog(ML_ERROR, "unable to launch ocfs2commit thread, error=%d",
status);
goto done;
- }
+ }
done:
mlog_exit(status);
@@ -743,7 +743,7 @@
/* 'full' flag tells us whether we clear out all blocks or if we just
* mark the journal clean */
-int ocfs2_journal_wipe(ocfs2_journal *journal, int full)
+int ocfs2_journal_wipe(ocfs2_journal *journal, int full)
{
int status;
@@ -767,7 +767,7 @@
return status;
}
-/*
+/*
* JBD Might read a cached version of another nodes journal file. We
* don't want this as this file changes often and we get no
* notification on those changes. The only way to be sure that we've
@@ -810,7 +810,7 @@
if (p_blocks > CONCURRENT_JOURNAL_FILL)
p_blocks = CONCURRENT_JOURNAL_FILL;
- status = ocfs2_read_blocks(OCFS2_SB(inode->i_sb),
+ status = ocfs2_read_blocks(OCFS2_SB(inode->i_sb),
p_blkno, p_blocks, bhs, 0,
inode);
if (status < 0) {
@@ -1366,8 +1366,8 @@
mlog(0, "Recover inodes from orphan dir in slot %d\n", slot);
- orphan_dir_inode = ocfs2_get_system_file_inode(osb,
- ORPHAN_DIR_SYSTEM_INODE,
+ orphan_dir_inode = ocfs2_get_system_file_inode(osb,
+ ORPHAN_DIR_SYSTEM_INODE,
slot);
if (!orphan_dir_inode) {
status = -ENOENT;
@@ -1425,13 +1425,13 @@
"block %llu contains invalid de: "
"inode = %"MLFu64", rec_len = %u, "
"name_len = %u, file_type = %u, "
- "name='%.*s'\n",
- (unsigned long long)bh->b_blocknr,
+ "name='%.*s'\n",
+ (unsigned long long)bh->b_blocknr,
le64_to_cpu(de->inode),
le16_to_cpu(de->rec_len),
- de->name_len,
- de->file_type,
- de->name_len,
+ de->name_len,
+ de->file_type,
+ de->name_len,
de->name);
continue;
}
@@ -1441,7 +1441,7 @@
continue;
iter = ocfs2_iget(osb, de->inode);
- if (!iter)
+ if (!iter)
continue;
mlog(0, "queue orphan %"MLFu64"\n",
@@ -1523,7 +1523,7 @@
* shutdown and nobody other than ourselves should be able to start
* transactions. committing on shutdown might take a few iterations
* as final transactions put deleted inodes on the list */
- while (!(kthread_should_stop() &&
+ while (!(kthread_should_stop() &&
atomic_read(&journal->j_num_trans) == 0)) {
wait_event_interruptible_timeout(osb->checkpoint_event,
Modified: trunk/fs/ocfs2/journal.h
===================================================================
--- trunk/fs/ocfs2/journal.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/journal.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -58,7 +58,7 @@
* from (recovery,
* etc) */
struct buffer_head *j_bh; /* Journal disk inode block */
- atomic_t j_num_trans; /* Number of transactions
+ atomic_t j_num_trans; /* Number of transactions
* currently in the system. */
unsigned long j_trans_id;
struct rw_semaphore j_trans_barrier;
@@ -120,7 +120,7 @@
if (OCFS2_I(inode)->ip_flags & OCFS2_INODE_SYSTEM_FILE)
return 0;
spin_lock(&trans_inc_lock);
- ret = !(time_after(OCFS2_SB(inode->i_sb)->journal->j_trans_id,
+ ret = !(time_after(OCFS2_SB(inode->i_sb)->journal->j_trans_id,
OCFS2_I(inode)->ip_created_trans));
if (!ret)
OCFS2_I(inode)->ip_created_trans = 0;
@@ -128,7 +128,7 @@
return ret;
}
-static inline void ocfs2_inode_set_new(ocfs2_super *osb,
+static inline void ocfs2_inode_set_new(ocfs2_super *osb,
struct inode *inode)
{
spin_lock(&trans_inc_lock);
@@ -151,9 +151,9 @@
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
+ 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;
@@ -181,13 +181,13 @@
/*
* Journal Control:
* Initialize, Load, Shutdown, Wipe a journal.
- *
+ *
* ocfs2_journal_init - Initialize journal structures in the OSB.
* ocfs2_journal_load - Load the given journal off disk. Replay it if
* there's transactions still in there.
- * ocfs2_journal_shutdown - Shutdown a journal, this will flush all
+ * ocfs2_journal_shutdown - Shutdown a journal, this will flush all
* uncommitted, uncheckpointed transactions.
- * ocfs2_journal_wipe - Wipe transactions from a journal. Optionally
+ * ocfs2_journal_wipe - Wipe transactions from a journal. Optionally
* zero out each block.
* ocfs2_recovery_thread - Perform recovery on a node. osb is our own osb.
* ocfs2_mark_dead_nodes - Start recovery on nodes we won't get a heartbeat
@@ -232,28 +232,28 @@
/*
* Transaction Handling:
* 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
+ *
+ * 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
- * the number of blocks that will be changed during
+ * ocfs2_start_trans - Begin a transaction. Give it an upper estimate of
+ * the number of blocks that will be changed during
* this handle.
* ocfs2_commit_trans - Complete a handle.
- * 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
* not release any locks taken during the transaction.
- * ocfs2_journal_access - Notify the handle that we want to journal this
+ * ocfs2_journal_access - Notify the handle that we want to journal this
* buffer. Will have to call ocfs2_journal_dirty once
* we've actually dirtied it. Type is one of . or .
* ocfs2_journal_dirty - Mark a journalled buffer as having dirty data.
* 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.
+ * 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.
*/
@@ -261,11 +261,11 @@
* perfectly legal to go through an entire transaction without having
* dirtied any buffers. */
ocfs2_journal_handle *ocfs2_alloc_handle(ocfs2_super *osb);
-ocfs2_journal_handle *ocfs2_start_trans(struct _ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+ocfs2_journal_handle *ocfs2_start_trans(struct _ocfs2_super *osb,
+ ocfs2_journal_handle *handle,
int max_buffs);
void ocfs2_commit_trans(ocfs2_journal_handle *handle);
-int ocfs2_extend_trans(ocfs2_journal_handle *handle,
+int ocfs2_extend_trans(ocfs2_journal_handle *handle,
int nblocks);
/*
@@ -283,9 +283,9 @@
#define OCFS2_JOURNAL_ACCESS_WRITE 1
#define OCFS2_JOURNAL_ACCESS_UNDO 2
-int ocfs2_journal_access(ocfs2_journal_handle *handle,
+int ocfs2_journal_access(ocfs2_journal_handle *handle,
struct inode *inode,
- struct buffer_head *bh,
+ struct buffer_head *bh,
int type);
/*
* A word about the journal_access/journal_dirty "dance". It is
@@ -299,14 +299,14 @@
* journal_access at least once.
*
* That said, 99% of the time this doesn't matter and this is what the
- * path looks like:
- *
+ * path looks like:
+ *
* <read a bh>
- * ocfs2_journal_access(handle, bh, OCFS2_JOURNAL_ACCESS_WRITE);
+ * ocfs2_journal_access(handle, bh, OCFS2_JOURNAL_ACCESS_WRITE);
* <modify the bh>
* ocfs2_journal_dirty(handle, bh);
*/
-int ocfs2_journal_dirty(ocfs2_journal_handle *handle,
+int ocfs2_journal_dirty(ocfs2_journal_handle *handle,
struct buffer_head *bh);
int ocfs2_handle_add_lock(ocfs2_journal_handle *handle,
struct inode *inode);
@@ -314,7 +314,7 @@
* Use this to protect from other processes reading buffer state while
* it's in flight.
*/
-void ocfs2_handle_add_inode(ocfs2_journal_handle *handle,
+void ocfs2_handle_add_inode(ocfs2_journal_handle *handle,
struct inode *inode);
/*
@@ -389,13 +389,13 @@
* that, we only need one update for the dinode, and then
* however many metadata chunks needed * a remaining suballoc
* alloc. */
- sysfile_bitmap_blocks = 1 +
+ sysfile_bitmap_blocks = 1 +
(OCFS2_SUBALLOC_ALLOC - 1) * ocfs2_extend_meta_needed(fe);
/* this does not include *new* metadata blocks, which are
* accounted for in sysfile_bitmap_blocks. fe +
- * prev. last_eb_blk + blocks along edge of tree.
- * calc_symlink_credits passes because we just need 1
+ * prev. last_eb_blk + blocks along edge of tree.
+ * calc_symlink_credits passes because we just need 1
* credit for the dinode there. */
dinode_blocks = 1 + 1 + fe->id2.i_list.l_tree_depth;
@@ -418,7 +418,7 @@
{
int blocks;
int bitmap_blocks = OCFS2_SUBALLOC_ALLOC + 1;
- /* parent inode update + new block group header + bitmap inode update
+ /* parent inode update + new block group header + bitmap inode update
+ bitmap blocks affected */
blocks = 1 + 1 + 1 + bitmap_blocks;
return blocks;
@@ -438,7 +438,7 @@
/* We may be deleting metadata blocks, so metadata alloc dinode +
one desc. block for each possible delete. */
- if (fe->id2.i_list.l_tree_depth
+ if (fe->id2.i_list.l_tree_depth
&& (last_el->l_next_free_rec == 1)
&& ((last_el->l_recs[i].e_clusters - clusters_to_del) == 0))
credits += 1 + fe->id2.i_list.l_tree_depth;
Modified: trunk/fs/ocfs2/localalloc.c
===================================================================
--- trunk/fs/ocfs2/localalloc.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/localalloc.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -54,28 +54,28 @@
static void ocfs2_clear_local_alloc(ocfs2_dinode *alloc);
-static int ocfs2_sync_local_to_main(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+static int ocfs2_sync_local_to_main(ocfs2_super *osb,
+ ocfs2_journal_handle *handle,
ocfs2_dinode *alloc,
struct inode *main_bm_inode,
struct buffer_head *main_bm_bh);
-static int ocfs2_local_alloc_reserve_for_window(ocfs2_super *osb,
+static int ocfs2_local_alloc_reserve_for_window(ocfs2_super *osb,
ocfs2_journal_handle *handle,
ocfs2_alloc_context **ac,
struct inode **bitmap_inode,
struct buffer_head **bitmap_bh);
-static int ocfs2_local_alloc_new_window(ocfs2_super *osb,
+static int ocfs2_local_alloc_new_window(ocfs2_super *osb,
ocfs2_journal_handle *handle,
ocfs2_alloc_context *ac);
-static int ocfs2_local_alloc_slide_window(ocfs2_super *osb,
+static int ocfs2_local_alloc_slide_window(ocfs2_super *osb,
struct inode *local_alloc_inode);
-/*
+/*
* Determine how large our local alloc window should be, in bits.
- *
+ *
* These values (and the behavior in ocfs2_alloc_should_use_local) have
* been chosen so that most allocations, including new block groups go
* through local alloc.
@@ -87,7 +87,7 @@
return 2048 >> (osb->s_clustersize_bits - 12);
}
-/*
+/*
* Tell us whether a given allocation should use the local alloc
* file. Otherwise, it has to go to the main bitmap.
*/
@@ -119,7 +119,7 @@
mlog_entry_void();
/* read the alloc off disk */
- inode = ocfs2_get_system_file_inode(osb, LOCAL_ALLOC_SYSTEM_INODE,
+ inode = ocfs2_get_system_file_inode(osb, LOCAL_ALLOC_SYSTEM_INODE,
osb->slot_num);
if (!inode) {
status = -EINVAL;
@@ -143,7 +143,7 @@
goto bail;
}
- if ((OCFS2_LOCAL_ALLOC(alloc)->la_size == 0) ||
+ if ((OCFS2_LOCAL_ALLOC(alloc)->la_size == 0) ||
(OCFS2_LOCAL_ALLOC(alloc)->la_size > ocfs2_local_alloc_size(inode->i_sb))) {
mlog(ML_ERROR, "Local alloc size is invalid (la_size = %u)\n",
OCFS2_LOCAL_ALLOC(alloc)->la_size);
@@ -180,9 +180,9 @@
return status;
}
-/*
+/*
* return any unused bits to the bitmap and write out a clean
- * local_alloc.
+ * local_alloc.
*
* local_alloc_bh is optional. If not passed, we will simply use the
* one off osb. If you do pass it however, be warned that it *will* be
@@ -203,8 +203,8 @@
if (osb->local_alloc_state == OCFS2_LA_UNUSED)
goto bail;
- local_alloc_inode =
- ocfs2_get_system_file_inode(osb,
+ local_alloc_inode =
+ ocfs2_get_system_file_inode(osb,
LOCAL_ALLOC_SYSTEM_INODE,
osb->slot_num);
if (!local_alloc_inode) {
@@ -222,8 +222,8 @@
goto bail;
}
- main_bm_inode = ocfs2_get_system_file_inode(osb,
- GLOBAL_BITMAP_SYSTEM_INODE,
+ main_bm_inode = ocfs2_get_system_file_inode(osb,
+ GLOBAL_BITMAP_SYSTEM_INODE,
-1);
if (!main_bm_inode) {
status = -EINVAL;
@@ -274,7 +274,7 @@
osb->local_alloc_bh = NULL;
osb->local_alloc_state = OCFS2_LA_UNUSED;
- status = ocfs2_sync_local_to_main(osb, handle, alloc_copy,
+ status = ocfs2_sync_local_to_main(osb, handle, alloc_copy,
main_bm_inode, main_bm_bh);
if (status < 0)
mlog_errno(status);
@@ -305,8 +305,8 @@
* we kmalloc a copy of the local alloc before it's change for the
* caller to process with ocfs2_complete_local_alloc_recovery
*/
-int ocfs2_begin_local_alloc_recovery(ocfs2_super *osb,
- int slot_num,
+int ocfs2_begin_local_alloc_recovery(ocfs2_super *osb,
+ int slot_num,
ocfs2_dinode **alloc_copy)
{
int status = 0;
@@ -318,8 +318,8 @@
*alloc_copy = NULL;
- inode = ocfs2_get_system_file_inode(osb,
- LOCAL_ALLOC_SYSTEM_INODE,
+ inode = ocfs2_get_system_file_inode(osb,
+ LOCAL_ALLOC_SYSTEM_INODE,
slot_num);
if (!inode) {
status = -EINVAL;
@@ -374,7 +374,7 @@
* recovery map. Dlm locks will no longer stall, so lets clear out the
* main bitmap.
*/
-int ocfs2_complete_local_alloc_recovery(ocfs2_super *osb,
+int ocfs2_complete_local_alloc_recovery(ocfs2_super *osb,
ocfs2_dinode *alloc)
{
int status;
@@ -391,8 +391,8 @@
goto bail;
}
- main_bm_inode = ocfs2_get_system_file_inode(osb,
- GLOBAL_BITMAP_SYSTEM_INODE,
+ main_bm_inode = ocfs2_get_system_file_inode(osb,
+ GLOBAL_BITMAP_SYSTEM_INODE,
-1);
if (!main_bm_inode) {
status = -EINVAL;
@@ -417,7 +417,7 @@
/* we want the bitmap change to be recorded on disk asap */
ocfs2_handle_set_sync(handle, 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);
if (status < 0)
mlog_errno(status);
@@ -436,10 +436,10 @@
return status;
}
-/*
+/*
* make sure we've got at least bitswanted contiguous bits in the
* local alloc. You lose them when you drop i_sem.
- *
+ *
* We will add ourselves to the transaction passed in, but may start
* our own in order to shift windows.
*/
@@ -459,8 +459,8 @@
BUG_ON(!ac);
BUG_ON(passed_handle->flags & OCFS2_HANDLE_STARTED);
- local_alloc_inode =
- ocfs2_get_system_file_inode(osb,
+ local_alloc_inode =
+ ocfs2_get_system_file_inode(osb,
LOCAL_ALLOC_SYSTEM_INODE,
osb->slot_num);
if (!local_alloc_inode) {
@@ -483,10 +483,10 @@
alloc = (ocfs2_dinode *) osb->local_alloc_bh->b_data;
- OCFS2_BUG_ON_RO(le32_to_cpu(alloc->id1.bitmap1.i_used) !=
+ OCFS2_BUG_ON_RO(le32_to_cpu(alloc->id1.bitmap1.i_used) !=
ocfs2_local_alloc_count_bits(alloc));
- free_bits = le32_to_cpu(alloc->id1.bitmap1.i_total) -
+ free_bits = le32_to_cpu(alloc->id1.bitmap1.i_total) -
le32_to_cpu(alloc->id1.bitmap1.i_used);
if (bits_wanted > free_bits) {
/* uhoh, window change time. */
@@ -647,7 +647,7 @@
return bitoff;
}
-static void ocfs2_clear_local_alloc(ocfs2_dinode *alloc)
+static void ocfs2_clear_local_alloc(ocfs2_dinode *alloc)
{
int i;
mlog_entry_void();
@@ -680,14 +680,14 @@
}
#endif
-/*
- * sync the local alloc to main bitmap.
+/*
+ * sync the local alloc to main bitmap.
*
* assumes you've already locked the main bitmap -- the bitmap inode
* passed is used for caching.
*/
-static int ocfs2_sync_local_to_main(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+static int ocfs2_sync_local_to_main(ocfs2_super *osb,
+ ocfs2_journal_handle *handle,
ocfs2_dinode *alloc,
struct inode *main_bm_inode,
struct buffer_head *main_bm_bh)
@@ -698,9 +698,9 @@
u64 blkno;
void *bitmap;
- mlog_entry("total = %u, COUNT = %u, used = %u\n",
+ mlog_entry("total = %u, COUNT = %u, used = %u\n",
le32_to_cpu(alloc->id1.bitmap1.i_total),
- ocfs2_local_alloc_count_bits(alloc),
+ ocfs2_local_alloc_count_bits(alloc),
le32_to_cpu(alloc->id1.bitmap1.i_used));
if (!alloc->id1.bitmap1.i_total) {
@@ -719,16 +719,16 @@
start = count = bit_off = 0;
left = le32_to_cpu(alloc->id1.bitmap1.i_total);
- while ((bit_off = ocfs2_find_next_zero_bit(bitmap, left, start))
+ while ((bit_off = ocfs2_find_next_zero_bit(bitmap, left, start))
!= -1) {
if ((bit_off < left) && (bit_off == start)) {
count++;
start++;
continue;
- }
+ }
if (count) {
- blkno = la_start_blk +
- ocfs2_clusters_to_blocks(osb->sb,
+ blkno = la_start_blk +
+ ocfs2_clusters_to_blocks(osb->sb,
start - count);
mlog(0, "freeing %u bits starting at local "
@@ -754,7 +754,7 @@
return status;
}
-static int ocfs2_local_alloc_reserve_for_window(ocfs2_super *osb,
+static int ocfs2_local_alloc_reserve_for_window(ocfs2_super *osb,
ocfs2_journal_handle *handle,
ocfs2_alloc_context **ac,
struct inode **bitmap_inode,
@@ -795,9 +795,9 @@
}
/*
- * 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(ocfs2_super *osb,
+static int ocfs2_local_alloc_new_window(ocfs2_super *osb,
ocfs2_journal_handle *handle,
ocfs2_alloc_context *ac)
{
@@ -812,13 +812,13 @@
mlog(0, "asking me to alloc a new window over a non-empty "
"one\n");
- mlog(0, "Allocating %u clusters for a new window.\n",
+ mlog(0, "Allocating %u clusters for a new window.\n",
ocfs2_local_alloc_window_bits(osb));
/* we used the generic suballoc reserve function, but we set
* everything up nicely, so there's no reason why we can't use
* the more specific cluster api to claim bits. */
status = ocfs2_claim_clusters(osb, handle, ac,
- ocfs2_local_alloc_window_bits(osb),
+ ocfs2_local_alloc_window_bits(osb),
&cluster_off, &cluster_count);
if (status < 0) {
if (status != -ENOSPC)
@@ -850,7 +850,7 @@
/* Note that we do *NOT* lock the local alloc inode here as
* it's been locked already for us. */
-static int ocfs2_local_alloc_slide_window(ocfs2_super *osb,
+static int ocfs2_local_alloc_slide_window(ocfs2_super *osb,
struct inode *local_alloc_inode)
{
int status = 0;
@@ -871,8 +871,8 @@
}
/* This will lock the main bitmap for us. */
- status = ocfs2_local_alloc_reserve_for_window(osb,
- handle,
+ status = ocfs2_local_alloc_reserve_for_window(osb,
+ handle,
&ac,
&main_bm_inode,
&main_bm_bh);
@@ -905,7 +905,7 @@
memcpy(alloc_copy, alloc, osb->local_alloc_bh->b_size);
status = ocfs2_journal_access(handle, local_alloc_inode,
- osb->local_alloc_bh,
+ osb->local_alloc_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
if (status < 0) {
mlog_errno(status);
@@ -920,7 +920,7 @@
goto bail;
}
- status = ocfs2_sync_local_to_main(osb, handle, alloc_copy,
+ status = ocfs2_sync_local_to_main(osb, handle, alloc_copy,
main_bm_inode, main_bm_bh);
if (status < 0) {
mlog_errno(status);
Modified: trunk/fs/ocfs2/localalloc.h
===================================================================
--- trunk/fs/ocfs2/localalloc.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/localalloc.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -30,18 +30,18 @@
void ocfs2_shutdown_local_alloc(ocfs2_super *osb);
-int ocfs2_begin_local_alloc_recovery(ocfs2_super *osb,
- int node_num,
+int ocfs2_begin_local_alloc_recovery(ocfs2_super *osb,
+ int node_num,
ocfs2_dinode **alloc_copy);
-int ocfs2_complete_local_alloc_recovery(ocfs2_super *osb,
+int ocfs2_complete_local_alloc_recovery(ocfs2_super *osb,
ocfs2_dinode *alloc);
-int ocfs2_alloc_should_use_local(ocfs2_super *osb,
+int ocfs2_alloc_should_use_local(ocfs2_super *osb,
u64 bits);
struct _ocfs2_alloc_context;
-int ocfs2_reserve_local_alloc_bits(ocfs2_super *osb,
+int ocfs2_reserve_local_alloc_bits(ocfs2_super *osb,
ocfs2_journal_handle *passed_handle,
u32 bits_wanted,
struct _ocfs2_alloc_context *ac);
Modified: trunk/fs/ocfs2/mmap.c
===================================================================
--- trunk/fs/ocfs2/mmap.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/mmap.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -321,7 +321,7 @@
binode = ctxt->b_next_unlocked;
else
node = rb_first(&ctxt->b_inodes);
- } else
+ } else
node = rb_next(&pos->ba_node);
if (node)
@@ -357,7 +357,7 @@
while((binode = ocfs2_next_unlocked(ctxt, last_inode, binode))) {
/* the tricksy caller might have locked inodes themselves
- * between calls. */
+ * between calls. */
if (binode->ba_locked)
continue;
inode = binode->ba_inode;
@@ -421,7 +421,7 @@
if (binode->ba_locked && binode->ba_lock_data)
ocfs2_data_unlock(binode->ba_inode,
binode->ba_lock_data_level);
-
+
if (binode->ba_locked || binode->ba_meta_locked)
ocfs2_meta_unlock(binode->ba_inode,
binode->ba_lock_meta_level);
@@ -463,11 +463,11 @@
/* the target inode is different from the other inodes. in o_direct it
* doesn't get a data lock and when appending it gets a level 1 meta
- * lock. we use target_binode to set its flags accordingly */
+ * lock. we use target_binode to set its flags accordingly */
if (info->wl_target_binode == NULL) {
ret = ocfs2_setup_io_locks(inode->i_sb, inode,
(char __user *) buf,
- count, ctxt,
+ count, ctxt,
&info->wl_target_binode);
if (ret < 0) {
BUG_ON(ret == -EIOCBQUEUED);
@@ -534,8 +534,8 @@
if (osb->s_mount_opt & OCFS2_MOUNT_COMPAT_OCFS) {
int sector_size = 1 << osb->s_sectsize_bits;
- if ((saved_ppos & (sector_size - 1)) ||
- (count & (sector_size - 1)) ||
+ if ((saved_ppos & (sector_size - 1)) ||
+ (count & (sector_size - 1)) ||
((unsigned long)buf & (sector_size - 1))) {
info->wl_do_direct_io = 0;
filp->f_flags |= O_SYNC;
@@ -667,7 +667,7 @@
printk("(%u) ocfs2: inode %llu, locked %d, is target? %s\n",
current->pid, OCFS2_I(inode)->ip_blkno,
binode->ba_locked,
- ocfs2_buffer_lock_is_target(ctxt, inode) ? "yes" :
+ ocfs2_buffer_lock_is_target(ctxt, inode) ? "yes" :
"no");
node = rb_next(node);
Modified: trunk/fs/ocfs2/mmap.h
===================================================================
--- trunk/fs/ocfs2/mmap.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/mmap.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -72,7 +72,7 @@
unsigned ba_meta_locked:1, /* meta is locked */
ba_locked:1, /* both are locked */
ba_lock_data:1, /* should lock data */
- ba_lock_meta_level:1,
+ ba_lock_meta_level:1,
ba_lock_data_level:1;
struct ocfs2_io_marker ba_task;
};
Modified: trunk/fs/ocfs2/namei.c
===================================================================
--- trunk/fs/ocfs2/namei.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/namei.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -8,12 +8,12 @@
* Copyright (C) 2002, 2004 Oracle. All rights reserved.
*
* Portions of this code from linux/fs/ext3/dir.c
- *
+ *
* Copyright (C) 1992, 1993, 1994, 1995
* Remy Card (card at masi.ibp.fr)
* Laboratoire MASI - Institut Blaise pascal
* Universite Pierre et Marie Curie (Paris VI)
- *
+ *
* from
*
* linux/fs/minix/dir.c
@@ -24,12 +24,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -69,34 +69,34 @@
#define NAMEI_RA_INDEX(c,b) (((c) * NAMEI_RA_BLOCKS) + (b))
static int inline ocfs2_search_dirblock(struct buffer_head *bh,
- struct inode *dir,
- const char *name, int namelen,
- unsigned long offset,
+ struct inode *dir,
+ const char *name, int namelen,
+ unsigned long offset,
struct ocfs2_dir_entry **res_dir);
static int ocfs2_delete_entry(ocfs2_journal_handle *handle,
- struct inode *dir,
- struct ocfs2_dir_entry *de_del,
+ struct inode *dir,
+ struct ocfs2_dir_entry *de_del,
struct buffer_head *bh);
static int __ocfs2_add_entry(ocfs2_journal_handle *handle, struct inode *dir,
- const char *name, int namelen,
- struct inode *inode, u64 blkno,
- struct buffer_head *parent_fe_bh,
+ const char *name, int namelen,
+ struct inode *inode, u64 blkno,
+ struct buffer_head *parent_fe_bh,
struct buffer_head *insert_bh);
-static int ocfs2_mknod_locked(ocfs2_super *osb, struct inode *dir,
- struct dentry *dentry, int mode,
+static int ocfs2_mknod_locked(ocfs2_super *osb, struct inode *dir,
+ struct dentry *dentry, int mode,
dev_t dev,
- struct buffer_head **new_fe_bh,
+ struct buffer_head **new_fe_bh,
struct buffer_head *parent_fe_bh,
ocfs2_journal_handle *handle,
struct inode **ret_inode,
ocfs2_alloc_context *inode_ac);
-static int ocfs2_fill_new_dir(ocfs2_super *osb,
+static int ocfs2_fill_new_dir(ocfs2_super *osb,
ocfs2_journal_handle *handle,
- struct inode *parent,
+ struct inode *parent,
struct inode *inode,
struct buffer_head *fe_bh,
ocfs2_alloc_context *data_ac);
@@ -108,7 +108,7 @@
struct buffer_head **bh2,
struct inode *inode2);
-static int ocfs2_prepare_orphan_dir(ocfs2_super *osb,
+static int ocfs2_prepare_orphan_dir(ocfs2_super *osb,
ocfs2_journal_handle *handle,
struct inode *inode,
char *name,
@@ -117,22 +117,22 @@
static int ocfs2_orphan_add(ocfs2_super *osb,
ocfs2_journal_handle *handle,
struct inode *inode,
- ocfs2_dinode *fe,
+ ocfs2_dinode *fe,
char *name,
struct buffer_head *de_bh);
-static int ocfs2_create_symlink_data(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
- struct inode *inode,
+static int ocfs2_create_symlink_data(ocfs2_super *osb,
+ ocfs2_journal_handle *handle,
+ struct inode *inode,
const char *symname);
-static inline int ocfs2_add_entry(ocfs2_journal_handle *handle,
- struct dentry *dentry,
- struct inode *inode, u64 blkno,
+static inline int ocfs2_add_entry(ocfs2_journal_handle *handle,
+ struct dentry *dentry,
+ struct inode *inode, u64 blkno,
struct buffer_head *parent_fe_bh,
struct buffer_head *insert_bh)
{
- return __ocfs2_add_entry(handle, dentry->d_parent->d_inode,
+ return __ocfs2_add_entry(handle, dentry->d_parent->d_inode,
dentry->d_name.name, dentry->d_name.len,
inode, blkno, parent_fe_bh, insert_bh);
}
@@ -272,9 +272,9 @@
return parent;
}
-static int ocfs2_fill_new_dir(ocfs2_super *osb,
+static int ocfs2_fill_new_dir(ocfs2_super *osb,
ocfs2_journal_handle *handle,
- struct inode *parent,
+ struct inode *parent,
struct inode *inode,
struct buffer_head *fe_bh,
ocfs2_alloc_context *data_ac)
@@ -294,7 +294,7 @@
ocfs2_set_new_buffer_uptodate(inode, new_bh);
- status = ocfs2_journal_access(handle, inode, new_bh,
+ status = ocfs2_journal_access(handle, inode, new_bh,
OCFS2_JOURNAL_ACCESS_CREATE);
if (status < 0) {
mlog_errno(status);
@@ -317,7 +317,7 @@
strcpy(de->name, "..");
ocfs2_set_de_type(de, S_IFDIR);
- status = ocfs2_journal_dirty(handle, new_bh);
+ status = ocfs2_journal_dirty(handle, new_bh);
if (status < 0) {
mlog_errno(status);
goto bail;
@@ -398,8 +398,8 @@
goto leave;
/* get a spot inside the dir. */
- status = ocfs2_prepare_dir_for_insert(osb, dir, parent_fe_bh,
- dentry->d_name.name,
+ status = ocfs2_prepare_dir_for_insert(osb, dir, parent_fe_bh,
+ dentry->d_name.name,
dentry->d_name.len, &de_bh);
if (status < 0) {
mlog_errno(status);
@@ -434,7 +434,7 @@
/* do the real work now. */
status = ocfs2_mknod_locked(osb, dir, dentry, mode, dev,
- &new_fe_bh, parent_fe_bh, handle,
+ &new_fe_bh, parent_fe_bh, handle,
&inode, inode_ac);
if (status < 0) {
mlog_errno(status);
@@ -442,14 +442,14 @@
}
if (S_ISDIR(mode)) {
- status = ocfs2_fill_new_dir(osb, handle, dir, inode,
+ status = ocfs2_fill_new_dir(osb, handle, dir, inode,
new_fe_bh, data_ac);
if (status < 0) {
mlog_errno(status);
goto leave;
}
- status = ocfs2_journal_access(handle, dir, parent_fe_bh,
+ status = ocfs2_journal_access(handle, dir, parent_fe_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
if (status < 0) {
mlog_errno(status);
@@ -486,10 +486,10 @@
if (new_fe_bh)
brelse(new_fe_bh);
- if (de_bh)
+ if (de_bh)
brelse(de_bh);
- if (parent_fe_bh)
+ if (parent_fe_bh)
brelse(parent_fe_bh);
if ((status < 0) && inode)
@@ -506,10 +506,10 @@
return status;
}
-static int ocfs2_mknod_locked(ocfs2_super *osb, struct inode *dir,
- struct dentry *dentry, int mode,
+static int ocfs2_mknod_locked(ocfs2_super *osb, struct inode *dir,
+ struct dentry *dentry, int mode,
dev_t dev,
- struct buffer_head **new_fe_bh,
+ struct buffer_head **new_fe_bh,
struct buffer_head *parent_fe_bh,
ocfs2_journal_handle *handle,
struct inode **ret_inode,
@@ -597,7 +597,7 @@
strcpy(fe->i_signature, OCFS2_INODE_SIGNATURE);
fe->i_flags |= OCFS2_VALID_FL;
fe->i_atime = fe->i_ctime = fe->i_mtime = CURRENT_TIME.tv_sec;
- fe->i_mtime_nsec = fe->i_ctime_nsec = fe->i_atime_nsec =
+ fe->i_mtime_nsec = fe->i_ctime_nsec = fe->i_atime_nsec =
cpu_to_le32(CURRENT_TIME.tv_nsec);
fe->i_dtime = 0;
@@ -717,8 +717,8 @@
if (err)
goto bail;
- err = ocfs2_prepare_dir_for_insert(osb, dir, parent_fe_bh,
- dentry->d_name.name,
+ err = ocfs2_prepare_dir_for_insert(osb, dir, parent_fe_bh,
+ dentry->d_name.name,
dentry->d_name.len, &de_bh);
if (err < 0) {
mlog_errno(err);
@@ -766,7 +766,7 @@
}
err = ocfs2_add_entry(handle, dentry, inode,
- OCFS2_I(inode)->ip_blkno,
+ OCFS2_I(inode)->ip_blkno,
parent_fe_bh, de_bh);
if (err) {
fe->i_links_count--;
@@ -781,7 +781,7 @@
bail:
if (handle)
ocfs2_commit_trans(handle);
- if (de_bh)
+ if (de_bh)
brelse(de_bh);
if (fe_bh)
brelse(fe_bh);
@@ -892,8 +892,8 @@
}
if (!inode->i_nlink) {
- status = ocfs2_prepare_orphan_dir(osb, handle, inode,
- orphan_name,
+ status = ocfs2_prepare_orphan_dir(osb, handle, inode,
+ orphan_name,
&orphan_entry_bh);
if (status < 0) {
mlog_errno(status);
@@ -995,7 +995,7 @@
struct buffer_head **tmpbh;
struct inode *tmpinode;
- mlog_entry("(inode1 = %"MLFu64", inode2 = %"MLFu64")\n",
+ mlog_entry("(inode1 = %"MLFu64", inode2 = %"MLFu64")\n",
oi1->ip_blkno, oi2->ip_blkno);
BUG_ON(!handle);
@@ -1061,7 +1061,7 @@
ocfs2_journal_handle *handle = NULL;
struct buffer_head *old_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
// and new_dentry
struct buffer_head *new_de_bh = NULL, *old_de_bh = NULL; // bhs for above
struct buffer_head *old_inode_de_bh = NULL; // if old_dentry is a dir,
@@ -1120,7 +1120,7 @@
}
/* if old and new are the same, this'll just do one lock. */
- status = ocfs2_double_lock(osb, handle,
+ status = ocfs2_double_lock(osb, handle,
&old_dir_bh, old_dir,
&new_dir_bh, new_dir);
if (status < 0) {
@@ -1164,7 +1164,7 @@
goto bail;
status = -EIO;
- if (le64_to_cpu(PARENT_INO(old_inode_de_bh->b_data)) !=
+ if (le64_to_cpu(PARENT_INO(old_inode_de_bh->b_data)) !=
OCFS2_I(old_dir)->ip_blkno)
goto bail;
status = -EMLINK;
@@ -1182,7 +1182,7 @@
}
status = -ENOENT;
- old_de_bh = ocfs2_find_entry(old_dentry->d_name.name,
+ old_de_bh = ocfs2_find_entry(old_dentry->d_name.name,
old_dentry->d_name.len,
old_dir, &old_de);
if (!old_de_bh)
@@ -1200,7 +1200,7 @@
/* check if the target already exists (in which case we need
* to delete it */
status = ocfs2_find_files_on_disk(new_dentry->d_name.name,
- new_dentry->d_name.len,
+ new_dentry->d_name.len,
&newfe_blkno, new_dir, &new_de_bh,
&new_de);
/* The only error we allow here is -ENOENT because the new
@@ -1210,7 +1210,7 @@
/* return the error... */
mlog_errno(status);
goto bail;
- }
+ }
if (!new_de && new_inode)
mlog(ML_ERROR, "inode %lu does not exist in it's parent "
@@ -1270,8 +1270,8 @@
(unsigned long long)newfe_bh->b_blocknr : 0ULL);
if (S_ISDIR(new_inode->i_mode) || (new_inode->i_nlink == 1)) {
- status = ocfs2_prepare_orphan_dir(osb, handle,
- new_inode,
+ status = ocfs2_prepare_orphan_dir(osb, handle,
+ new_inode,
orphan_name,
&orphan_entry_bh);
if (status < 0) {
@@ -1289,7 +1289,7 @@
goto bail;
status = ocfs2_prepare_dir_for_insert(osb, new_dir, new_dir_bh,
- new_dentry->d_name.name,
+ new_dentry->d_name.name,
new_dentry->d_name.len,
&insert_entry_bh);
if (status < 0) {
@@ -1313,7 +1313,7 @@
goto bail;
}
}
- status = ocfs2_journal_access(handle, new_inode, newfe_bh,
+ status = ocfs2_journal_access(handle, new_inode, newfe_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
if (status < 0) {
mlog_errno(status);
@@ -1322,7 +1322,7 @@
if (S_ISDIR(new_inode->i_mode) || (newfe->i_links_count == 1)){
status = ocfs2_orphan_add(osb, handle, new_inode,
- newfe, orphan_name,
+ newfe, orphan_name,
orphan_entry_bh);
if (status < 0) {
mlog_errno(status);
@@ -1331,7 +1331,7 @@
}
/* change the dirent to point to the correct inode */
- status = ocfs2_journal_access(handle, new_dir, new_de_bh,
+ status = ocfs2_journal_access(handle, new_dir, new_de_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
if (status < 0) {
mlog_errno(status);
@@ -1358,8 +1358,8 @@
}
} else {
/* if the name was not found in new_dir, add it now */
- status = ocfs2_add_entry(handle, new_dentry, old_inode,
- OCFS2_I(old_inode)->ip_blkno,
+ status = ocfs2_add_entry(handle, new_dentry, old_inode,
+ OCFS2_I(old_inode)->ip_blkno,
new_dir_bh, insert_entry_bh);
}
@@ -1374,7 +1374,7 @@
}
if (new_inode) {
- new_inode->i_nlink--;
+ new_inode->i_nlink--;
new_inode->i_ctime = CURRENT_TIME;
}
old_dir->i_ctime = old_dir->i_mtime = CURRENT_TIME;
@@ -1402,7 +1402,7 @@
if (!new_dir_bh) {
mlog(ML_ERROR, "need to change nlink for new "
"dir %"MLFu64" from %d to %d but bh is "
- "NULL\n", OCFS2_I(new_dir)->ip_blkno,
+ "NULL\n", OCFS2_I(new_dir)->ip_blkno,
(int)new_dir_nlink, new_dir->i_nlink);
} else {
ocfs2_dinode *fe;
@@ -1469,13 +1469,13 @@
return status;
}
-/*
+/*
* we expect i_size = strlen(symname). Copy symname into the file
- * data, including the null terminator.
+ * data, including the null terminator.
*/
-static int ocfs2_create_symlink_data(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
- struct inode *inode,
+static int ocfs2_create_symlink_data(ocfs2_super *osb,
+ ocfs2_journal_handle *handle,
+ struct inode *inode,
const char *symname)
{
struct buffer_head **bhs = NULL;
@@ -1490,7 +1490,7 @@
* write i_size + 1 bytes. */
blocks = (bytes_left + sb->s_blocksize - 1) >> sb->s_blocksize_bits;
- mlog_entry("i_blocks = %lu, i_size = %llu, blocks = %d\n",
+ mlog_entry("i_blocks = %lu, i_size = %llu, blocks = %d\n",
inode->i_blocks, i_size_read(inode), blocks);
/* Sanity check -- make sure we're going to fit. */
@@ -1508,7 +1508,7 @@
goto bail;
}
- status = ocfs2_extent_map_get_blocks(inode, 0, 1, &p_blkno,
+ status = ocfs2_extent_map_get_blocks(inode, 0, 1, &p_blkno,
&p_blocks);
if (status < 0) {
mlog_errno(status);
@@ -1536,7 +1536,7 @@
}
ocfs2_set_new_buffer_uptodate(inode, bhs[virtual]);
- status = ocfs2_journal_access(handle, inode, bhs[virtual],
+ status = ocfs2_journal_access(handle, inode, bhs[virtual],
OCFS2_JOURNAL_ACCESS_CREATE);
if (status < 0) {
mlog_errno(status);
@@ -1545,8 +1545,8 @@
memset(bhs[virtual]->b_data, 0, sb->s_blocksize);
- memcpy(bhs[virtual]->b_data, c,
- (bytes_left > sb->s_blocksize) ? sb->s_blocksize :
+ memcpy(bhs[virtual]->b_data, c,
+ (bytes_left > sb->s_blocksize) ? sb->s_blocksize :
bytes_left);
status = ocfs2_journal_dirty(handle, bhs[virtual]);
@@ -1592,7 +1592,7 @@
ocfs2_alloc_context *inode_ac = NULL;
ocfs2_alloc_context *data_ac = NULL;
- mlog_entry("(0x%p, 0x%p, symname='%s' actual='%.*s')\n", dir,
+ mlog_entry("(0x%p, 0x%p, symname='%s' actual='%.*s')\n", dir,
dentry, symname, dentry->d_name.len, dentry->d_name.name);
sb = dir->i_sb;
@@ -1629,8 +1629,8 @@
if (status)
goto bail;
- status = ocfs2_prepare_dir_for_insert(osb, dir, parent_fe_bh,
- dentry->d_name.name,
+ status = ocfs2_prepare_dir_for_insert(osb, dir, parent_fe_bh,
+ dentry->d_name.name,
dentry->d_name.len, &de_bh);
if (status < 0) {
mlog_errno(status);
@@ -1661,7 +1661,7 @@
goto bail;
}
- status = ocfs2_mknod_locked(osb, dir, dentry,
+ status = ocfs2_mknod_locked(osb, dir, dentry,
S_IFLNK | S_IRWXUGO, 0,
&new_fe_bh, parent_fe_bh, handle,
&inode, inode_ac);
@@ -1749,7 +1749,7 @@
{
const char *error_msg = NULL;
const int rlen = le16_to_cpu(de->rec_len);
-
+
if (rlen < OCFS2_DIR_REC_LEN(1))
error_msg = "rec_len is smaller than minimal";
else if (rlen % 4 != 0)
@@ -1758,7 +1758,7 @@
error_msg = "rec_len is too small for name_len";
else if (((char *) de - bh->b_data) + rlen > dir->i_sb->s_blocksize)
error_msg = "directory entry across blocks";
-
+
if (error_msg != NULL)
mlog(ML_ERROR, "bad entry in directory #%"MLFu64": %s - "
"offset=%lu, inode=%"MLFu64", rec_len=%d, name_len=%d\n",
@@ -1768,15 +1768,15 @@
}
/* we don't always have a dentry for what we want to add, so people
- * like orphan dir can call this instead.
+ * like orphan dir can call this instead.
*
* 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(ocfs2_journal_handle *handle, struct inode *dir,
- const char *name, int namelen,
- struct inode *inode, u64 blkno,
- struct buffer_head *parent_fe_bh,
+ const char *name, int namelen,
+ struct inode *inode, u64 blkno,
+ struct buffer_head *parent_fe_bh,
struct buffer_head *insert_bh)
{
unsigned long offset;
@@ -1878,7 +1878,7 @@
goto bail;
}
if (de == de_del) {
- status = ocfs2_journal_access(handle, dir, bh,
+ status = ocfs2_journal_access(handle, dir, bh,
OCFS2_JOURNAL_ACCESS_WRITE);
if (status < 0) {
status = -EIO;
@@ -1957,8 +1957,8 @@
return ret;
}
-struct buffer_head *ocfs2_find_entry(const char *name, int namelen,
- struct inode *dir,
+struct buffer_head *ocfs2_find_entry(const char *name, int namelen,
+ struct inode *dir,
struct ocfs2_dir_entry **res_dir)
{
struct super_block *sb;
@@ -2003,7 +2003,7 @@
break;
}
num++;
-
+
/* XXX: questionable readahead stuff here */
bh = ocfs2_bread(dir, b++, &err, 1);
bh_use[ra_max] = bh;
@@ -2048,7 +2048,7 @@
start = 0;
goto restart;
}
-
+
cleanup_and_exit:
/* Clean up the read-ahead blocks */
for (; ra_ptr < ra_max; ra_ptr++)
@@ -2089,7 +2089,7 @@
return status;
}
-static int ocfs2_prepare_orphan_dir(ocfs2_super *osb,
+static int ocfs2_prepare_orphan_dir(ocfs2_super *osb,
ocfs2_journal_handle *handle,
struct inode *inode,
char *name,
@@ -2105,8 +2105,8 @@
goto leave;
}
- orphan_dir_inode = ocfs2_get_system_file_inode(osb,
- ORPHAN_DIR_SYSTEM_INODE,
+ orphan_dir_inode = ocfs2_get_system_file_inode(osb,
+ ORPHAN_DIR_SYSTEM_INODE,
osb->slot_num);
if (!orphan_dir_inode) {
status = -ENOENT;
@@ -2121,7 +2121,7 @@
goto leave;
}
- status = ocfs2_prepare_dir_for_insert(osb, orphan_dir_inode,
+ status = ocfs2_prepare_dir_for_insert(osb, orphan_dir_inode,
orphan_dir_bh, name,
OCFS2_ORPHAN_NAMELEN, de_bh);
if (status < 0) {
@@ -2154,8 +2154,8 @@
mlog_entry("(inode->i_ino = %lu)\n", inode->i_ino);
- orphan_dir_inode = ocfs2_get_system_file_inode(osb,
- ORPHAN_DIR_SYSTEM_INODE,
+ orphan_dir_inode = ocfs2_get_system_file_inode(osb,
+ ORPHAN_DIR_SYSTEM_INODE,
osb->slot_num);
if (!orphan_dir_inode) {
status = -ENOENT;
@@ -2164,15 +2164,15 @@
}
status = ocfs2_read_block(osb,
- OCFS2_I(orphan_dir_inode)->ip_blkno,
- &orphan_dir_bh, OCFS2_BH_CACHED,
+ OCFS2_I(orphan_dir_inode)->ip_blkno,
+ &orphan_dir_bh, OCFS2_BH_CACHED,
orphan_dir_inode);
if (status < 0) {
mlog_errno(status);
goto leave;
}
- status = ocfs2_journal_access(handle, orphan_dir_inode, orphan_dir_bh,
+ status = ocfs2_journal_access(handle, orphan_dir_inode, orphan_dir_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
if (status < 0) {
mlog_errno(status);
@@ -2258,14 +2258,14 @@
}
/* remove it from the orphan directory */
- status = ocfs2_delete_entry(handle, orphan_dir_inode, target_de,
+ status = ocfs2_delete_entry(handle, orphan_dir_inode, target_de,
target_de_bh);
if (status < 0) {
mlog_errno(status);
goto leave;
}
- status = ocfs2_journal_access(handle,orphan_dir_inode, orphan_dir_bh,
+ status = ocfs2_journal_access(handle,orphan_dir_inode, orphan_dir_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
if (status < 0) {
mlog_errno(status);
@@ -2287,7 +2287,7 @@
leave:
if (target_de_bh)
brelse(target_de_bh);
-
+
mlog_exit(status);
return status;
}
Modified: trunk/fs/ocfs2/namei.h
===================================================================
--- trunk/fs/ocfs2/namei.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/namei.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/ocfs1_fs_compat.h
===================================================================
--- trunk/fs/ocfs2/ocfs1_fs_compat.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/ocfs1_fs_compat.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -13,12 +13,12 @@
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License, version 2, as published by the Free Software Foundation.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/ocfs2.h
===================================================================
--- trunk/fs/ocfs2/ocfs2.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/ocfs2.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/ocfs2_fs.h
===================================================================
--- trunk/fs/ocfs2/ocfs2_fs.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/ocfs2_fs.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -10,12 +10,12 @@
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License, version 2, as published by the Free Software Foundation.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -255,7 +255,7 @@
__u32 e_clusters; /* Clusters covered by this extent */
__u64 e_blkno; /* Physical disk offset, in blocks */
/*10*/
-} ocfs2_extent_rec;
+} ocfs2_extent_rec;
typedef struct _ocfs2_chain_rec {
__u32 c_free; /* Number of free bits in this chain. */
Modified: trunk/fs/ocfs2/ocfs2_lockid.h
===================================================================
--- trunk/fs/ocfs2/ocfs2_lockid.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/ocfs2_lockid.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -62,7 +62,7 @@
default:
c = '\0';
}
-
+
return c;
}
Modified: trunk/fs/ocfs2/proc.c
===================================================================
--- trunk/fs/ocfs2/proc.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/proc.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -220,11 +220,11 @@
la_state = "unused";
len += sprintf(page + len, "%-25s %10s\n", "Local Alloc", la_state);
- len += sprintf(page + len, ALLOC_STATS_HDR, "Window Moves",
+ len += sprintf(page + len, ALLOC_STATS_HDR, "Window Moves",
atomic_read(&osb->alloc_stats.moves));
- len += sprintf(page + len, ALLOC_STATS_HDR, "Local Allocs",
+ len += sprintf(page + len, ALLOC_STATS_HDR, "Local Allocs",
atomic_read(&osb->alloc_stats.local_data));
- len += sprintf(page + len, ALLOC_STATS_HDR, "Bitmap Allocs",
+ len += sprintf(page + len, ALLOC_STATS_HDR, "Bitmap Allocs",
atomic_read(&osb->alloc_stats.bitmap_data));
len += sprintf(page + len, ALLOC_STATS_HDR, "Block Group Allocs",
atomic_read(&osb->alloc_stats.bg_allocs));
@@ -391,9 +391,9 @@
"Number of nodes : %u\n" \
"Cluster size : %d\n" \
"Volume size : %"MLFu64"\n" \
- "Open Transactions: : %u\n"
+ "Open Transactions: : %u\n"
- len = sprintf(page, PROC_STATS, osb->num_nodes, osb->s_clustersize,
+ len = sprintf(page, PROC_STATS, osb->num_nodes, osb->s_clustersize,
ocfs2_clusters_to_bytes(osb->sb, osb->num_clusters),
atomic_read(&osb->journal->j_num_trans));
Modified: trunk/fs/ocfs2/proc.h
===================================================================
--- trunk/fs/ocfs2/proc.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/proc.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/slot_map.c
===================================================================
--- trunk/fs/ocfs2/slot_map.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/slot_map.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/slot_map.h
===================================================================
--- trunk/fs/ocfs2/slot_map.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/slot_map.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/suballoc.c
===================================================================
--- trunk/fs/ocfs2/suballoc.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/suballoc.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -12,12 +12,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -48,17 +48,17 @@
static inline void ocfs2_debug_bg(ocfs2_group_desc *bg);
static inline void ocfs2_debug_suballoc_inode(ocfs2_dinode *fe);
static inline u16 ocfs2_find_victim_chain(ocfs2_chain_list *cl);
-static int ocfs2_block_group_fill(ocfs2_journal_handle *handle,
+static int ocfs2_block_group_fill(ocfs2_journal_handle *handle,
struct inode *alloc_inode,
struct buffer_head *bg_bh,
u64 group_blkno,
u16 my_chain,
ocfs2_chain_list *cl);
-static int ocfs2_block_group_alloc(ocfs2_super *osb,
+static int ocfs2_block_group_alloc(ocfs2_super *osb,
struct inode *alloc_inode,
struct buffer_head *bh);
-static int ocfs2_reserve_suballoc_bits(ocfs2_super *osb,
+static int ocfs2_reserve_suballoc_bits(ocfs2_super *osb,
ocfs2_alloc_context *ac);
static int ocfs2_cluster_group_search(struct inode *inode,
@@ -84,22 +84,22 @@
u64 *bg_blkno);
static int ocfs2_test_bg_bit_allocatable(struct buffer_head *bg_bh,
int nr);
-static int ocfs2_block_group_find_clear_bits(ocfs2_super *osb,
+static int ocfs2_block_group_find_clear_bits(ocfs2_super *osb,
struct buffer_head *bg_bh,
- unsigned int bits_wanted,
+ unsigned int bits_wanted,
u16 *bit_off,
u16 *bits_found);
static inline int ocfs2_block_group_set_bits(ocfs2_journal_handle *handle,
struct inode *alloc_inode,
- ocfs2_group_desc *bg,
+ ocfs2_group_desc *bg,
struct buffer_head *group_bh,
- unsigned int bit_off,
+ unsigned int bit_off,
unsigned int num_bits);
static inline int ocfs2_block_group_clear_bits(ocfs2_journal_handle *handle,
struct inode *alloc_inode,
- ocfs2_group_desc *bg,
+ ocfs2_group_desc *bg,
struct buffer_head *group_bh,
- unsigned int bit_off,
+ unsigned int bit_off,
unsigned int num_bits);
static int ocfs2_relink_block_group(ocfs2_journal_handle *handle,
@@ -110,7 +110,7 @@
u16 chain);
static inline int ocfs2_block_group_reasonably_empty(ocfs2_group_desc *bg,
u32 wanted);
-static int ocfs2_free_suballoc_bits(ocfs2_journal_handle *handle,
+static int ocfs2_free_suballoc_bits(ocfs2_journal_handle *handle,
struct inode *alloc_inode,
struct buffer_head *alloc_bh,
unsigned int start_bit,
@@ -137,7 +137,7 @@
kfree(ac);
}
-static int ocfs2_block_group_fill(ocfs2_journal_handle *handle,
+static int ocfs2_block_group_fill(ocfs2_journal_handle *handle,
struct inode *alloc_inode,
struct buffer_head *bg_bh,
u64 group_blkno,
@@ -152,9 +152,9 @@
OCFS2_BUG_ON_RO(((unsigned long long) bg_bh->b_blocknr) != group_blkno);
- status = ocfs2_journal_access(handle,
+ status = ocfs2_journal_access(handle,
alloc_inode,
- bg_bh,
+ bg_bh,
OCFS2_JOURNAL_ACCESS_CREATE);
if (status < 0) {
mlog_errno(status);
@@ -204,7 +204,7 @@
/*
* We expect the block group allocator to already be locked.
*/
-static int ocfs2_block_group_alloc(ocfs2_super *osb,
+static int ocfs2_block_group_alloc(ocfs2_super *osb,
struct inode *alloc_inode,
struct buffer_head *bh)
{
@@ -231,9 +231,9 @@
}
cl = &fe->id2.i_chain;
- status = ocfs2_reserve_clusters(osb,
- handle,
- cl->cl_cpg,
+ status = ocfs2_reserve_clusters(osb,
+ handle,
+ cl->cl_cpg,
&ac);
if (status < 0) {
if (status != -ENOSPC)
@@ -265,7 +265,7 @@
/* setup the group */
bg_blkno = ocfs2_clusters_to_blocks(osb->sb, bit_off);
- mlog(0, "new descriptor, record %u, at block %"MLFu64"\n",
+ mlog(0, "new descriptor, record %u, at block %"MLFu64"\n",
alloc_rec, bg_blkno);
bg_bh = sb_getblk(osb->sb, bg_blkno);
@@ -276,11 +276,11 @@
}
ocfs2_set_new_buffer_uptodate(alloc_inode, bg_bh);
- status = ocfs2_block_group_fill(handle,
- alloc_inode,
- bg_bh,
+ status = ocfs2_block_group_fill(handle,
+ alloc_inode,
+ bg_bh,
bg_blkno,
- alloc_rec,
+ alloc_rec,
cl);
if (status < 0) {
mlog_errno(status);
@@ -342,7 +342,7 @@
return status;
}
-static int ocfs2_reserve_suballoc_bits(ocfs2_super *osb,
+static int ocfs2_reserve_suballoc_bits(ocfs2_super *osb,
ocfs2_alloc_context *ac)
{
int status;
@@ -368,7 +368,7 @@
OCFS2_BUG_ON_INVALID_DINODE(fe);
OCFS2_BUG_ON_RO(!(fe->i_flags & OCFS2_CHAIN_FL));
- free_bits = le32_to_cpu(fe->id1.bitmap1.i_total) -
+ free_bits = le32_to_cpu(fe->id1.bitmap1.i_total) -
le32_to_cpu(fe->id1.bitmap1.i_used);
if (bits_wanted > free_bits) {
@@ -389,8 +389,8 @@
atomic_inc(&osb->alloc_stats.bg_extends);
/* You should never ask for this much metadata */
- BUG_ON(bits_wanted >
- (le32_to_cpu(fe->id1.bitmap1.i_total)
+ BUG_ON(bits_wanted >
+ (le32_to_cpu(fe->id1.bitmap1.i_total)
- le32_to_cpu(fe->id1.bitmap1.i_used)));
}
@@ -404,7 +404,7 @@
return status;
}
-int ocfs2_reserve_new_metadata(ocfs2_super *osb,
+int ocfs2_reserve_new_metadata(ocfs2_super *osb,
ocfs2_journal_handle *handle,
ocfs2_dinode *fe,
ocfs2_alloc_context **ac)
@@ -462,7 +462,7 @@
return status;
}
-int ocfs2_reserve_new_inode(ocfs2_super *osb,
+int ocfs2_reserve_new_inode(ocfs2_super *osb,
ocfs2_journal_handle *handle,
ocfs2_alloc_context **ac)
{
@@ -520,8 +520,8 @@
{
int status;
- ac->ac_inode = ocfs2_get_system_file_inode(osb,
- GLOBAL_BITMAP_SYSTEM_INODE,
+ ac->ac_inode = ocfs2_get_system_file_inode(osb,
+ GLOBAL_BITMAP_SYSTEM_INODE,
-1);
if (!ac->ac_inode) {
status = -EINVAL;
@@ -541,7 +541,7 @@
/* Callers don't need to care which bitmap (local alloc or main) to
* use so we figure it out for them, but unfortunately this clutters
* things a bit. */
-int ocfs2_reserve_clusters(ocfs2_super *osb,
+int ocfs2_reserve_clusters(ocfs2_super *osb,
ocfs2_journal_handle *handle,
u32 bits_wanted,
ocfs2_alloc_context **ac)
@@ -580,7 +580,7 @@
* can clean up what's left of the local
* allocation */
osb->local_alloc_state = OCFS2_LA_DISABLED;
- }
+ }
}
if (status == -ENOSPC) {
@@ -603,9 +603,9 @@
return status;
}
-/*
+/*
* More or less lifted from ext3. I'll leave their description below:
- *
+ *
* "For ext3 allocations, we must not reuse any blocks which are
* allocated in the bitmap buffer's "last committed data" copy. This
* prevents deletes from freeing up the page for reuse until we have
@@ -615,7 +615,7 @@
* data would allow the old block to be overwritten before the
* transaction committed (because we force data to disk before commit).
* This would lead to corruption if we crashed between overwriting the
- * data and committing the delete.
+ * data and committing the delete.
*
* @@@ We may want to make this allocation behaviour conditional on
* data-writes at some point, and disable it for metadata allocations or
@@ -639,9 +639,9 @@
return !ocfs2_test_bit(nr, (unsigned long *)bg->bg_bitmap);
}
-static int ocfs2_block_group_find_clear_bits(ocfs2_super *osb,
+static int ocfs2_block_group_find_clear_bits(ocfs2_super *osb,
struct buffer_head *bg_bh,
- unsigned int bits_wanted,
+ unsigned int bits_wanted,
u16 *bit_off,
u16 *bits_found)
{
@@ -655,8 +655,8 @@
found = start = best_offset = best_size = 0;
bitmap = bg->bg_bitmap;
- while((offset = ocfs2_find_next_zero_bit(bitmap,
- bg->bg_bits,
+ while((offset = ocfs2_find_next_zero_bit(bitmap,
+ bg->bg_bits,
start)) != -1) {
if (offset == bg->bg_bits)
break;
@@ -706,9 +706,9 @@
static inline int ocfs2_block_group_set_bits(ocfs2_journal_handle *handle,
struct inode *alloc_inode,
- ocfs2_group_desc *bg,
+ ocfs2_group_desc *bg,
struct buffer_head *group_bh,
- unsigned int bit_off,
+ unsigned int bit_off,
unsigned int num_bits)
{
int status;
@@ -720,7 +720,7 @@
OCFS2_BUG_ON_INVALID_GROUP_DESC(bg);
BUG_ON(bg->bg_free_bits_count < num_bits);
- mlog(0, "block_group_set_bits: off = %u, num = %u\n", bit_off,
+ mlog(0, "block_group_set_bits: off = %u, num = %u\n", bit_off,
num_bits);
if (ocfs2_is_cluster_bitmap(alloc_inode))
@@ -728,7 +728,7 @@
status = ocfs2_journal_access(handle,
alloc_inode,
- group_bh,
+ group_bh,
journal_type);
if (status < 0) {
mlog_errno(status);
@@ -740,7 +740,7 @@
while(num_bits--)
ocfs2_set_bit(bit_off++, bitmap);
- status = ocfs2_journal_dirty(handle,
+ status = ocfs2_journal_dirty(handle,
group_bh);
if (status < 0) {
mlog_errno(status);
@@ -797,7 +797,7 @@
bg_ptr = bg->bg_next_group;
prev_bg_ptr = prev_bg->bg_next_group;
- status = ocfs2_journal_access(handle, alloc_inode, prev_bg_bh,
+ status = ocfs2_journal_access(handle, alloc_inode, prev_bg_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
if (status < 0) {
mlog_errno(status);
@@ -834,7 +834,7 @@
goto bail;
}
- fe->id2.i_chain.cl_recs[chain].c_blkno = bg->bg_blkno;
+ fe->id2.i_chain.cl_recs[chain].c_blkno = bg->bg_blkno;
status = ocfs2_journal_dirty(handle, fe_bh);
if (status < 0) {
@@ -945,8 +945,8 @@
status = -ENOSPC;
/* for now, the chain search is a bit simplistic. We just use
* the 1st group with any empty bits. */
- while ((status = ac->ac_group_search(alloc_inode, group_bh,
- bits_wanted, min_bits, bit_off,
+ while ((status = ac->ac_group_search(alloc_inode, group_bh,
+ bits_wanted, min_bits, bit_off,
&tmp_bits)) == -ENOSPC) {
if (!bg->bg_next_group)
break;
@@ -958,8 +958,8 @@
next_group = bg->bg_next_group;
prev_group_bh = group_bh;
group_bh = NULL;
- status = ocfs2_read_block(OCFS2_SB(alloc_inode->i_sb),
- next_group, &group_bh,
+ status = ocfs2_read_block(OCFS2_SB(alloc_inode->i_sb),
+ next_group, &group_bh,
OCFS2_BH_CACHED, alloc_inode);
if (status < 0) {
mlog_errno(status);
@@ -998,7 +998,7 @@
(prev_group_bh) &&
(ocfs2_block_group_reasonably_empty(bg, *num_bits))) {
status = ocfs2_relink_block_group(handle, alloc_inode,
- ac->ac_bh, group_bh,
+ ac->ac_bh, group_bh,
prev_group_bh, chain);
if (status < 0) {
mlog_errno(status);
@@ -1008,7 +1008,7 @@
/* Ok, claim our bits now: set the info on dinode, chainlist
* and then the group */
- status = ocfs2_journal_access(handle,
+ status = ocfs2_journal_access(handle,
alloc_inode,
ac->ac_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
@@ -1021,25 +1021,25 @@
fe->id1.bitmap1.i_used = cpu_to_le32(*num_bits + tmp_used);
cl->cl_recs[chain].c_free -= *num_bits;
- status = ocfs2_journal_dirty(handle,
+ status = ocfs2_journal_dirty(handle,
ac->ac_bh);
if (status < 0) {
mlog_errno(status);
goto bail;
}
- status = ocfs2_block_group_set_bits(handle,
+ status = ocfs2_block_group_set_bits(handle,
alloc_inode,
- bg,
- group_bh,
- *bit_off,
+ bg,
+ group_bh,
+ *bit_off,
*num_bits);
if (status < 0) {
mlog_errno(status);
goto bail;
}
- mlog(0, "Allocated %u bits from suballocator %"MLFu64"\n",
+ mlog(0, "Allocated %u bits from suballocator %"MLFu64"\n",
*num_bits, fe->i_blkno);
*bg_blkno = bg->bg_blkno;
@@ -1108,8 +1108,8 @@
continue;
ac->ac_chain = i;
- status = ocfs2_search_chain(ac, bits_wanted, min_bits,
- bit_off, num_bits,
+ status = ocfs2_search_chain(ac, bits_wanted, min_bits,
+ bit_off, num_bits,
bg_blkno);
if (!status)
break;
@@ -1161,7 +1161,7 @@
return status;
}
-int ocfs2_claim_new_inode(ocfs2_super *osb,
+int ocfs2_claim_new_inode(ocfs2_super *osb,
ocfs2_journal_handle *handle,
ocfs2_alloc_context *ac,
u16 *suballoc_bit,
@@ -1264,8 +1264,8 @@
* contig. allocation, set to '1' to indicate we can deal with extents
* of any size.
*/
-int ocfs2_claim_clusters(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+int ocfs2_claim_clusters(ocfs2_super *osb,
+ ocfs2_journal_handle *handle,
ocfs2_alloc_context *ac,
u32 min_clusters,
u32 *cluster_start,
@@ -1281,7 +1281,7 @@
BUG_ON(!ac);
BUG_ON(ac->ac_bits_given >= ac->ac_bits_wanted);
- 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);
BUG_ON(ac->ac_handle != handle);
@@ -1315,7 +1315,7 @@
num_clusters,
&bg_blkno);
if (!status) {
- *cluster_start =
+ *cluster_start =
ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
bg_blkno,
bg_bit_off);
@@ -1337,9 +1337,9 @@
static inline int ocfs2_block_group_clear_bits(ocfs2_journal_handle *handle,
struct inode *alloc_inode,
- ocfs2_group_desc *bg,
+ ocfs2_group_desc *bg,
struct buffer_head *group_bh,
- unsigned int bit_off,
+ unsigned int bit_off,
unsigned int num_bits)
{
int status;
@@ -1356,7 +1356,7 @@
if (ocfs2_is_cluster_bitmap(alloc_inode))
journal_type = OCFS2_JOURNAL_ACCESS_UNDO;
- status = ocfs2_journal_access(handle, alloc_inode, group_bh,
+ status = ocfs2_journal_access(handle, alloc_inode, group_bh,
journal_type);
if (status < 0) {
mlog_errno(status);
@@ -1371,7 +1371,7 @@
ocfs2_clear_bit((bit_off + tmp),
(unsigned long *) bg->bg_bitmap);
if (ocfs2_is_cluster_bitmap(alloc_inode))
- ocfs2_set_bit(bit_off + tmp,
+ ocfs2_set_bit(bit_off + tmp,
(unsigned long *) undo_bg->bg_bitmap);
}
bg->bg_free_bits_count += num_bits;
@@ -1386,12 +1386,12 @@
/*
* expects the suballoc inode to already be locked.
*/
-static int ocfs2_free_suballoc_bits(ocfs2_journal_handle *handle,
+static int ocfs2_free_suballoc_bits(ocfs2_journal_handle *handle,
struct inode *alloc_inode,
struct buffer_head *alloc_bh,
unsigned int start_bit,
u64 bg_blkno,
- unsigned int count)
+ unsigned int count)
{
int status = 0;
u32 tmp_used;
@@ -1411,8 +1411,8 @@
", starting at %u\n",
OCFS2_I(alloc_inode)->ip_blkno, count, bg_blkno,
start_bit);
-
- status = ocfs2_read_block(osb, bg_blkno, &group_bh, OCFS2_BH_CACHED,
+
+ status = ocfs2_read_block(osb, bg_blkno, &group_bh, OCFS2_BH_CACHED,
alloc_inode);
if (status < 0) {
mlog_errno(status);
@@ -1431,7 +1431,7 @@
goto bail;
}
- status = ocfs2_journal_access(handle, alloc_inode, alloc_bh,
+ status = ocfs2_journal_access(handle, alloc_inode, alloc_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
if (status < 0) {
mlog_errno(status);
@@ -1515,7 +1515,7 @@
ocfs2_block_to_cluster_group(bitmap_inode, start_blk, &bg_blkno,
&bg_start_bit);
- mlog(0, "want to free %u clusters starting at block %"MLFu64"\n",
+ mlog(0, "want to free %u clusters starting at block %"MLFu64"\n",
num_clusters, start_blk);
mlog(0, "bg_blkno = %"MLFu64", bg_start_bit = %u\n",
bg_blkno, bg_start_bit);
@@ -1530,7 +1530,7 @@
return status;
}
-static inline void ocfs2_debug_bg(ocfs2_group_desc *bg)
+static inline void ocfs2_debug_bg(ocfs2_group_desc *bg)
{
printk("Block Group:\n");
printk("bg_signature: %s\n", bg->bg_signature);
@@ -1561,7 +1561,7 @@
printk("id2.i_chain.cl_cpg: %u\n", fe->id2.i_chain.cl_cpg);
printk("id2.i_chain.cl_bpc: %u\n", fe->id2.i_chain.cl_bpc);
printk("id2.i_chain.cl_count: %u\n", fe->id2.i_chain.cl_count);
- printk("id2.i_chain.cl_next_free_rec: %u\n",
+ printk("id2.i_chain.cl_next_free_rec: %u\n",
fe->id2.i_chain.cl_next_free_rec);
for(i = 0; i < fe->id2.i_chain.cl_next_free_rec; i++) {
printk("fe->id2.i_chain.cl_recs[%d].c_free: %u\n", i,
Modified: trunk/fs/ocfs2/suballoc.h
===================================================================
--- trunk/fs/ocfs2/suballoc.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/suballoc.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -57,14 +57,14 @@
return ac->ac_bits_wanted - ac->ac_bits_given;
}
-int ocfs2_reserve_new_metadata(ocfs2_super *osb,
+int ocfs2_reserve_new_metadata(ocfs2_super *osb,
ocfs2_journal_handle *handle,
ocfs2_dinode *fe,
ocfs2_alloc_context **ac);
-int ocfs2_reserve_new_inode(ocfs2_super *osb,
+int ocfs2_reserve_new_inode(ocfs2_super *osb,
ocfs2_journal_handle *handle,
ocfs2_alloc_context **ac);
-int ocfs2_reserve_clusters(ocfs2_super *osb,
+int ocfs2_reserve_clusters(ocfs2_super *osb,
ocfs2_journal_handle *handle,
u32 bits_wanted,
ocfs2_alloc_context **ac);
@@ -76,13 +76,13 @@
u16 *suballoc_bit_start,
u32 *num_bits,
u64 *blkno_start);
-int ocfs2_claim_new_inode(ocfs2_super *osb,
+int ocfs2_claim_new_inode(ocfs2_super *osb,
ocfs2_journal_handle *handle,
ocfs2_alloc_context *ac,
u16 *suballoc_bit,
u64 *fe_blkno);
-int ocfs2_claim_clusters(ocfs2_super *osb,
- ocfs2_journal_handle *handle,
+int ocfs2_claim_clusters(ocfs2_super *osb,
+ ocfs2_journal_handle *handle,
ocfs2_alloc_context *ac,
u32 min_clusters,
u32 *cluster_start,
Modified: trunk/fs/ocfs2/super.c
===================================================================
--- trunk/fs/ocfs2/super.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/super.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -124,7 +124,7 @@
.destroy_inode = ocfs2_destroy_inode,
.drop_inode = ocfs2_drop_inode,
.clear_inode = ocfs2_clear_inode,
- .delete_inode = ocfs2_delete_inode,
+ .delete_inode = ocfs2_delete_inode,
.sync_fs = ocfs2_sync_fs,
.write_super = ocfs2_write_super,
.put_super = ocfs2_put_super,
@@ -184,7 +184,7 @@
if (journal_start_commit(OCFS2_SB(sb)->journal->j_journal, &target)) {
if (wait)
- log_wait_commit(OCFS2_SB(sb)->journal->j_journal,
+ log_wait_commit(OCFS2_SB(sb)->journal->j_journal,
target);
}
return 0;
@@ -429,7 +429,7 @@
wake_up(&osb->osb_mount_event);
mlog_exit(status);
- return status;
+ return status;
read_super_error:
if (inode)
@@ -684,7 +684,7 @@
oi->ip_created_trans = 0;
oi->ip_last_trans = 0;
oi->ip_dir_start_lookup = 0;
-
+
init_rwsem(&oi->ip_alloc_sem);
init_MUTEX(&(oi->ip_io_sem));
@@ -716,7 +716,7 @@
NULL, NULL);
if (!ocfs2_lock_cache)
return -ENOMEM;
-
+
return 0;
}
@@ -732,7 +732,7 @@
}
static int ocfs2_sb_probe(struct super_block *sb,
- struct buffer_head **bh,
+ struct buffer_head **bh,
int *sector_size)
{
int status = 0, tmpstat;
@@ -754,7 +754,7 @@
/* Can this really happen? */
if (*sector_size < OCFS2_MIN_BLOCKSIZE)
*sector_size = OCFS2_MIN_BLOCKSIZE;
-
+
/* check block zero for old format */
status = ocfs2_get_sector(sb, bh, 0, *sector_size);
if (status < 0) {
@@ -790,8 +790,8 @@
for (blksize = *sector_size;
blksize <= OCFS2_MAX_BLOCKSIZE;
blksize <<= 1) {
- tmpstat = ocfs2_get_sector(sb, bh,
- OCFS2_SUPER_BLOCK_BLKNO,
+ tmpstat = ocfs2_get_sector(sb, bh,
+ OCFS2_SUPER_BLOCK_BLKNO,
blksize);
if (tmpstat < 0) {
status = tmpstat;
@@ -1154,7 +1154,7 @@
ocfs2_setup_hb_callbacks(osb);
init_waitqueue_head(&osb->osb_mount_event);
-
+
osb->vol_label = kmalloc(OCFS2_MAX_VOL_LABEL_LEN, GFP_KERNEL);
if (!osb->vol_label) {
mlog(ML_ERROR, "unable to alloc vol label\n");
@@ -1252,7 +1252,7 @@
goto bail;
}
- if (ocfs2_clusters_to_blocks(osb->sb, di->i_clusters - 1)
+ if (ocfs2_clusters_to_blocks(osb->sb, di->i_clusters - 1)
> (u32)~0UL) {
mlog(ML_ERROR, "Volume might try to write to blocks beyond "
"what jbd can address in 32 bits.\n");
@@ -1262,7 +1262,7 @@
if (ocfs2_setup_osb_uuid(osb, di->id2.i_super.s_uuid,
sizeof(di->id2.i_super.s_uuid))) {
- mlog(ML_ERROR, "Out of memory trying to setup our uuid.\n");
+ mlog(ML_ERROR, "Out of memory trying to setup our uuid.\n");
status = -ENOMEM;
goto bail;
}
@@ -1289,9 +1289,9 @@
goto bail;
}
- /*
- * global bitmap
- */
+ /*
+ * global bitmap
+ */
inode = ocfs2_get_system_file_inode(osb,
GLOBAL_BITMAP_SYSTEM_INODE, -1);
if (!inode) {
@@ -1299,7 +1299,7 @@
mlog_errno(status);
goto bail;
}
-
+
osb->bitmap_blkno = OCFS2_I(inode)->ip_blkno;
status = ocfs2_read_block(osb, osb->bitmap_blkno, &bitmap_bh, 0,
@@ -1357,7 +1357,7 @@
status = -EINVAL;
if ((1 << le32_to_cpu(di->id2.i_super.s_blocksize_bits)) != blksz) {
mlog(ML_ERROR, "found superblock with incorrect block "
- "size: found %u, should be %u\n",
+ "size: found %u, should be %u\n",
1 << le32_to_cpu(di->id2.i_super.s_blocksize_bits),
blksz);
} else if (le16_to_cpu(di->id2.i_super.s_major_rev_level) !=
@@ -1418,7 +1418,7 @@
/* If the journal was unmounted cleanly then we don't want to
* recover anything. Otherwise, journal_load will do that
* dirty work for us :) */
- if (!dirty) {
+ if (!dirty) {
status = ocfs2_journal_wipe(osb->journal, 0);
if (status < 0) {
mlog_errno(status);
@@ -1478,7 +1478,7 @@
/*
- * The routine gets called from dismount or close whenever a dismount on
+ * The routine gets called from dismount or close whenever a dismount on
* volume is requested and the osb open count becomes 1.
* It will remove the osb from the global list and also free up all the
* initialized resources and fileobject.
Modified: trunk/fs/ocfs2/super.h
===================================================================
--- trunk/fs/ocfs2/super.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/super.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/symlink.c
===================================================================
--- trunk/fs/ocfs2/symlink.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/symlink.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -4,8 +4,8 @@
* linux/cluster/ssi/cfs/symlink.c
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -31,7 +31,7 @@
* ocfs2 symlink handling code, including CDSL support
*
* Copyright (C) 2004, 2005 Oracle.
- *
+ *
*/
#include <linux/fs.h>
@@ -131,7 +131,7 @@
}
/**
- *** sym_nodenum - Substitute node number
+ *** sym_nodenum - Substitute node number
*** @str: String for result
*** @len: Length of result buffer
***
@@ -216,7 +216,7 @@
{NULL, 0, NULL}
};
-/* CDSL code - end
+/* CDSL code - end
**/
static char *ocfs2_page_getlink(struct dentry * dentry,
@@ -293,7 +293,7 @@
}
len = ocfs2_link_size(symlink_ops, orig_link, inode);
- new_link = kmalloc(len, GFP_KERNEL);
+ new_link = kmalloc(len, GFP_KERNEL);
if (new_link == NULL) {
res = ENOMEM;
goto out;
@@ -346,7 +346,7 @@
/**
*** ocfs2_link_size - Return expanded size required to store a symlink
- *** @str: The symlink
+ *** @str: The symlink
*** @ops: The symlink substitution operations table
***
*** Returns: The size of the expanded symlink.
Modified: trunk/fs/ocfs2/symlink.h
===================================================================
--- trunk/fs/ocfs2/symlink.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/symlink.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/sysfile.c
===================================================================
--- trunk/fs/ocfs2/sysfile.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/sysfile.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -82,7 +82,7 @@
return inode;
}
-
+
/* this gets one ref thru iget */
inode = _ocfs2_get_system_file_inode(osb, type, slot);
@@ -109,9 +109,9 @@
ocfs2_sprintf_system_inode_name(namebuf,
sizeof(namebuf),
type, slot);
-
+
status = ocfs2_find_files_on_disk(namebuf, strlen(namebuf),
- &blkno, osb->sys_root_inode,
+ &blkno, osb->sys_root_inode,
&dirent_bh, &de);
if (status < 0) {
goto bail;
Modified: trunk/fs/ocfs2/sysfile.h
===================================================================
--- trunk/fs/ocfs2/sysfile.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/sysfile.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/uptodate.c
===================================================================
--- trunk/fs/ocfs2/uptodate.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/uptodate.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -5,19 +5,19 @@
*
* Tracking the up-to-date-ness of a local buffer_head with respect to
* the cluster.
- *
+ *
* Copyright (C) 2002, 2004, 2005 Oracle. All rights reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -39,9 +39,9 @@
* - buffer_jbd is used liberally - if a bh is in the journal on
* this node then it *must* be up to date.
* - the standard buffer_uptodate() macro is used to detect buffers
- * which may be invalid (even if we have an up to date tracking
+ * which may be invalid (even if we have an up to date tracking
* item for them)
- *
+ *
* For a full understanding of how this code works together, one
* should read the callers in dlmglue.c, the I/O functions in
* buffer_head_io.c and ocfs2_journal_access in journal.c
@@ -140,7 +140,7 @@
oi->ip_blkno, to_purge, purged);
}
-/* Returns the index in the cache array, -1 if not found.
+/* Returns the index in the cache array, -1 if not found.
* Requires ip_lock. */
static int ocfs2_search_cache_array(struct ocfs2_caching_info *ci,
sector_t item)
@@ -393,7 +393,7 @@
* the slow case. Additionally, if the cache needs to be bumped up to
* a tree, the code will not recheck after acquiring the lock --
* multiple paths cannot be expanding to a tree at the same time.
- *
+ *
* The slow path takes into account that items can be removed
* (including the whole tree wiped and reset) when this process it out
* allocating memory. In those cases, it reverts back to the fast
Modified: trunk/fs/ocfs2/uptodate.h
===================================================================
--- trunk/fs/ocfs2/uptodate.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/uptodate.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/ver.c
===================================================================
--- trunk/fs/ocfs2/ver.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/ver.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -38,7 +38,7 @@
}
int ocfs2_str_version(char *buf)
-{
+{
return sprintf(buf, "%s\n", VERSION_STR);
}
Modified: trunk/fs/ocfs2/ver.h
===================================================================
--- trunk/fs/ocfs2/ver.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/ver.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/fs/ocfs2/vote.c
===================================================================
--- trunk/fs/ocfs2/vote.c 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/vote.c 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -173,12 +173,12 @@
* respond with BUSY he doesn't actually need the orphaned
* slot, but it doesn't hurt to do it here anyway. */
if ((*orphaned_slot) != OCFS2_INVALID_SLOT) {
- mlog_bug_on_msg(OCFS2_I(inode)->ip_orphaned_slot !=
- OCFS2_INVALID_SLOT &&
- OCFS2_I(inode)->ip_orphaned_slot !=
+ mlog_bug_on_msg(OCFS2_I(inode)->ip_orphaned_slot !=
+ OCFS2_INVALID_SLOT &&
+ OCFS2_I(inode)->ip_orphaned_slot !=
(*orphaned_slot),
"Inode %"MLFu64": This node thinks it's "
- "orphaned in slot %d, messaged it's in %d\n",
+ "orphaned in slot %d, messaged it's in %d\n",
OCFS2_I(inode)->ip_blkno,
OCFS2_I(inode)->ip_orphaned_slot,
*orphaned_slot);
@@ -221,7 +221,7 @@
truncate_inode_pages(inode->i_mapping, 0);
ocfs2_extent_map_trunc(inode, 0);
- spin_lock(&OCFS2_I(inode)->ip_lock);
+ spin_lock(&OCFS2_I(inode)->ip_lock);
/* double check open count - someone might have raced this
* thread into ocfs2_file_open while we were writing out
* data. If we're to allow a wipe of this inode now, we *must*
@@ -836,7 +836,7 @@
* this information to determine which lock to take. */
spin_lock(&OCFS2_I(inode)->ip_lock);
mlog_bug_on_msg(OCFS2_I(inode)->ip_orphaned_slot != orphaned_slot &&
- OCFS2_I(inode)->ip_orphaned_slot
+ OCFS2_I(inode)->ip_orphaned_slot
!= OCFS2_INVALID_SLOT, "Inode %"MLFu64": Node %d "
"says it's orphaned in slot %d, we think it's in %d\n",
OCFS2_I(inode)->ip_blkno, ntohl(resp->r_hdr.h_node_num),
@@ -950,7 +950,7 @@
int status;
struct ocfs2_vote_msg *request = NULL;
- request = ocfs2_new_vote_request(osb, 0ULL, 0,
+ request = ocfs2_new_vote_request(osb, 0ULL, 0,
OCFS2_VOTE_REQ_MOUNT, 0);
if (!request) {
status = -ENOMEM;
@@ -985,7 +985,7 @@
int status;
struct ocfs2_vote_msg *request = NULL;
- request = ocfs2_new_vote_request(osb, 0ULL, 0,
+ request = ocfs2_new_vote_request(osb, 0ULL, 0,
OCFS2_VOTE_REQ_UMOUNT, 0);
if (!request) {
status = -ENOMEM;
Modified: trunk/fs/ocfs2/vote.h
===================================================================
--- trunk/fs/ocfs2/vote.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/fs/ocfs2/vote.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Modified: trunk/include/linux/configfs.h
===================================================================
--- trunk/include/linux/configfs.h 2005-07-01 23:31:07 UTC (rev 2454)
+++ trunk/include/linux/configfs.h 2005-07-02 00:12:02 UTC (rev 2455)
@@ -7,12 +7,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -29,7 +29,7 @@
*
* Please read Documentation/filesystems/configfs.txt before using the
* configfs interface, ESPECIALLY the parts about reference counts and
- * item destructors.
+ * item destructors.
*/
#ifndef _CONFIGFS_H_
@@ -134,13 +134,13 @@
/*
* If allow_link() exists, the item can symlink(2) out to other
- * items. If the item is a group, it may support mkdir(2).
+ * items. If the item is a group, it may support mkdir(2).
* Groups supply one of make_group() and make_item(). If the
* group supports make_group(), one can create group children. If it
* supports make_item(), one can create config_item children. If it has
* default_groups on group->default_groups, it has automatically created
* group children. default_groups may coexist alongsize make_group() or
- * make_item(), but if the group wishes to have only default_groups
+ * make_item(), but if the group wishes to have only default_groups
* children (disallowing mkdir(2)), it need not provide either function.
* If the group has commit(), it supports pending and commited (active)
* items.
More information about the Ocfs2-commits
mailing list