diff options
| author | Linus Torvalds | 2019-09-19 10:21:35 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2019-09-19 10:21:35 -0700 |
| commit | 7a0d796100daa8e75cda2c166c85d57775704fd4 (patch) | |
| tree | bd12f4de8cd61df8f4a74b38ba5c445db15beb09 /fs | |
| parent | 8e6ee05d8aa9c802d999c79aa22f3f6ca92d7d27 (diff) | |
| parent | e6b998ab62be29eb244fdb0fa41dcb5a8ad065f2 (diff) | |
Merge tag 'for-linus-5.4-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/orangefs/inode.c | 2 | ||||
| -rw-r--r-- | fs/orangefs/namei.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c index 0c337d8bdaab..efb12197da18 100644 --- a/fs/orangefs/inode.c +++ b/fs/orangefs/inode.c @@ -940,7 +940,7 @@ out: int orangefs_getattr(const struct path *path, struct kstat *stat, u32 request_mask, unsigned int flags) { - int ret = -ENOENT; + int ret; struct inode *inode = path->dentry->d_inode; gossip_debug(GOSSIP_INODE_DEBUG, diff --git a/fs/orangefs/namei.c b/fs/orangefs/namei.c index 1dd710e5f376..3e7cf3d0a494 100644 --- a/fs/orangefs/namei.c +++ b/fs/orangefs/namei.c @@ -224,7 +224,7 @@ static int orangefs_symlink(struct inode *dir, struct orangefs_object_kref ref; struct inode *inode; struct iattr iattr; - int mode = 755; + int mode = 0755; int ret; gossip_debug(GOSSIP_NAME_DEBUG, "%s: called\n", __func__); |