Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
77ba7877
Commit
77ba7877
authored
Apr 02, 2012
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xfs: switch to proper __bitwise type for KM_... flags
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
c217a2a0
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
19 deletions
+20
-19
fs/xfs/kmem.c
fs/xfs/kmem.c
+5
-5
fs/xfs/kmem.h
fs/xfs/kmem.h
+11
-10
fs/xfs/xfs_log.c
fs/xfs/xfs_log.c
+1
-1
fs/xfs/xfs_log_priv.h
fs/xfs/xfs_log_priv.h
+1
-1
fs/xfs/xfs_trans.c
fs/xfs/xfs_trans.c
+1
-1
fs/xfs/xfs_trans.h
fs/xfs/xfs_trans.h
+1
-1
No files found.
fs/xfs/kmem.c
View file @
77ba7877
...
@@ -46,7 +46,7 @@ kmem_zalloc_greedy(size_t *size, size_t minsize, size_t maxsize)
...
@@ -46,7 +46,7 @@ kmem_zalloc_greedy(size_t *size, size_t minsize, size_t maxsize)
}
}
void
*
void
*
kmem_alloc
(
size_t
size
,
unsigned
int
__nocas
t
flags
)
kmem_alloc
(
size_t
size
,
xfs_km_flags_
t
flags
)
{
{
int
retries
=
0
;
int
retries
=
0
;
gfp_t
lflags
=
kmem_flags_convert
(
flags
);
gfp_t
lflags
=
kmem_flags_convert
(
flags
);
...
@@ -65,7 +65,7 @@ kmem_alloc(size_t size, unsigned int __nocast flags)
...
@@ -65,7 +65,7 @@ kmem_alloc(size_t size, unsigned int __nocast flags)
}
}
void
*
void
*
kmem_zalloc
(
size_t
size
,
unsigned
int
__nocas
t
flags
)
kmem_zalloc
(
size_t
size
,
xfs_km_flags_
t
flags
)
{
{
void
*
ptr
;
void
*
ptr
;
...
@@ -87,7 +87,7 @@ kmem_free(const void *ptr)
...
@@ -87,7 +87,7 @@ kmem_free(const void *ptr)
void
*
void
*
kmem_realloc
(
const
void
*
ptr
,
size_t
newsize
,
size_t
oldsize
,
kmem_realloc
(
const
void
*
ptr
,
size_t
newsize
,
size_t
oldsize
,
unsigned
int
__nocas
t
flags
)
xfs_km_flags_
t
flags
)
{
{
void
*
new
;
void
*
new
;
...
@@ -102,7 +102,7 @@ kmem_realloc(const void *ptr, size_t newsize, size_t oldsize,
...
@@ -102,7 +102,7 @@ kmem_realloc(const void *ptr, size_t newsize, size_t oldsize,
}
}
void
*
void
*
kmem_zone_alloc
(
kmem_zone_t
*
zone
,
unsigned
int
__nocas
t
flags
)
kmem_zone_alloc
(
kmem_zone_t
*
zone
,
xfs_km_flags_
t
flags
)
{
{
int
retries
=
0
;
int
retries
=
0
;
gfp_t
lflags
=
kmem_flags_convert
(
flags
);
gfp_t
lflags
=
kmem_flags_convert
(
flags
);
...
@@ -121,7 +121,7 @@ kmem_zone_alloc(kmem_zone_t *zone, unsigned int __nocast flags)
...
@@ -121,7 +121,7 @@ kmem_zone_alloc(kmem_zone_t *zone, unsigned int __nocast flags)
}
}
void
*
void
*
kmem_zone_zalloc
(
kmem_zone_t
*
zone
,
unsigned
int
__nocas
t
flags
)
kmem_zone_zalloc
(
kmem_zone_t
*
zone
,
xfs_km_flags_
t
flags
)
{
{
void
*
ptr
;
void
*
ptr
;
...
...
fs/xfs/kmem.h
View file @
77ba7877
...
@@ -27,10 +27,11 @@
...
@@ -27,10 +27,11 @@
* General memory allocation interfaces
* General memory allocation interfaces
*/
*/
#define KM_SLEEP 0x0001u
typedef
unsigned
__bitwise
xfs_km_flags_t
;
#define KM_NOSLEEP 0x0002u
#define KM_SLEEP ((__force xfs_km_flags_t)0x0001u)
#define KM_NOFS 0x0004u
#define KM_NOSLEEP ((__force xfs_km_flags_t)0x0002u)
#define KM_MAYFAIL 0x0008u
#define KM_NOFS ((__force xfs_km_flags_t)0x0004u)
#define KM_MAYFAIL ((__force xfs_km_flags_t)0x0008u)
/*
/*
* We use a special process flag to avoid recursive callbacks into
* We use a special process flag to avoid recursive callbacks into
...
@@ -38,7 +39,7 @@
...
@@ -38,7 +39,7 @@
* warnings, so we explicitly skip any generic ones (silly of us).
* warnings, so we explicitly skip any generic ones (silly of us).
*/
*/
static
inline
gfp_t
static
inline
gfp_t
kmem_flags_convert
(
unsigned
int
__nocas
t
flags
)
kmem_flags_convert
(
xfs_km_flags_
t
flags
)
{
{
gfp_t
lflags
;
gfp_t
lflags
;
...
@@ -54,9 +55,9 @@ kmem_flags_convert(unsigned int __nocast flags)
...
@@ -54,9 +55,9 @@ kmem_flags_convert(unsigned int __nocast flags)
return
lflags
;
return
lflags
;
}
}
extern
void
*
kmem_alloc
(
size_t
,
unsigned
int
__nocas
t
);
extern
void
*
kmem_alloc
(
size_t
,
xfs_km_flags_
t
);
extern
void
*
kmem_zalloc
(
size_t
,
unsigned
int
__nocas
t
);
extern
void
*
kmem_zalloc
(
size_t
,
xfs_km_flags_
t
);
extern
void
*
kmem_realloc
(
const
void
*
,
size_t
,
size_t
,
unsigned
int
__nocas
t
);
extern
void
*
kmem_realloc
(
const
void
*
,
size_t
,
size_t
,
xfs_km_flags_
t
);
extern
void
kmem_free
(
const
void
*
);
extern
void
kmem_free
(
const
void
*
);
static
inline
void
*
kmem_zalloc_large
(
size_t
size
)
static
inline
void
*
kmem_zalloc_large
(
size_t
size
)
...
@@ -107,7 +108,7 @@ kmem_zone_destroy(kmem_zone_t *zone)
...
@@ -107,7 +108,7 @@ kmem_zone_destroy(kmem_zone_t *zone)
kmem_cache_destroy
(
zone
);
kmem_cache_destroy
(
zone
);
}
}
extern
void
*
kmem_zone_alloc
(
kmem_zone_t
*
,
unsigned
int
__nocas
t
);
extern
void
*
kmem_zone_alloc
(
kmem_zone_t
*
,
xfs_km_flags_
t
);
extern
void
*
kmem_zone_zalloc
(
kmem_zone_t
*
,
unsigned
int
__nocas
t
);
extern
void
*
kmem_zone_zalloc
(
kmem_zone_t
*
,
xfs_km_flags_
t
);
#endif
/* __XFS_SUPPORT_KMEM_H__ */
#endif
/* __XFS_SUPPORT_KMEM_H__ */
fs/xfs/xfs_log.c
View file @
77ba7877
...
@@ -3152,7 +3152,7 @@ xlog_ticket_alloc(
...
@@ -3152,7 +3152,7 @@ xlog_ticket_alloc(
int
cnt
,
int
cnt
,
char
client
,
char
client
,
bool
permanent
,
bool
permanent
,
int
alloc_flags
)
xfs_km_flags_t
alloc_flags
)
{
{
struct
xlog_ticket
*
tic
;
struct
xlog_ticket
*
tic
;
uint
num_headers
;
uint
num_headers
;
...
...
fs/xfs/xfs_log_priv.h
View file @
77ba7877
...
@@ -555,7 +555,7 @@ extern void xlog_pack_data(xlog_t *log, xlog_in_core_t *iclog, int);
...
@@ -555,7 +555,7 @@ extern void xlog_pack_data(xlog_t *log, xlog_in_core_t *iclog, int);
extern
kmem_zone_t
*
xfs_log_ticket_zone
;
extern
kmem_zone_t
*
xfs_log_ticket_zone
;
struct
xlog_ticket
*
xlog_ticket_alloc
(
struct
log
*
log
,
int
unit_bytes
,
struct
xlog_ticket
*
xlog_ticket_alloc
(
struct
log
*
log
,
int
unit_bytes
,
int
count
,
char
client
,
bool
permanent
,
int
count
,
char
client
,
bool
permanent
,
in
t
alloc_flags
);
xfs_km_flags_
t
alloc_flags
);
static
inline
void
static
inline
void
...
...
fs/xfs/xfs_trans.c
View file @
77ba7877
...
@@ -584,7 +584,7 @@ xfs_trans_t *
...
@@ -584,7 +584,7 @@ xfs_trans_t *
_xfs_trans_alloc
(
_xfs_trans_alloc
(
xfs_mount_t
*
mp
,
xfs_mount_t
*
mp
,
uint
type
,
uint
type
,
uint
memflags
)
xfs_km_flags_t
memflags
)
{
{
xfs_trans_t
*
tp
;
xfs_trans_t
*
tp
;
...
...
fs/xfs/xfs_trans.h
View file @
77ba7877
...
@@ -443,7 +443,7 @@ typedef struct xfs_trans {
...
@@ -443,7 +443,7 @@ typedef struct xfs_trans {
* XFS transaction mechanism exported interfaces.
* XFS transaction mechanism exported interfaces.
*/
*/
xfs_trans_t
*
xfs_trans_alloc
(
struct
xfs_mount
*
,
uint
);
xfs_trans_t
*
xfs_trans_alloc
(
struct
xfs_mount
*
,
uint
);
xfs_trans_t
*
_xfs_trans_alloc
(
struct
xfs_mount
*
,
uint
,
uin
t
);
xfs_trans_t
*
_xfs_trans_alloc
(
struct
xfs_mount
*
,
uint
,
xfs_km_flags_
t
);
xfs_trans_t
*
xfs_trans_dup
(
xfs_trans_t
*
);
xfs_trans_t
*
xfs_trans_dup
(
xfs_trans_t
*
);
int
xfs_trans_reserve
(
xfs_trans_t
*
,
uint
,
uint
,
uint
,
int
xfs_trans_reserve
(
xfs_trans_t
*
,
uint
,
uint
,
uint
,
uint
,
uint
);
uint
,
uint
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment