diff options
Diffstat (limited to 'fs/gfs2')
-rw-r--r-- | fs/gfs2/rgrp.c | 2 | ||||
-rw-r--r-- | fs/gfs2/xattr.c | 4 | ||||
-rw-r--r-- | fs/gfs2/xattr.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index caaa665d4033..18d3a28554ac 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c | |||
@@ -1463,7 +1463,7 @@ static void gfs2_rgrp_error(struct gfs2_rgrpd *rgd) | |||
1463 | { | 1463 | { |
1464 | struct gfs2_sbd *sdp = rgd->rd_sbd; | 1464 | struct gfs2_sbd *sdp = rgd->rd_sbd; |
1465 | fs_warn(sdp, "rgrp %llu has an error, marking it readonly until umount\n", | 1465 | fs_warn(sdp, "rgrp %llu has an error, marking it readonly until umount\n", |
1466 | (unsigned long long)rgd->rd_addr); | 1466 | (unsigned long long)rgd->rd_addr); |
1467 | fs_warn(sdp, "umount on all nodes and run fsck.gfs2 to fix the error\n"); | 1467 | fs_warn(sdp, "umount on all nodes and run fsck.gfs2 to fix the error\n"); |
1468 | gfs2_rgrp_dump(NULL, rgd->rd_gl); | 1468 | gfs2_rgrp_dump(NULL, rgd->rd_gl); |
1469 | rgd->rd_flags |= GFS2_RDF_ERROR; | 1469 | rgd->rd_flags |= GFS2_RDF_ERROR; |
diff --git a/fs/gfs2/xattr.c b/fs/gfs2/xattr.c index 34ae9ba4c9fe..8a0f8ef6ee27 100644 --- a/fs/gfs2/xattr.c +++ b/fs/gfs2/xattr.c | |||
@@ -562,7 +562,7 @@ int gfs2_xattr_get(struct inode *inode, int type, const char *name, | |||
562 | return error; | 562 | return error; |
563 | if (!el.el_ea) | 563 | if (!el.el_ea) |
564 | return -ENODATA; | 564 | return -ENODATA; |
565 | if (size) | 565 | if (size) |
566 | error = gfs2_ea_get_copy(ip, &el, buffer, size); | 566 | error = gfs2_ea_get_copy(ip, &el, buffer, size); |
567 | else | 567 | else |
568 | error = GFS2_EA_DATA_LEN(el.el_ea); | 568 | error = GFS2_EA_DATA_LEN(el.el_ea); |
@@ -1046,7 +1046,7 @@ static int ea_set_remove_unstuffed(struct gfs2_inode *ip, | |||
1046 | GFS2_EA2NEXT(el->el_prev) == el->el_ea); | 1046 | GFS2_EA2NEXT(el->el_prev) == el->el_ea); |
1047 | } | 1047 | } |
1048 | 1048 | ||
1049 | return ea_remove_unstuffed(ip, el->el_bh, el->el_ea, el->el_prev,0); | 1049 | return ea_remove_unstuffed(ip, el->el_bh, el->el_ea, el->el_prev, 0); |
1050 | } | 1050 | } |
1051 | 1051 | ||
1052 | static int ea_remove_stuffed(struct gfs2_inode *ip, struct gfs2_ea_location *el) | 1052 | static int ea_remove_stuffed(struct gfs2_inode *ip, struct gfs2_ea_location *el) |
diff --git a/fs/gfs2/xattr.h b/fs/gfs2/xattr.h index 4040a188f63b..cbdfd7743733 100644 --- a/fs/gfs2/xattr.h +++ b/fs/gfs2/xattr.h | |||
@@ -19,7 +19,7 @@ struct iattr; | |||
19 | #define GFS2_EA_SIZE(ea) \ | 19 | #define GFS2_EA_SIZE(ea) \ |
20 | ALIGN(sizeof(struct gfs2_ea_header) + (ea)->ea_name_len + \ | 20 | ALIGN(sizeof(struct gfs2_ea_header) + (ea)->ea_name_len + \ |
21 | ((GFS2_EA_IS_STUFFED(ea)) ? GFS2_EA_DATA_LEN(ea) : \ | 21 | ((GFS2_EA_IS_STUFFED(ea)) ? GFS2_EA_DATA_LEN(ea) : \ |
22 | (sizeof(__be64) * (ea)->ea_num_ptrs)), 8) | 22 | (sizeof(__be64) * (ea)->ea_num_ptrs)), 8) |
23 | 23 | ||
24 | #define GFS2_EA_IS_STUFFED(ea) (!(ea)->ea_num_ptrs) | 24 | #define GFS2_EA_IS_STUFFED(ea) (!(ea)->ea_num_ptrs) |
25 | #define GFS2_EA_IS_LAST(ea) ((ea)->ea_flags & GFS2_EAFLAG_LAST) | 25 | #define GFS2_EA_IS_LAST(ea) ((ea)->ea_flags & GFS2_EAFLAG_LAST) |