summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnkit Garg2015-05-06 07:33:23 +0200
committerGreg Kroah-Hartman2015-05-31 02:19:36 +0200
commit109a1624e37fed4b11841daf8ae05395a03a5fde (patch)
tree9eca8ffb29ba2f5686340312b8006466170ab3a5
parentlustre: kill unused helper (diff)
downloadkernel-qcow2-linux-109a1624e37fed4b11841daf8ae05395a03a5fde.tar.gz
kernel-qcow2-linux-109a1624e37fed4b11841daf8ae05395a03a5fde.tar.xz
kernel-qcow2-linux-109a1624e37fed4b11841daf8ae05395a03a5fde.zip
staging: lustre: lclient: lcommon_cl.c fixing coding style issues
This patch fixes the checkpatch.pl warning: WARNING: else is not generally useful after a break or return + return result; + } else { Signed-off-by: Ankit Garg <kerneldvlper@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/lustre/lustre/lclient/lcommon_cl.c35
1 files changed, 17 insertions, 18 deletions
diff --git a/drivers/staging/lustre/lustre/lclient/lcommon_cl.c b/drivers/staging/lustre/lustre/lclient/lcommon_cl.c
index 19448fe52cfd..e0c1ccafbd63 100644
--- a/drivers/staging/lustre/lustre/lclient/lcommon_cl.c
+++ b/drivers/staging/lustre/lustre/lclient/lcommon_cl.c
@@ -836,25 +836,24 @@ int ccc_prep_size(const struct lu_env *env, struct cl_object *obj,
*exceed = 1;
}
return result;
- } else {
- /*
- * region is within kms and, hence, within real file
- * size (A). We need to increase i_size to cover the
- * read region so that generic_file_read() will do its
- * job, but that doesn't mean the kms size is
- * _correct_, it is only the _minimum_ size. If
- * someone does a stat they will get the correct size
- * which will always be >= the kms value here.
- * b=11081
- */
- if (cl_isize_read(inode) < kms) {
- cl_isize_write_nolock(inode, kms);
- CDEBUG(D_VFSTRACE,
- DFID" updating i_size %llu\n",
- PFID(lu_object_fid(&obj->co_lu)),
- (__u64)cl_isize_read(inode));
+ }
+ /*
+ * region is within kms and, hence, within real file
+ * size (A). We need to increase i_size to cover the
+ * read region so that generic_file_read() will do its
+ * job, but that doesn't mean the kms size is
+ * _correct_, it is only the _minimum_ size. If
+ * someone does a stat they will get the correct size
+ * which will always be >= the kms value here.
+ * b=11081
+ */
+ if (cl_isize_read(inode) < kms) {
+ cl_isize_write_nolock(inode, kms);
+ CDEBUG(D_VFSTRACE,
+ DFID" updating i_size %llu\n",
+ PFID(lu_object_fid(&obj->co_lu)),
+ (__u64)cl_isize_read(inode));
- }
}
}
ccc_object_size_unlock(obj);