Pull orangefs updates from Mike Marshall: "A fix and a cleanup. The fix: way back in the stone age (2003) mode was set to the magic number "755" in what is now fs/orangefs/namei.c(orangefs_symlink). Łukasz Wrochna reported it and Artur Świgoń sent in a patch to change it to octal. Maybe it shouldn't be a magic number at all but rather something like "S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH"... cleanup: Colin Ian King found a redundant assignment and sent in a patch to remove it" [ And no, octal numbers for permissions are a lot more legible than a binary 'or' of some line noise macros. So 0755 is preferred over trying to spell it out using "helpful" macros - Linus ] * tag 'for-linus-5.4-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux: orangefs: remove redundant assignment to err orangefs: Add octal zero prefix
Unified · Split
| @@ -940,7 +940,7 @@ out: · 939 unmodified lines | |||
| 940 | int orangefs_getattr(const struct path *path, struct kstat *stat, | 940 | int orangefs_getattr(const struct path *path, struct kstat *stat, |
| 941 | u32 request_mask, unsigned int flags) | 941 | u32 request_mask, unsigned int flags) |
| 942 | { | 942 | { |
| 943 | int ret = -ENOENT; | 943 | int ret; |
| 944 | struct inode *inode = path->dentry->d_inode; | 944 | struct inode *inode = path->dentry->d_inode; |
| 945 | 945 | ||
| 946 | gossip_debug(GOSSIP_INODE_DEBUG, | 946 | gossip_debug(GOSSIP_INODE_DEBUG, |
| @@ -224,7 +224,7 @@ static int orangefs_symlink(struct inode *dir, · 223 unmodified lines | |||
| 224 | struct orangefs_object_kref ref; | 224 | struct orangefs_object_kref ref; |
| 225 | struct inode *inode; | 225 | struct inode *inode; |
| 226 | struct iattr iattr; | 226 | struct iattr iattr; |
| 227 | int mode = 755; | 227 | int mode = 0755; |
| 228 | int ret; | 228 | int ret; |
| 229 | 229 | ||
| 230 | gossip_debug(GOSSIP_NAME_DEBUG, "%s: called\n", __func__); | 230 | gossip_debug(GOSSIP_NAME_DEBUG, "%s: called\n", __func__); |