Skip to content

Commit 8be658a

Browse files
committed
Whitespace fixes (line continuations, and other things)
Some of the line continuations were converted from 4-spaces to a tab in my earlier edits. This commit restores them to project style guidelines. Additionally, there were a few other style regressions that I went through and resolved. Signed-off-by: Coleman Kane <[email protected]>
1 parent ceb59ed commit 8be658a

File tree

5 files changed

+24
-19
lines changed

5 files changed

+24
-19
lines changed

include/os/linux/kernel/linux/vfs_compat.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,8 @@ static inline void zfs_gid_write(struct inode *ip, gid_t gid)
343343
/*
344344
* 4.9 API change
345345
*/
346-
#if !(defined(HAVE_SETATTR_PREPARE_NO_USERNS) || defined(HAVE_SETATTR_PREPARE_USERNS))
346+
#if !(defined(HAVE_SETATTR_PREPARE_NO_USERNS) || \
347+
defined(HAVE_SETATTR_PREPARE_USERNS))
347348
static inline int
348349
setattr_prepare(struct dentry *dentry, struct iattr *ia)
349350
{
@@ -392,10 +393,11 @@ func(const struct path *path, struct kstat *stat, u32 request_mask, \
392393
#elif defined(HAVE_USERNS_IOPS_GETATTR)
393394
#define ZPL_GETATTR_WRAPPER(func) \
394395
static int \
395-
func(struct user_namespace *user_ns,const struct path *path, \
396-
struct kstat *stat, u32 request_mask, unsigned int query_flags) \
396+
func(struct user_namespace *user_ns, const struct path *path, \
397+
struct kstat *stat, u32 request_mask, unsigned int query_flags) \
397398
{ \
398-
return (func##_impl(user_ns, path, stat, request_mask, query_flags)); \
399+
return (func##_impl(user_ns, path, stat, request_mask, \
400+
query_flags)); \
399401
}
400402
#else
401403
#error

include/os/linux/zfs/sys/zpl.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,13 @@ zpl_dir_emit_dots(struct file *file, zpl_dir_context_t *ctx)
180180
#endif
181181

182182
#if defined(HAVE_SETATTR_PREPARE_USERNS)
183-
#define zpl_setattr_prepare(ns, dentry, ia) setattr_prepare(ns, dentry, ia)
183+
#define zpl_setattr_prepare(ns, dentry, ia) setattr_prepare(ns, dentry, ia)
184184
#else
185-
/* Use kernel-provided version, or our own from linux/vfs_compat.h */
186-
#define zpl_setattr_prepare(ns, dentry, ia) setattr_prepare(dentry, ia)
185+
/*
186+
* Use kernel-provided version, or our own from
187+
* linux/vfs_compat.h
188+
*/
189+
#define zpl_setattr_prepare(ns, dentry, ia) setattr_prepare(dentry, ia)
187190
#endif
188191

189192
#endif /* _SYS_ZPL_H */

module/os/linux/zfs/zfs_vnops_os.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1658,7 +1658,7 @@ zfs_readdir(struct inode *ip, zpl_dir_context_t *ctx, cred_t *cr)
16581658
int
16591659
#ifdef HAVE_GENERIC_FILLATTR_USERNS
16601660
zfs_getattr_fast(struct user_namespace *user_ns, struct inode *ip,
1661-
struct kstat *sp)
1661+
struct kstat *sp)
16621662
#else
16631663
zfs_getattr_fast(struct inode *ip, struct kstat *sp)
16641664
#endif

module/os/linux/zfs/zpl_ctldir.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,11 @@ zpl_root_readdir(struct file *filp, void *dirent, filldir_t filldir)
103103
static int
104104
#ifdef HAVE_USERNS_IOPS_GETATTR
105105
zpl_root_getattr_impl(struct user_namespace *user_ns,
106-
const struct path *path, struct kstat *stat, u32 request_mask,
107-
unsigned int query_flags)
106+
const struct path *path, struct kstat *stat, u32 request_mask,
107+
unsigned int query_flags)
108108
#else
109109
zpl_root_getattr_impl(const struct path *path, struct kstat *stat,
110-
u32 request_mask, unsigned int query_flags)
110+
u32 request_mask, unsigned int query_flags)
111111
#endif
112112
{
113113
struct inode *ip = path->dentry->d_inode;
@@ -345,7 +345,7 @@ zpl_snapdir_rmdir(struct inode *dip, struct dentry *dentry)
345345
static int
346346
#ifdef HAVE_IOPS_MKDIR_USERNS
347347
zpl_snapdir_mkdir(struct user_namespace *user_ns, struct inode *dip,
348-
struct dentry *dentry, umode_t mode)
348+
struct dentry *dentry, umode_t mode)
349349
#else
350350
zpl_snapdir_mkdir(struct inode *dip, struct dentry *dentry, umode_t mode)
351351
#endif
@@ -380,11 +380,11 @@ zpl_snapdir_mkdir(struct inode *dip, struct dentry *dentry, umode_t mode)
380380
static int
381381
#ifdef HAVE_USERNS_IOPS_GETATTR
382382
zpl_snapdir_getattr_impl(struct user_namespace *user_ns,
383-
const struct path *path, struct kstat *stat, u32 request_mask,
384-
unsigned int query_flags)
383+
const struct path *path, struct kstat *stat, u32 request_mask,
384+
unsigned int query_flags)
385385
#else
386386
zpl_snapdir_getattr_impl(const struct path *path, struct kstat *stat,
387-
u32 request_mask, unsigned int query_flags)
387+
u32 request_mask, unsigned int query_flags)
388388
#endif
389389
{
390390
struct inode *ip = path->dentry->d_inode;
@@ -522,11 +522,11 @@ zpl_shares_readdir(struct file *filp, void *dirent, filldir_t filldir)
522522
static int
523523
#ifdef HAVE_USERNS_IOPS_GETATTR
524524
zpl_shares_getattr_impl(struct user_namespace *user_ns,
525-
const struct path *path, struct kstat *stat, u32 request_mask,
526-
unsigned int query_flags)
525+
const struct path *path, struct kstat *stat, u32 request_mask,
526+
unsigned int query_flags)
527527
#else
528528
zpl_shares_getattr_impl(const struct path *path, struct kstat *stat,
529-
u32 request_mask, unsigned int query_flags)
529+
u32 request_mask, unsigned int query_flags)
530530
#endif
531531
{
532532
struct inode *ip = path->dentry->d_inode;

module/os/linux/zfs/zpl_inode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ zpl_rmdir(struct inode *dir, struct dentry *dentry)
340340
static int
341341
#ifdef HAVE_USERNS_IOPS_GETATTR
342342
zpl_getattr_impl(struct user_namespace *user_ns,
343-
const struct path *path, struct kstat *stat, u32 request_mask,
343+
const struct path *path, struct kstat *stat, u32 request_mask,
344344
unsigned int query_flags)
345345
#else
346346
zpl_getattr_impl(const struct path *path, struct kstat *stat, u32 request_mask,

0 commit comments

Comments
 (0)