diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2009-03-30 14:02:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 15:16:37 -0400 |
| commit | 6dfede696391133eadd7ce90b61c9573ee6e5a90 (patch) | |
| tree | 2051bfc5108d0e7592b8738e43f4ae972d398ccd /fs/reiserfs/xattr_trusted.c | |
| parent | 010f5a21a323e7383e067009a7785462883fe5ea (diff) | |
reiserfs: remove IS_PRIVATE helpers
There are a number of helper functions for marking a reiserfs inode
private that were leftover from reiserfs did its own thing wrt to
private inodes. S_PRIVATE has been in the kernel for some time, so this
patch removes the helpers and uses IS_PRIVATE instead.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/reiserfs/xattr_trusted.c')
| -rw-r--r-- | fs/reiserfs/xattr_trusted.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/reiserfs/xattr_trusted.c b/fs/reiserfs/xattr_trusted.c index 60abe2bb1f98..076ad388d489 100644 --- a/fs/reiserfs/xattr_trusted.c +++ b/fs/reiserfs/xattr_trusted.c | |||
| @@ -16,7 +16,7 @@ trusted_get(struct inode *inode, const char *name, void *buffer, size_t size) | |||
| 16 | if (!reiserfs_xattrs(inode->i_sb)) | 16 | if (!reiserfs_xattrs(inode->i_sb)) |
| 17 | return -EOPNOTSUPP; | 17 | return -EOPNOTSUPP; |
| 18 | 18 | ||
| 19 | if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode))) | 19 | if (!(capable(CAP_SYS_ADMIN) || IS_PRIVATE(inode))) |
| 20 | return -EPERM; | 20 | return -EPERM; |
| 21 | 21 | ||
| 22 | return reiserfs_xattr_get(inode, name, buffer, size); | 22 | return reiserfs_xattr_get(inode, name, buffer, size); |
| @@ -32,7 +32,7 @@ trusted_set(struct inode *inode, const char *name, const void *buffer, | |||
| 32 | if (!reiserfs_xattrs(inode->i_sb)) | 32 | if (!reiserfs_xattrs(inode->i_sb)) |
| 33 | return -EOPNOTSUPP; | 33 | return -EOPNOTSUPP; |
| 34 | 34 | ||
| 35 | if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode))) | 35 | if (!(capable(CAP_SYS_ADMIN) || IS_PRIVATE(inode))) |
| 36 | return -EPERM; | 36 | return -EPERM; |
| 37 | 37 | ||
| 38 | return reiserfs_xattr_set(inode, name, buffer, size, flags); | 38 | return reiserfs_xattr_set(inode, name, buffer, size, flags); |
| @@ -46,7 +46,7 @@ static int trusted_del(struct inode *inode, const char *name) | |||
| 46 | if (!reiserfs_xattrs(inode->i_sb)) | 46 | if (!reiserfs_xattrs(inode->i_sb)) |
| 47 | return -EOPNOTSUPP; | 47 | return -EOPNOTSUPP; |
| 48 | 48 | ||
| 49 | if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode))) | 49 | if (!(capable(CAP_SYS_ADMIN) || IS_PRIVATE(inode))) |
| 50 | return -EPERM; | 50 | return -EPERM; |
| 51 | 51 | ||
| 52 | return 0; | 52 | return 0; |
| @@ -60,7 +60,7 @@ trusted_list(struct inode *inode, const char *name, int namelen, char *out) | |||
| 60 | if (!reiserfs_xattrs(inode->i_sb)) | 60 | if (!reiserfs_xattrs(inode->i_sb)) |
| 61 | return 0; | 61 | return 0; |
| 62 | 62 | ||
| 63 | if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode))) | 63 | if (!(capable(CAP_SYS_ADMIN) || IS_PRIVATE(inode))) |
| 64 | return 0; | 64 | return 0; |
| 65 | 65 | ||
| 66 | if (out) | 66 | if (out) |