6 a.m.
v2: fixed patch format, separated into three commits
Zoltán Lajos Kis (3):
Staging: lustre: fix line over 80 characters in dt_object.c
Staging: lustre: fix braces are not necessary in dt_object.c
Staging: lustre: fix space before and after comma in dt_object.c
drivers/staging/lustre/lustre/obdclass/dt_object.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
--
1.9.1
6 a.m.
New subject: [PATCH v2 1/3] Staging: lustre: fix line over 80 characters in dt_object.c
Fixes a line over 80 characters warining in
lustre/lustre/obdclass/dt_object.c that was found by the
checkpatch.pl tool.
Signed-off-by: Zoltán Lajos Kis <zoltan.lajos.kis(a)gmail.com>
---
drivers/staging/lustre/lustre/obdclass/dt_object.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/lustre/lustre/obdclass/dt_object.c
b/drivers/staging/lustre/lustre/obdclass/dt_object.c
index 6ce407f..4b5c828d 100644
--- a/drivers/staging/lustre/lustre/obdclass/dt_object.c
+++ b/drivers/staging/lustre/lustre/obdclass/dt_object.c
@@ -235,7 +235,8 @@ EXPORT_SYMBOL(dt_locate_at);
/**
* find a object named \a entry in given \a dfh->dfh_o directory.
*/
-static int dt_find_entry(const struct lu_env *env, const char *entry, void *data)
+static int dt_find_entry(const struct lu_env *env,
+ const char *entry, void *data)
{
struct dt_find_hint *dfh = data;
struct dt_device *dt = dfh->dfh_dt;
--
1.9.1
6 a.m.
New subject: [PATCH v2 2/3] Staging: lustre: fix braces are not necessary in dt_object.c
Fixes a braces {} are not necessary for any arm of this statement
warning in lustre/lustre/obdclass/dt_object.c that was found by
the checkpatch.pl tool.
Signed-off-by: Zoltán Lajos Kis <zoltan.lajos.kis(a)gmail.com>
---
drivers/staging/lustre/lustre/obdclass/dt_object.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/lustre/lustre/obdclass/dt_object.c
b/drivers/staging/lustre/lustre/obdclass/dt_object.c
index 4b5c828d..46fbf21 100644
--- a/drivers/staging/lustre/lustre/obdclass/dt_object.c
+++ b/drivers/staging/lustre/lustre/obdclass/dt_object.c
@@ -329,9 +329,9 @@ static struct dt_object *dt_reg_open(const struct lu_env *env,
int result;
result = dt_lookup_dir(env, p, name, fid);
- if (result == 0){
+ if (result == 0)
o = dt_locate(env, dt, fid);
- } else
+ else
o = ERR_PTR(result);
return o;
--
1.9.1
6 a.m.
New subject: [PATCH v2 3/3] Staging: lustre: fix space before and after comma in dt_object.c
Fixes a space prohibited before that ',' and space required after
that ',' error in lustre/lustre/obdclass/dt_object.c that were
found by the checkpatch.pl tool.
Signed-off-by: Zoltán Lajos Kis <zoltan.lajos.kis(a)gmail.com>
---
drivers/staging/lustre/lustre/obdclass/dt_object.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/lustre/lustre/obdclass/dt_object.c
b/drivers/staging/lustre/lustre/obdclass/dt_object.c
index 46fbf21..b67b0fe 100644
--- a/drivers/staging/lustre/lustre/obdclass/dt_object.c
+++ b/drivers/staging/lustre/lustre/obdclass/dt_object.c
@@ -922,7 +922,7 @@ int dt_index_read(const struct lu_env *env, struct dt_device *dev,
ii->ii_version = dt_version_get(env, obj);
/* walk the index and fill lu_idxpages with key/record pairs */
- rc = dt_index_walk(env, obj, rdpg, dt_index_page_build ,ii);
+ rc = dt_index_walk(env, obj, rdpg, dt_index_page_build, ii);
dt_read_unlock(env, obj);
if (rc == 0) {
--
1.9.1
6:11 a.m.
New subject: [PATCH v2 2/3] Staging: lustre: fix braces are not necessary in dt_object.c
On Wed, 2015-06-10 at 22:00 +0200, Zoltán Lajos Kis wrote:
Fixes a braces {} are not necessary for any arm of this statement
warning in lustre/lustre/obdclass/dt_object.c that was found by
the checkpatch.pl tool.
Signed-off-by: Zoltán Lajos Kis <zoltan.lajos.kis(a)gmail.com>
---
drivers/staging/lustre/lustre/obdclass/dt_object.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/lustre/lustre/obdclass/dt_object.c
b/drivers/staging/lustre/lustre/obdclass/dt_object.c
index 4b5c828d..46fbf21 100644
--- a/drivers/staging/lustre/lustre/obdclass/dt_object.c
+++ b/drivers/staging/lustre/lustre/obdclass/dt_object.c
@@ -329,9 +329,9 @@ static struct dt_object *dt_reg_open(const struct lu_env *env,
int result;
result = dt_lookup_dir(env, p, name, fid);
- if (result == 0){
+ if (result == 0)
o = dt_locate(env, dt, fid);
- } else
+ else
o = ERR_PTR(result);
return o;
My preference for this sort of thing is generally:
static struct dt_object *dt_reg_open(const struct lu_env *env,
struct dt_device *dt,
struct dt_object *p,
const char *name,
struct lu_fid *fid)
{
int result;
result = dt_lookup_dir(env, p, name, fid);
if (result)
return ERR_PTR(result);
return dt_locate(env, dt, fid);
}
2657
days inactive
2657
days old
4 comments
2 participants
participants (2)
-
Joe Perches -
Zoltán Lajos Kis