diff options
| -rw-r--r-- | fs/orangefs/dcache.c | 3 | ||||
| -rw-r--r-- | fs/orangefs/inode.c | 19 | ||||
| -rw-r--r-- | fs/orangefs/namei.c | 1 | ||||
| -rw-r--r-- | fs/orangefs/orangefs-kernel.h | 2 | ||||
| -rw-r--r-- | fs/orangefs/protocol.h | 9 | ||||
| -rw-r--r-- | fs/orangefs/symlink.c | 1 |
6 files changed, 34 insertions, 1 deletions
diff --git a/fs/orangefs/dcache.c b/fs/orangefs/dcache.c index e8fb79de37c6..a6911dbbf3e5 100644 --- a/fs/orangefs/dcache.c +++ b/fs/orangefs/dcache.c @@ -119,8 +119,9 @@ static int orangefs_d_revalidate(struct dentry *dentry, unsigned int flags) goto out; /* Now we must perform a getattr to validate the inode contents. */ + ret = orangefs_inode_getattr(dentry->d_inode, - ORANGEFS_ATTR_SYS_ALL_NOHINT, 1); + ORANGEFS_ATTR_SYS_TYPE|ORANGEFS_ATTR_SYS_LNK_TARGET, 1); if (ret < 0) { gossip_debug(GOSSIP_DCACHE_DEBUG, "%s:%s:%d getattr failure.\n", __FILE__, __func__, __LINE__); diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c index 040cd95b51c2..e9688f0b99d7 100644 --- a/fs/orangefs/inode.c +++ b/fs/orangefs/inode.c @@ -291,6 +291,24 @@ int orangefs_getattr(struct vfsmount *mnt, return ret; } +int orangefs_permission(struct inode *inode, int mask) +{ + int ret; + + if (mask & MAY_NOT_BLOCK) + return -ECHILD; + + gossip_debug(GOSSIP_INODE_DEBUG, "%s: refreshing\n", __func__); + + /* Make sure the permission (and other common attrs) are up to date. */ + ret = orangefs_inode_getattr(inode, + ORANGEFS_ATTR_SYS_ALL_NOHINT_NOSIZE, 0); + if (ret < 0) + return ret; + + return generic_permission(inode, mask); +} + /* ORANGEDS2 implementation of VFS inode operations for files */ struct inode_operations orangefs_file_inode_operations = { .get_acl = orangefs_get_acl, @@ -301,6 +319,7 @@ struct inode_operations orangefs_file_inode_operations = { .getxattr = generic_getxattr, .listxattr = orangefs_listxattr, .removexattr = generic_removexattr, + .permission = orangefs_permission, }; static int orangefs_init_iops(struct inode *inode) diff --git a/fs/orangefs/namei.c b/fs/orangefs/namei.c index 50bc45d02009..8fc55c6f58db 100644 --- a/fs/orangefs/namei.c +++ b/fs/orangefs/namei.c @@ -443,4 +443,5 @@ struct inode_operations orangefs_dir_inode_operations = { .getxattr = generic_getxattr, .removexattr = generic_removexattr, .listxattr = orangefs_listxattr, + .permission = orangefs_permission, }; diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h index d4db96223dac..a8cde9019efe 100644 --- a/fs/orangefs/orangefs-kernel.h +++ b/fs/orangefs/orangefs-kernel.h @@ -493,6 +493,8 @@ int orangefs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *kstat); +int orangefs_permission(struct inode *inode, int mask); + /* * defined in xattr.c */ diff --git a/fs/orangefs/protocol.h b/fs/orangefs/protocol.h index 56dd65abb908..6ac0c60c9f5e 100644 --- a/fs/orangefs/protocol.h +++ b/fs/orangefs/protocol.h @@ -205,6 +205,15 @@ typedef __s64 ORANGEFS_offset; ORANGEFS_ATTR_SYS_MIRROR_COPIES_COUNT | \ ORANGEFS_ATTR_SYS_DIRENT_COUNT | \ ORANGEFS_ATTR_SYS_BLKSIZE) + +#define ORANGEFS_ATTR_SYS_ALL_NOHINT_NOSIZE \ + (ORANGEFS_ATTR_SYS_COMMON_ALL | \ + ORANGEFS_ATTR_SYS_LNK_TARGET | \ + ORANGEFS_ATTR_SYS_DFILE_COUNT | \ + ORANGEFS_ATTR_SYS_MIRROR_COPIES_COUNT | \ + ORANGEFS_ATTR_SYS_DIRENT_COUNT | \ + ORANGEFS_ATTR_SYS_BLKSIZE) + #define ORANGEFS_XATTR_REPLACE 0x2 #define ORANGEFS_XATTR_CREATE 0x1 #define ORANGEFS_MAX_SERVER_ADDR_LEN 256 diff --git a/fs/orangefs/symlink.c b/fs/orangefs/symlink.c index 1b3ae63463dc..2b8541a7fc43 100644 --- a/fs/orangefs/symlink.c +++ b/fs/orangefs/symlink.c @@ -28,4 +28,5 @@ struct inode_operations orangefs_symlink_inode_operations = { .getattr = orangefs_getattr, .listxattr = orangefs_listxattr, .setxattr = generic_setxattr, + .permission = orangefs_permission, }; |