summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Brandenburg <martin@omnibond.com>2017-04-25 22:38:02 +0300
committerMike Marshall <hubcap@omnibond.com>2017-04-26 21:33:00 +0300
commit7b796ae37092ef520641b3a96c211c1cc67a0346 (patch)
treefd2ee400d3002349506a6778a72e486b7fa30b35
parent480e3e532e31666a18520a7964bb4095d7a16b9a (diff)
downloadlinux-7b796ae37092ef520641b3a96c211c1cc67a0346.tar.xz
orangefs: remove ORANGEFS_READDIR macros
They are clones of the ORANGEFS_ITERATE macros in use elsewhere. Delete ORANGEFS_ITERATE_NEXT which is a hack previously used by readdir. Signed-off-by: Martin Brandenburg <martin@omnibond.com> Signed-off-by: Mike Marshall <hubcap@omnibond.com>
-rw-r--r--fs/orangefs/dir.c8
-rw-r--r--fs/orangefs/protocol.h9
2 files changed, 6 insertions, 11 deletions
diff --git a/fs/orangefs/dir.c b/fs/orangefs/dir.c
index 7e9814fc6cc3..d5ec9ba82cef 100644
--- a/fs/orangefs/dir.c
+++ b/fs/orangefs/dir.c
@@ -304,13 +304,13 @@ static int orangefs_dir_iterate(struct file *file,
* Must read more if the user has sought past what has been read
* so far. Stop a user who has sought past the end.
*/
- while (od->token != ORANGEFS_READDIR_END &&
+ while (od->token != ORANGEFS_ITERATE_END &&
ctx->pos > od->end) {
r = orangefs_dir_more(oi, od, dentry);
if (r)
return r;
}
- if (od->token == ORANGEFS_READDIR_END && ctx->pos > od->end)
+ if (od->token == ORANGEFS_ITERATE_END && ctx->pos > od->end)
return -EIO;
/* Then try to fill if there's any left in the buffer. */
@@ -321,7 +321,7 @@ static int orangefs_dir_iterate(struct file *file,
}
/* Finally get some more and try to fill. */
- if (od->token != ORANGEFS_READDIR_END) {
+ if (od->token != ORANGEFS_ITERATE_END) {
r = orangefs_dir_more(oi, od, dentry);
if (r)
return r;
@@ -339,7 +339,7 @@ static int orangefs_dir_open(struct inode *inode, struct file *file)
if (!file->private_data)
return -ENOMEM;
od = file->private_data;
- od->token = ORANGEFS_READDIR_START;
+ od->token = ORANGEFS_ITERATE_START;
od->part = NULL;
od->end = 1 << PART_SHIFT;
od->error = 0;
diff --git a/fs/orangefs/protocol.h b/fs/orangefs/protocol.h
index 971307ad69be..48bcc1bbe415 100644
--- a/fs/orangefs/protocol.h
+++ b/fs/orangefs/protocol.h
@@ -138,13 +138,8 @@ typedef __s64 ORANGEFS_offset;
#define ORANGEFS_G_SGID (1 << 10)
#define ORANGEFS_U_SUID (1 << 11)
-/* definition taken from stdint.h */
-#define INT32_MAX (2147483647)
-#define ORANGEFS_ITERATE_START (INT32_MAX - 1)
-#define ORANGEFS_ITERATE_END (INT32_MAX - 2)
-#define ORANGEFS_ITERATE_NEXT (INT32_MAX - 3)
-#define ORANGEFS_READDIR_START ORANGEFS_ITERATE_START
-#define ORANGEFS_READDIR_END ORANGEFS_ITERATE_END
+#define ORANGEFS_ITERATE_START 2147483646
+#define ORANGEFS_ITERATE_END 2147483645
#define ORANGEFS_IMMUTABLE_FL FS_IMMUTABLE_FL
#define ORANGEFS_APPEND_FL FS_APPEND_FL
#define ORANGEFS_NOATIME_FL FS_NOATIME_FL