kernel/linux.git/fs/adfs/dir_f.c, branch linux-7.1.y

treewide: Use fallthrough pseudo-keyword

2020-08-23T22:36:59+00:00

Replace the existing /* fall through */ comments and its variants with the new pseudo-keyword macro fallthrough[1]. Also, remove unnecessary fall-through markings when it is the case. [1] https://www.kernel.org/doc/html/v5.7/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-through Signed-off-by: Gustavo A. R. Silva

fs/adfs: newdir: split out directory commit from update

2020-01-21T01:12:42+00:00

After changing a directory, we need to update the sequence numbers and calculate the new check byte before the directory is scheduled to be written back to the media. Since this needs to happen for any change to the directory, move this into a separate method. Signed-off-by: Russell King Signed-off-by: Al Viro

fs/adfs: newdir: clean up adfs_f_update()

2020-01-21T01:12:42+00:00

__adfs_dir_put() and adfs_dir_find_entry() are only called from adfs_f_update(), so move them into this function, removing some unnecessary entry copying by doing so. Signed-off-by: Russell King Signed-off-by: Al Viro

fs/adfs: newdir: merge adfs_dir_read() into adfs_f_read()

2020-01-21T01:12:41+00:00

adfs_dir_read() is only called from adfs_f_read(), so merge it into that function. As new directories are always 2048 bytes in size, (which we rely on elsewhere) we can consolidate some of the code. Signed-off-by: Russell King Signed-off-by: Al Viro

fs/adfs: newdir: improve directory validation

2020-01-21T01:12:41+00:00

Check that the lastmask and reserved fields are all zero, as per the documentation. Signed-off-by: Russell King Signed-off-by: Al Viro

fs/adfs: newdir: factor out directory format validation

2020-01-21T01:12:41+00:00

We have two locations where we validate the new directory format, so factor this out to a helper. Signed-off-by: Russell King Signed-off-by: Al Viro

fs/adfs: dir: use pointers to access directory head/tails

2020-01-21T01:12:41+00:00

Add and use pointers in the adfs_dir structure to access the directory head and tail structures, which will always be contiguous in a buffer. This allows us to avoid memcpy()ing the data in the new directory code, making it slightly more efficient. Signed-off-by: Russell King Signed-off-by: Al Viro

fs/adfs: dir: add more efficient iterate() per-format method

2020-01-21T01:12:41+00:00

Rather than using setpos + getnext to iterate through the directory entries, pass iterate() down to the dir format code to populate the dirents. Signed-off-by: Russell King Signed-off-by: Al Viro

fs/adfs: dir: add helper to mark directory buffers dirty

2020-01-21T01:12:41+00:00

Provide a helper for marking directory buffers dirty so they get written back to disk. Signed-off-by: Russell King Signed-off-by: Al Viro

fs/adfs: dir: add generic directory reading

2020-01-21T01:12:41+00:00

Both directory formats code the mechanics of fetching the directory buffers using their own implementations. Consolidate these into one implementation. Signed-off-by: Russell King Signed-off-by: Al Viro